From 835ee644b552bc2f35d9743283c66038d11881cb Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 23 Jan 2022 19:55:56 -0600 Subject: [PATCH] Return fields by value instead of const reference --- wxdata/include/scwx/awips/wmo_header.hpp | 18 +- wxdata/include/scwx/common/products.hpp | 12 +- .../scwx/wsr88d/rda/digital_radar_data.hpp | 30 +- .../rda/performance_maintenance_data.hpp | 502 +++++++++--------- .../scwx/wsr88d/rda/rda_adaptation_data.hpp | 354 ++++++------ wxdata/source/scwx/awips/wmo_header.cpp | 18 +- wxdata/source/scwx/common/products.cpp | 14 +- .../scwx/wsr88d/rda/digital_radar_data.cpp | 2 +- .../rda/performance_maintenance_data.cpp | 2 +- .../scwx/wsr88d/rda/rda_adaptation_data.cpp | 12 +- 10 files changed, 481 insertions(+), 483 deletions(-) diff --git a/wxdata/include/scwx/awips/wmo_header.hpp b/wxdata/include/scwx/awips/wmo_header.hpp index c209b0e9..f3487b6d 100644 --- a/wxdata/include/scwx/awips/wmo_header.hpp +++ b/wxdata/include/scwx/awips/wmo_header.hpp @@ -35,15 +35,15 @@ public: bool operator==(const WmoHeader& o) const; - const std::string& sequence_number() const; - const std::string& data_type() const; - const std::string& geographic_designator() const; - const std::string& bulletin_id() const; - const std::string& icao() const; - const std::string& date_time() const; - const std::string& bbb_indicator() const; - const std::string& product_category() const; - const std::string& product_designator() const; + std::string sequence_number() const; + std::string data_type() const; + std::string geographic_designator() const; + std::string bulletin_id() const; + std::string icao() const; + std::string date_time() const; + std::string bbb_indicator() const; + std::string product_category() const; + std::string product_designator() const; bool Parse(std::istream& is); diff --git a/wxdata/include/scwx/common/products.hpp b/wxdata/include/scwx/common/products.hpp index 4dac6456..62a38fcb 100644 --- a/wxdata/include/scwx/common/products.hpp +++ b/wxdata/include/scwx/common/products.hpp @@ -36,13 +36,13 @@ typedef util::Iterator Level2ProductIterator; -const std::string& GetRadarProductGroupName(RadarProductGroup group); -const RadarProductGroup GetRadarProductGroup(const std::string& name); +const std::string& GetRadarProductGroupName(RadarProductGroup group); +RadarProductGroup GetRadarProductGroup(const std::string& name); -const std::string& GetLevel2Name(Level2Product product); -const std::string& GetLevel2Description(Level2Product product); -const std::string& GetLevel2Palette(Level2Product product); -const Level2Product GetLevel2Product(const std::string& name); +const std::string& GetLevel2Name(Level2Product product); +const std::string& GetLevel2Description(Level2Product product); +const std::string& GetLevel2Palette(Level2Product product); +Level2Product GetLevel2Product(const std::string& name); } // namespace common } // namespace scwx diff --git a/wxdata/include/scwx/wsr88d/rda/digital_radar_data.hpp b/wxdata/include/scwx/wsr88d/rda/digital_radar_data.hpp index d59fb296..17a56b57 100644 --- a/wxdata/include/scwx/wsr88d/rda/digital_radar_data.hpp +++ b/wxdata/include/scwx/wsr88d/rda/digital_radar_data.hpp @@ -182,21 +182,21 @@ public: DigitalRadarData(DigitalRadarData&&) noexcept; DigitalRadarData& operator=(DigitalRadarData&&) noexcept; - const std::string& radar_identifier() const; - uint32_t collection_time() const; - uint16_t modified_julian_date() const; - uint16_t azimuth_number() const; - float azimuth_angle() const; - uint8_t compression_indicator() const; - uint16_t radial_length() const; - uint8_t azimuth_resolution_spacing() const; - uint8_t radial_status() const; - uint8_t elevation_number() const; - uint8_t cut_sector_number() const; - float elevation_angle() const; - uint8_t radial_spot_blanking_status() const; - uint8_t azimuth_indexing_mode() const; - uint16_t data_block_count() const; + std::string radar_identifier() const; + uint32_t collection_time() const; + uint16_t modified_julian_date() const; + uint16_t azimuth_number() const; + float azimuth_angle() const; + uint8_t compression_indicator() const; + uint16_t radial_length() const; + uint8_t azimuth_resolution_spacing() const; + uint8_t radial_status() const; + uint8_t elevation_number() const; + uint8_t cut_sector_number() const; + float elevation_angle() const; + uint8_t radial_spot_blanking_status() const; + uint8_t azimuth_indexing_mode() const; + uint16_t data_block_count() const; std::shared_ptr elevation_data_block() const; std::shared_ptr radial_data_block() const; diff --git a/wxdata/include/scwx/wsr88d/rda/performance_maintenance_data.hpp b/wxdata/include/scwx/wsr88d/rda/performance_maintenance_data.hpp index 8e438811..8e1c91ea 100644 --- a/wxdata/include/scwx/wsr88d/rda/performance_maintenance_data.hpp +++ b/wxdata/include/scwx/wsr88d/rda/performance_maintenance_data.hpp @@ -24,257 +24,257 @@ public: PerformanceMaintenanceData(PerformanceMaintenanceData&&) noexcept; PerformanceMaintenanceData& operator=(PerformanceMaintenanceData&&) noexcept; - uint16_t loop_back_set_status() const; - uint32_t t1_output_frames() const; - uint32_t t1_input_frames() const; - uint32_t router_memory_used() const; - uint32_t router_memory_free() const; - uint16_t router_memory_utilization() const; - uint16_t route_to_rpg() const; - uint32_t csu_loss_of_signal() const; - uint32_t csu_loss_of_frames() const; - uint32_t csu_yellow_alarms() const; - uint32_t csu_blue_alarms() const; - uint32_t csu_24hr_errored_seconds() const; - uint32_t csu_24hr_severely_errored_seconds() const; - uint32_t csu_24hr_severely_errored_framing_seconds() const; - uint32_t csu_24hr_unavailable_seconds() const; - uint32_t csu_24hr_controlled_slip_seconds() const; - uint32_t csu_24hr_path_coding_violations() const; - uint32_t csu_24hr_line_errored_seconds() const; - uint32_t csu_24hr_bursty_errored_seconds() const; - uint32_t csu_24hr_degraded_minutes() const; - uint32_t lan_switch_cpu_utilization() const; - uint16_t lan_switch_memory_utilization() const; - uint16_t ifdr_chasis_temperature() const; - uint16_t ifdr_fpga_temperature() const; - int32_t gps_satellites() const; - uint16_t ipc_status() const; - uint16_t commanded_channel_control() const; - uint16_t polarization() const; - float ame_internal_temperature() const; - float ame_receiver_module_temperature() const; - float ame_bite_cal_module_temperature() const; - uint16_t ame_peltier_pulse_width_modulation() const; - uint16_t ame_peltier_status() const; - uint16_t ame_a_d_converter_status() const; - uint16_t ame_state() const; - float ame_3_3v_ps_voltage() const; - float ame_5v_ps_voltage() const; - float ame_6_5v_ps_voltage() const; - float ame_15v_ps_voltage() const; - float ame_48v_ps_voltage() const; - float ame_stalo_power() const; - float peltier_current() const; - float adc_calibration_reference_voltage() const; - uint16_t ame_mode() const; - uint16_t ame_peltier_mode() const; - float ame_peltier_inside_fan_current() const; - float ame_peltier_outside_fan_current() const; - float horizontal_tr_limiter_voltage() const; - float vertical_tr_limiter_voltage() const; - float adc_calibration_offset_voltage() const; - float adc_calibration_gain_correction() const; - uint16_t rcp_status() const; - const std::string& rcp_string() const; - uint16_t spip_power_buttons() const; - float master_power_administrator_load() const; - float expansion_power_administrator_load() const; - uint16_t _5vdc_ps() const; - uint16_t _15vdc_ps() const; - uint16_t _28vdc_ps() const; - uint16_t neg_15vdc_ps() const; - uint16_t _45vdc_ps() const; - uint16_t filament_ps_voltage() const; - uint16_t vacuum_pump_ps_voltage() const; - uint16_t focus_coil_ps_voltage() const; - uint16_t filament_ps() const; - uint16_t klystron_warmup() const; - uint16_t transmitter_available() const; - uint16_t wg_switch_position() const; - uint16_t wg_pfn_transfer_interlock() const; - uint16_t maintenance_mode() const; - uint16_t maintenance_required() const; - uint16_t pfn_switch_position() const; - uint16_t modulator_overload() const; - uint16_t modulator_inv_current() const; - uint16_t modulator_switch_fail() const; - uint16_t main_power_voltage() const; - uint16_t charging_system_fail() const; - uint16_t inverse_diode_current() const; - uint16_t trigger_amplifier() const; - uint16_t circulator_temperature() const; - uint16_t spectrum_filter_pressure() const; - uint16_t wg_arc_vswr() const; - uint16_t cabinet_interlock() const; - uint16_t cabinet_air_temperature() const; - uint16_t cabinet_airflow() const; - uint16_t klystron_current() const; - uint16_t klystron_filament_current() const; - uint16_t klystron_vacion_current() const; - uint16_t klystron_air_temperature() const; - uint16_t klystron_airflow() const; - uint16_t modulator_switch_maintenance() const; - uint16_t post_charge_regulator_maintenance() const; - uint16_t wg_pressure_humidity() const; - uint16_t transmitter_overvoltage() const; - uint16_t transmitter_overcurrent() const; - uint16_t focus_coil_current() const; - uint16_t focus_coil_airflow() const; - uint16_t oil_temperature() const; - uint16_t prf_limit() const; - uint16_t transmitter_oil_level() const; - uint16_t transmitter_battery_charging() const; - uint16_t high_voltage_status() const; - uint16_t transmitter_recycling_summary() const; - uint16_t transmitter_inoperable() const; - uint16_t transmitter_air_filter() const; - uint16_t zero_test_bit(unsigned i) const; - uint16_t one_test_bit(unsigned i) const; - uint16_t xmtr_spip_interface() const; - uint16_t transmitter_summary_status() const; - float transmitter_rf_power() const; - float horizontal_xmtr_peak_power() const; - float xmtr_peak_power() const; - float vertical_xmtr_peak_power() const; - float xmtr_rf_avg_power() const; - uint32_t xmtr_recycle_count() const; - float receiver_bias() const; - float transmit_imbalance() const; - float xmtr_power_meter_zero() const; - uint16_t ac_unit1_compressor_shut_off() const; - uint16_t ac_unit2_compressor_shut_off() const; - uint16_t generator_maintenance_required() const; - uint16_t generator_battery_voltage() const; - uint16_t generator_engine() const; - uint16_t generator_volt_frequency() const; - uint16_t power_source() const; - uint16_t transitional_power_source() const; - uint16_t generator_auto_run_off_switch() const; - uint16_t aircraft_hazard_lighting() const; - uint16_t equipment_shelter_fire_detection_system() const; - uint16_t equipment_shelter_fire_smoke() const; - uint16_t generator_shelter_fire_smoke() const; - uint16_t utility_voltage_frequency() const; - uint16_t site_security_alarm() const; - uint16_t security_equipment() const; - uint16_t security_system() const; - uint16_t receiver_connected_to_antenna() const; - uint16_t radome_hatch() const; - uint16_t ac_unit1_filter_dirty() const; - uint16_t ac_unit2_filter_dirty() const; - float equipment_shelter_temperature() const; - float outside_ambient_temperature() const; - float transmitter_leaving_air_temp() const; - float ac_unit1_discharge_air_temp() const; - float generator_shelter_temperature() const; - float radome_air_temperature() const; - float ac_unit2_discharge_air_temp() const; - float spip_15v_ps() const; - float spip_neg_15v_ps() const; - uint16_t spip_28v_ps_status() const; - float spip_5v_ps() const; - uint16_t converted_generator_fuel_level() const; - uint16_t elevation_pos_dead_limit() const; - uint16_t _150v_overvoltage() const; - uint16_t _150v_undervoltage() const; - uint16_t elevation_servo_amp_inhibit() const; - uint16_t elevation_servo_amp_short_circuit() const; - uint16_t elevation_servo_amp_overtemp() const; - uint16_t elevation_motor_overtemp() const; - uint16_t elevation_stow_pin() const; - uint16_t elevation_housing_5v_ps() const; - uint16_t elevation_neg_dead_limit() const; - uint16_t elevation_pos_normal_limit() const; - uint16_t elevation_neg_normal_limit() const; - uint16_t elevation_encoder_light() const; - uint16_t elevation_gearbox_oil() const; - uint16_t elevation_handwheel() const; - uint16_t elevation_amp_ps() const; - uint16_t azimuth_servo_amp_inhibit() const; - uint16_t azimuth_servo_amp_short_circuit() const; - uint16_t azimuth_servo_amp_overtemp() const; - uint16_t azimuth_motor_overtemp() const; - uint16_t azimuth_stow_pin() const; - uint16_t azimuth_housing_5v_ps() const; - uint16_t azimuth_encoder_light() const; - uint16_t azimuth_gearbox_oil() const; - uint16_t azimuth_bull_gear_oil() const; - uint16_t azimuth_handwheel() const; - uint16_t azimuth_servo_amp_ps() const; - uint16_t servo() const; - uint16_t pedestal_interlock_switch() const; - uint16_t coho_clock() const; - uint16_t rf_generator_frequency_select_oscillator() const; - uint16_t rf_generator_rf_stalo() const; - uint16_t rf_generator_phase_shifted_coho() const; - uint16_t _9v_receiver_ps() const; - uint16_t _5v_receiver_ps() const; - uint16_t _18v_receiver_ps() const; - uint16_t neg_9v_receiver_ps() const; - uint16_t _5v_single_channel_rdaiu_ps() const; - float horizontal_short_pulse_noise() const; - float horizontal_long_pulse_noise() const; - float horizontal_noise_temperature() const; - float vertical_short_pulse_noise() const; - float vertical_long_pulse_noise() const; - float vertical_noise_temperature() const; - float horizontal_linearity() const; - float horizontal_dynamic_range() const; - float horizontal_delta_dbz0() const; - float vertical_delta_dbz0() const; - float kd_peak_measured() const; - float short_pulse_horizontal_dbz0() const; - float long_pulse_horizontal_dbz0() const; - uint16_t velocity_processed() const; - uint16_t width_processed() const; - uint16_t velocity_rf_gen() const; - uint16_t width_rf_gen() const; - float horizontal_i0() const; - float vertical_i0() const; - float vertical_dynamic_range() const; - float short_pulse_vertical_dbz0() const; - float long_pulse_vertical_dbz0() const; - float horizontal_power_sense() const; - float vertical_power_sense() const; - float zdr_bias() const; - float clutter_suppression_delta() const; - float clutter_suppression_unfiltered_power() const; - float clutter_suppression_filtered_power() const; - float vertical_linearity() const; - uint16_t state_file_read_status() const; - uint16_t state_file_write_status() const; - uint16_t bypass_map_file_read_status() const; - uint16_t bypass_map_file_write_status() const; - uint16_t current_adaptation_file_read_status() const; - uint16_t current_adaptation_file_write_status() const; - uint16_t censor_zone_file_read_status() const; - uint16_t censor_zone_file_write_status() const; - uint16_t remote_vcp_file_read_status() const; - uint16_t remote_vcp_file_write_status() const; - uint16_t baseline_adaptation_file_read_status() const; - uint16_t read_status_of_prf_sets() const; - uint16_t clutter_filter_map_file_read_status() const; - uint16_t clutter_filter_map_file_write_status() const; - uint16_t generatl_disk_io_error() const; - uint8_t rsp_status() const; - uint8_t motherboard_temperature() const; - uint8_t cpu1_temperature() const; - uint8_t cpu2_temperature() const; - uint16_t cpu1_fan_speed() const; - uint16_t cpu2_fan_speed() const; - uint16_t rsp_fan1_speed() const; - uint16_t rsp_fan2_speed() const; - uint16_t rsp_fan3_speed() const; - uint16_t spip_comm_status() const; - uint16_t hci_comm_status() const; - uint16_t signal_processor_command_status() const; - uint16_t ame_communication_status() const; - uint16_t rms_link_status() const; - uint16_t rpg_link_status() const; - uint16_t interpanel_link_status() const; - uint32_t performance_check_time() const; - uint16_t version() const; + uint16_t loop_back_set_status() const; + uint32_t t1_output_frames() const; + uint32_t t1_input_frames() const; + uint32_t router_memory_used() const; + uint32_t router_memory_free() const; + uint16_t router_memory_utilization() const; + uint16_t route_to_rpg() const; + uint32_t csu_loss_of_signal() const; + uint32_t csu_loss_of_frames() const; + uint32_t csu_yellow_alarms() const; + uint32_t csu_blue_alarms() const; + uint32_t csu_24hr_errored_seconds() const; + uint32_t csu_24hr_severely_errored_seconds() const; + uint32_t csu_24hr_severely_errored_framing_seconds() const; + uint32_t csu_24hr_unavailable_seconds() const; + uint32_t csu_24hr_controlled_slip_seconds() const; + uint32_t csu_24hr_path_coding_violations() const; + uint32_t csu_24hr_line_errored_seconds() const; + uint32_t csu_24hr_bursty_errored_seconds() const; + uint32_t csu_24hr_degraded_minutes() const; + uint32_t lan_switch_cpu_utilization() const; + uint16_t lan_switch_memory_utilization() const; + uint16_t ifdr_chasis_temperature() const; + uint16_t ifdr_fpga_temperature() const; + int32_t gps_satellites() const; + uint16_t ipc_status() const; + uint16_t commanded_channel_control() const; + uint16_t polarization() const; + float ame_internal_temperature() const; + float ame_receiver_module_temperature() const; + float ame_bite_cal_module_temperature() const; + uint16_t ame_peltier_pulse_width_modulation() const; + uint16_t ame_peltier_status() const; + uint16_t ame_a_d_converter_status() const; + uint16_t ame_state() const; + float ame_3_3v_ps_voltage() const; + float ame_5v_ps_voltage() const; + float ame_6_5v_ps_voltage() const; + float ame_15v_ps_voltage() const; + float ame_48v_ps_voltage() const; + float ame_stalo_power() const; + float peltier_current() const; + float adc_calibration_reference_voltage() const; + uint16_t ame_mode() const; + uint16_t ame_peltier_mode() const; + float ame_peltier_inside_fan_current() const; + float ame_peltier_outside_fan_current() const; + float horizontal_tr_limiter_voltage() const; + float vertical_tr_limiter_voltage() const; + float adc_calibration_offset_voltage() const; + float adc_calibration_gain_correction() const; + uint16_t rcp_status() const; + std::string rcp_string() const; + uint16_t spip_power_buttons() const; + float master_power_administrator_load() const; + float expansion_power_administrator_load() const; + uint16_t _5vdc_ps() const; + uint16_t _15vdc_ps() const; + uint16_t _28vdc_ps() const; + uint16_t neg_15vdc_ps() const; + uint16_t _45vdc_ps() const; + uint16_t filament_ps_voltage() const; + uint16_t vacuum_pump_ps_voltage() const; + uint16_t focus_coil_ps_voltage() const; + uint16_t filament_ps() const; + uint16_t klystron_warmup() const; + uint16_t transmitter_available() const; + uint16_t wg_switch_position() const; + uint16_t wg_pfn_transfer_interlock() const; + uint16_t maintenance_mode() const; + uint16_t maintenance_required() const; + uint16_t pfn_switch_position() const; + uint16_t modulator_overload() const; + uint16_t modulator_inv_current() const; + uint16_t modulator_switch_fail() const; + uint16_t main_power_voltage() const; + uint16_t charging_system_fail() const; + uint16_t inverse_diode_current() const; + uint16_t trigger_amplifier() const; + uint16_t circulator_temperature() const; + uint16_t spectrum_filter_pressure() const; + uint16_t wg_arc_vswr() const; + uint16_t cabinet_interlock() const; + uint16_t cabinet_air_temperature() const; + uint16_t cabinet_airflow() const; + uint16_t klystron_current() const; + uint16_t klystron_filament_current() const; + uint16_t klystron_vacion_current() const; + uint16_t klystron_air_temperature() const; + uint16_t klystron_airflow() const; + uint16_t modulator_switch_maintenance() const; + uint16_t post_charge_regulator_maintenance() const; + uint16_t wg_pressure_humidity() const; + uint16_t transmitter_overvoltage() const; + uint16_t transmitter_overcurrent() const; + uint16_t focus_coil_current() const; + uint16_t focus_coil_airflow() const; + uint16_t oil_temperature() const; + uint16_t prf_limit() const; + uint16_t transmitter_oil_level() const; + uint16_t transmitter_battery_charging() const; + uint16_t high_voltage_status() const; + uint16_t transmitter_recycling_summary() const; + uint16_t transmitter_inoperable() const; + uint16_t transmitter_air_filter() const; + uint16_t zero_test_bit(unsigned i) const; + uint16_t one_test_bit(unsigned i) const; + uint16_t xmtr_spip_interface() const; + uint16_t transmitter_summary_status() const; + float transmitter_rf_power() const; + float horizontal_xmtr_peak_power() const; + float xmtr_peak_power() const; + float vertical_xmtr_peak_power() const; + float xmtr_rf_avg_power() const; + uint32_t xmtr_recycle_count() const; + float receiver_bias() const; + float transmit_imbalance() const; + float xmtr_power_meter_zero() const; + uint16_t ac_unit1_compressor_shut_off() const; + uint16_t ac_unit2_compressor_shut_off() const; + uint16_t generator_maintenance_required() const; + uint16_t generator_battery_voltage() const; + uint16_t generator_engine() const; + uint16_t generator_volt_frequency() const; + uint16_t power_source() const; + uint16_t transitional_power_source() const; + uint16_t generator_auto_run_off_switch() const; + uint16_t aircraft_hazard_lighting() const; + uint16_t equipment_shelter_fire_detection_system() const; + uint16_t equipment_shelter_fire_smoke() const; + uint16_t generator_shelter_fire_smoke() const; + uint16_t utility_voltage_frequency() const; + uint16_t site_security_alarm() const; + uint16_t security_equipment() const; + uint16_t security_system() const; + uint16_t receiver_connected_to_antenna() const; + uint16_t radome_hatch() const; + uint16_t ac_unit1_filter_dirty() const; + uint16_t ac_unit2_filter_dirty() const; + float equipment_shelter_temperature() const; + float outside_ambient_temperature() const; + float transmitter_leaving_air_temp() const; + float ac_unit1_discharge_air_temp() const; + float generator_shelter_temperature() const; + float radome_air_temperature() const; + float ac_unit2_discharge_air_temp() const; + float spip_15v_ps() const; + float spip_neg_15v_ps() const; + uint16_t spip_28v_ps_status() const; + float spip_5v_ps() const; + uint16_t converted_generator_fuel_level() const; + uint16_t elevation_pos_dead_limit() const; + uint16_t _150v_overvoltage() const; + uint16_t _150v_undervoltage() const; + uint16_t elevation_servo_amp_inhibit() const; + uint16_t elevation_servo_amp_short_circuit() const; + uint16_t elevation_servo_amp_overtemp() const; + uint16_t elevation_motor_overtemp() const; + uint16_t elevation_stow_pin() const; + uint16_t elevation_housing_5v_ps() const; + uint16_t elevation_neg_dead_limit() const; + uint16_t elevation_pos_normal_limit() const; + uint16_t elevation_neg_normal_limit() const; + uint16_t elevation_encoder_light() const; + uint16_t elevation_gearbox_oil() const; + uint16_t elevation_handwheel() const; + uint16_t elevation_amp_ps() const; + uint16_t azimuth_servo_amp_inhibit() const; + uint16_t azimuth_servo_amp_short_circuit() const; + uint16_t azimuth_servo_amp_overtemp() const; + uint16_t azimuth_motor_overtemp() const; + uint16_t azimuth_stow_pin() const; + uint16_t azimuth_housing_5v_ps() const; + uint16_t azimuth_encoder_light() const; + uint16_t azimuth_gearbox_oil() const; + uint16_t azimuth_bull_gear_oil() const; + uint16_t azimuth_handwheel() const; + uint16_t azimuth_servo_amp_ps() const; + uint16_t servo() const; + uint16_t pedestal_interlock_switch() const; + uint16_t coho_clock() const; + uint16_t rf_generator_frequency_select_oscillator() const; + uint16_t rf_generator_rf_stalo() const; + uint16_t rf_generator_phase_shifted_coho() const; + uint16_t _9v_receiver_ps() const; + uint16_t _5v_receiver_ps() const; + uint16_t _18v_receiver_ps() const; + uint16_t neg_9v_receiver_ps() const; + uint16_t _5v_single_channel_rdaiu_ps() const; + float horizontal_short_pulse_noise() const; + float horizontal_long_pulse_noise() const; + float horizontal_noise_temperature() const; + float vertical_short_pulse_noise() const; + float vertical_long_pulse_noise() const; + float vertical_noise_temperature() const; + float horizontal_linearity() const; + float horizontal_dynamic_range() const; + float horizontal_delta_dbz0() const; + float vertical_delta_dbz0() const; + float kd_peak_measured() const; + float short_pulse_horizontal_dbz0() const; + float long_pulse_horizontal_dbz0() const; + uint16_t velocity_processed() const; + uint16_t width_processed() const; + uint16_t velocity_rf_gen() const; + uint16_t width_rf_gen() const; + float horizontal_i0() const; + float vertical_i0() const; + float vertical_dynamic_range() const; + float short_pulse_vertical_dbz0() const; + float long_pulse_vertical_dbz0() const; + float horizontal_power_sense() const; + float vertical_power_sense() const; + float zdr_bias() const; + float clutter_suppression_delta() const; + float clutter_suppression_unfiltered_power() const; + float clutter_suppression_filtered_power() const; + float vertical_linearity() const; + uint16_t state_file_read_status() const; + uint16_t state_file_write_status() const; + uint16_t bypass_map_file_read_status() const; + uint16_t bypass_map_file_write_status() const; + uint16_t current_adaptation_file_read_status() const; + uint16_t current_adaptation_file_write_status() const; + uint16_t censor_zone_file_read_status() const; + uint16_t censor_zone_file_write_status() const; + uint16_t remote_vcp_file_read_status() const; + uint16_t remote_vcp_file_write_status() const; + uint16_t baseline_adaptation_file_read_status() const; + uint16_t read_status_of_prf_sets() const; + uint16_t clutter_filter_map_file_read_status() const; + uint16_t clutter_filter_map_file_write_status() const; + uint16_t generatl_disk_io_error() const; + uint8_t rsp_status() const; + uint8_t motherboard_temperature() const; + uint8_t cpu1_temperature() const; + uint8_t cpu2_temperature() const; + uint16_t cpu1_fan_speed() const; + uint16_t cpu2_fan_speed() const; + uint16_t rsp_fan1_speed() const; + uint16_t rsp_fan2_speed() const; + uint16_t rsp_fan3_speed() const; + uint16_t spip_comm_status() const; + uint16_t hci_comm_status() const; + uint16_t signal_processor_command_status() const; + uint16_t ame_communication_status() const; + uint16_t rms_link_status() const; + uint16_t rpg_link_status() const; + uint16_t interpanel_link_status() const; + uint32_t performance_check_time() const; + uint16_t version() const; bool Parse(std::istream& is); diff --git a/wxdata/include/scwx/wsr88d/rda/rda_adaptation_data.hpp b/wxdata/include/scwx/wsr88d/rda/rda_adaptation_data.hpp index cac687a7..38d519a1 100644 --- a/wxdata/include/scwx/wsr88d/rda/rda_adaptation_data.hpp +++ b/wxdata/include/scwx/wsr88d/rda/rda_adaptation_data.hpp @@ -23,183 +23,183 @@ public: RdaAdaptationData(RdaAdaptationData&&) noexcept; RdaAdaptationData& operator=(RdaAdaptationData&&) noexcept; - const std::string& adap_file_name() const; - const std::string& adap_format() const; - const std::string& adap_revision() const; - const std::string& adap_date() const; - const std::string& adap_time() const; - float lower_pre_limit() const; - float az_lat() const; - float upper_pre_limit() const; - float el_lat() const; - float parkaz() const; - float parkel() const; - float a_fuel_conv(unsigned i) const; - float a_min_shelter_temp() const; - float a_max_shelter_temp() const; - float a_min_shelter_ac_temp_diff() const; - float a_max_xmtr_air_temp() const; - float a_max_rad_temp() const; - float a_max_rad_temp_rise() const; - float lower_dead_limit() const; - float upper_dead_limit() const; - float a_min_gen_room_temp() const; - float a_max_gen_room_temp() const; - float spip_5v_reg_lim() const; - float spip_15v_reg_lim() const; - bool rpg_co_located() const; - bool spec_filter_installed() const; - bool tps_installed() const; - bool rms_installed() const; - uint32_t a_hvdl_tst_int() const; - uint32_t a_rpg_lt_int() const; - uint32_t a_min_stab_util_pwr_time() const; - uint32_t a_gen_auto_exer_interval() const; - uint32_t a_util_pwr_sw_req_interval() const; - float a_low_fuel_level() const; - uint32_t config_chan_number() const; - uint32_t redundant_chan_config() const; - float atten_table(unsigned i) const; - float path_losses(unsigned i) const; - float h_coupler_xmt_loss() const; - float h_coupler_cw_loss() const; - float v_coupler_xmt_loss() const; - float ame_ts_bias() const; - float v_coupler_cw_loss() const; - float pwr_sense_bias() const; - float ame_v_noise_enr() const; - float chan_cal_diff() const; - float v_ts_cw() const; - float h_rnscale(unsigned i) const; - float atmos(unsigned i) const; - float el_index(unsigned i) const; - uint32_t tfreq_mhz() const; - float base_data_tcn() const; - float refl_data_tover() const; - float tar_h_dbz0_lp() const; - float tar_v_dbz0_lp() const; - uint32_t init_phi_dp() const; - uint32_t norm_init_phi_dp() const; - float lx_lp() const; - float lx_sp() const; - float meteor_param() const; - float antenna_gain() const; - float vel_degrad_limit() const; - float wth_degrad_limit() const; - float h_noisetemp_dgrad_limit() const; - uint32_t h_min_noisetemp() const; - float v_noisetemp_dgrad_limit() const; - uint32_t v_min_noisetemp() const; - float kly_degrade_limit() const; - float ts_coho() const; - float h_ts_cw() const; - float ts_stalo() const; - float ame_h_noise_enr() const; - float xmtr_peak_pwr_high_limit() const; - float xmtr_peak_pwr_low_limit() const; - float h_dbz0_delta_limit() const; - float threshold1() const; - float threshold2() const; - float clut_supp_dgrad_lim() const; - float range0_value() const; - float xmtr_pwr_mtr_scale() const; - float v_dbz0_delta_limit() const; - float tar_h_dbz0_sp() const; - float tar_v_dbz0_sp() const; - uint32_t deltaprf() const; - uint32_t tau_sp() const; - uint32_t tau_lp() const; - uint32_t nc_dead_value() const; - uint32_t tau_rf_sp() const; - uint32_t tau_rf_lp() const; - float seg1_lim() const; - float slatsec() const; - float slonsec() const; - uint32_t slatdeg() const; - uint32_t slatmin() const; - uint32_t slondeg() const; - uint32_t slonmin() const; - char slatdir() const; - char slondir() const; - float az_correction_factor() const; - float el_correction_factor() const; - const std::string& site_name() const; - float ant_manual_setup_ielmin() const; - float ant_manual_setup_ielmax() const; - uint32_t ant_manual_setup_fazvelmax() const; - uint32_t ant_manual_setup_felvelmax() const; - int32_t ant_manual_setup_ignd_hgt() const; - uint32_t ant_manual_setup_irad_hgt() const; - float az_pos_sustain_drive() const; - float az_neg_sustain_drive() const; - float az_nom_pos_drive_slope() const; - float az_nom_neg_drive_slope() const; - float az_feedback_slope() const; - float el_pos_sustain_drive() const; - float el_neg_sustain_drive() const; - float el_nom_pos_drive_slope() const; - float el_nom_neg_drive_slope() const; - float el_feedback_slope() const; - float el_first_slope() const; - float el_second_slope() const; - float el_third_slope() const; - float el_droop_pos() const; - float el_off_neutral_drive() const; - float az_intertia() const; - float el_inertia() const; - uint32_t rvp8nv_iwaveguide_length() const; - float v_rnscale(unsigned i) const; - float vel_data_tover() const; - float width_data_tover() const; - float doppler_range_start() const; - uint32_t max_el_index() const; - float seg2_lim() const; - float seg3_lim() const; - float seg4_lim() const; - uint32_t nbr_el_segments() const; - float h_noise_long() const; - float ant_noise_temp() const; - float h_noise_short() const; - float h_noise_tolerance() const; - float min_h_dyn_range() const; - bool gen_installed() const; - bool gen_exercise() const; - float v_noise_tolerance() const; - float min_v_dyn_range() const; - float zdr_bias_dgrad_lim() const; - float baseline_zdr_bias() const; - float v_noise_long() const; - float v_noise_short() const; - float zdr_data_tover() const; - float phi_data_tover() const; - float rho_data_tover() const; - float stalo_power_dgrad_limit() const; - float stalo_power_maint_limit() const; - float min_h_pwr_sense() const; - float min_v_pwr_sense() const; - float h_pwr_sense_offset() const; - float v_pwr_sense_offset() const; - float ps_gain_ref() const; - float rf_pallet_broad_loss() const; - float ame_ps_tolerance() const; - float ame_max_temp() const; - float ame_min_temp() const; - float rcvr_mod_max_temp() const; - float rcvr_mod_min_temp() const; - float bite_mod_max_temp() const; - float bite_mod_min_temp() const; - uint32_t default_polarization() const; - float tr_limit_dgrad_limit() const; - float tr_limit_fail_limit() const; - bool rfp_stepper_enabled() const; - float ame_current_tolerance() const; - uint32_t h_only_polarization() const; - uint32_t v_only_polarization() const; - float sun_bias() const; - float a_min_shelter_temp_warn() const; - float power_meter_zero() const; - float txb_baseline() const; - float txb_alarm_thresh() const; + std::string adap_file_name() const; + std::string adap_format() const; + std::string adap_revision() const; + std::string adap_date() const; + std::string adap_time() const; + float lower_pre_limit() const; + float az_lat() const; + float upper_pre_limit() const; + float el_lat() const; + float parkaz() const; + float parkel() const; + float a_fuel_conv(unsigned i) const; + float a_min_shelter_temp() const; + float a_max_shelter_temp() const; + float a_min_shelter_ac_temp_diff() const; + float a_max_xmtr_air_temp() const; + float a_max_rad_temp() const; + float a_max_rad_temp_rise() const; + float lower_dead_limit() const; + float upper_dead_limit() const; + float a_min_gen_room_temp() const; + float a_max_gen_room_temp() const; + float spip_5v_reg_lim() const; + float spip_15v_reg_lim() const; + bool rpg_co_located() const; + bool spec_filter_installed() const; + bool tps_installed() const; + bool rms_installed() const; + uint32_t a_hvdl_tst_int() const; + uint32_t a_rpg_lt_int() const; + uint32_t a_min_stab_util_pwr_time() const; + uint32_t a_gen_auto_exer_interval() const; + uint32_t a_util_pwr_sw_req_interval() const; + float a_low_fuel_level() const; + uint32_t config_chan_number() const; + uint32_t redundant_chan_config() const; + float atten_table(unsigned i) const; + float path_losses(unsigned i) const; + float h_coupler_xmt_loss() const; + float h_coupler_cw_loss() const; + float v_coupler_xmt_loss() const; + float ame_ts_bias() const; + float v_coupler_cw_loss() const; + float pwr_sense_bias() const; + float ame_v_noise_enr() const; + float chan_cal_diff() const; + float v_ts_cw() const; + float h_rnscale(unsigned i) const; + float atmos(unsigned i) const; + float el_index(unsigned i) const; + uint32_t tfreq_mhz() const; + float base_data_tcn() const; + float refl_data_tover() const; + float tar_h_dbz0_lp() const; + float tar_v_dbz0_lp() const; + uint32_t init_phi_dp() const; + uint32_t norm_init_phi_dp() const; + float lx_lp() const; + float lx_sp() const; + float meteor_param() const; + float antenna_gain() const; + float vel_degrad_limit() const; + float wth_degrad_limit() const; + float h_noisetemp_dgrad_limit() const; + uint32_t h_min_noisetemp() const; + float v_noisetemp_dgrad_limit() const; + uint32_t v_min_noisetemp() const; + float kly_degrade_limit() const; + float ts_coho() const; + float h_ts_cw() const; + float ts_stalo() const; + float ame_h_noise_enr() const; + float xmtr_peak_pwr_high_limit() const; + float xmtr_peak_pwr_low_limit() const; + float h_dbz0_delta_limit() const; + float threshold1() const; + float threshold2() const; + float clut_supp_dgrad_lim() const; + float range0_value() const; + float xmtr_pwr_mtr_scale() const; + float v_dbz0_delta_limit() const; + float tar_h_dbz0_sp() const; + float tar_v_dbz0_sp() const; + uint32_t deltaprf() const; + uint32_t tau_sp() const; + uint32_t tau_lp() const; + uint32_t nc_dead_value() const; + uint32_t tau_rf_sp() const; + uint32_t tau_rf_lp() const; + float seg1_lim() const; + float slatsec() const; + float slonsec() const; + uint32_t slatdeg() const; + uint32_t slatmin() const; + uint32_t slondeg() const; + uint32_t slonmin() const; + char slatdir() const; + char slondir() const; + float az_correction_factor() const; + float el_correction_factor() const; + std::string site_name() const; + float ant_manual_setup_ielmin() const; + float ant_manual_setup_ielmax() const; + uint32_t ant_manual_setup_fazvelmax() const; + uint32_t ant_manual_setup_felvelmax() const; + int32_t ant_manual_setup_ignd_hgt() const; + uint32_t ant_manual_setup_irad_hgt() const; + float az_pos_sustain_drive() const; + float az_neg_sustain_drive() const; + float az_nom_pos_drive_slope() const; + float az_nom_neg_drive_slope() const; + float az_feedback_slope() const; + float el_pos_sustain_drive() const; + float el_neg_sustain_drive() const; + float el_nom_pos_drive_slope() const; + float el_nom_neg_drive_slope() const; + float el_feedback_slope() const; + float el_first_slope() const; + float el_second_slope() const; + float el_third_slope() const; + float el_droop_pos() const; + float el_off_neutral_drive() const; + float az_intertia() const; + float el_inertia() const; + uint32_t rvp8nv_iwaveguide_length() const; + float v_rnscale(unsigned i) const; + float vel_data_tover() const; + float width_data_tover() const; + float doppler_range_start() const; + uint32_t max_el_index() const; + float seg2_lim() const; + float seg3_lim() const; + float seg4_lim() const; + uint32_t nbr_el_segments() const; + float h_noise_long() const; + float ant_noise_temp() const; + float h_noise_short() const; + float h_noise_tolerance() const; + float min_h_dyn_range() const; + bool gen_installed() const; + bool gen_exercise() const; + float v_noise_tolerance() const; + float min_v_dyn_range() const; + float zdr_bias_dgrad_lim() const; + float baseline_zdr_bias() const; + float v_noise_long() const; + float v_noise_short() const; + float zdr_data_tover() const; + float phi_data_tover() const; + float rho_data_tover() const; + float stalo_power_dgrad_limit() const; + float stalo_power_maint_limit() const; + float min_h_pwr_sense() const; + float min_v_pwr_sense() const; + float h_pwr_sense_offset() const; + float v_pwr_sense_offset() const; + float ps_gain_ref() const; + float rf_pallet_broad_loss() const; + float ame_ps_tolerance() const; + float ame_max_temp() const; + float ame_min_temp() const; + float rcvr_mod_max_temp() const; + float rcvr_mod_min_temp() const; + float bite_mod_max_temp() const; + float bite_mod_min_temp() const; + uint32_t default_polarization() const; + float tr_limit_dgrad_limit() const; + float tr_limit_fail_limit() const; + bool rfp_stepper_enabled() const; + float ame_current_tolerance() const; + uint32_t h_only_polarization() const; + uint32_t v_only_polarization() const; + float sun_bias() const; + float a_min_shelter_temp_warn() const; + float power_meter_zero() const; + float txb_baseline() const; + float txb_alarm_thresh() const; bool Parse(std::istream& is); diff --git a/wxdata/source/scwx/awips/wmo_header.cpp b/wxdata/source/scwx/awips/wmo_header.cpp index d2f1e192..7f3d3466 100644 --- a/wxdata/source/scwx/awips/wmo_header.cpp +++ b/wxdata/source/scwx/awips/wmo_header.cpp @@ -74,47 +74,47 @@ bool WmoHeaderImpl::operator==(const WmoHeaderImpl& o) const productDesignator_ == o.productDesignator_); } -const std::string& WmoHeader::sequence_number() const +std::string WmoHeader::sequence_number() const { return p->sequenceNumber_; } -const std::string& WmoHeader::data_type() const +std::string WmoHeader::data_type() const { return p->dataType_; } -const std::string& WmoHeader::geographic_designator() const +std::string WmoHeader::geographic_designator() const { return p->geographicDesignator_; } -const std::string& WmoHeader::bulletin_id() const +std::string WmoHeader::bulletin_id() const { return p->bulletinId_; } -const std::string& WmoHeader::icao() const +std::string WmoHeader::icao() const { return p->icao_; } -const std::string& WmoHeader::date_time() const +std::string WmoHeader::date_time() const { return p->dateTime_; } -const std::string& WmoHeader::bbb_indicator() const +std::string WmoHeader::bbb_indicator() const { return p->bbbIndicator_; } -const std::string& WmoHeader::product_category() const +std::string WmoHeader::product_category() const { return p->productCategory_; } -const std::string& WmoHeader::product_designator() const +std::string WmoHeader::product_designator() const { return p->productDesignator_; } diff --git a/wxdata/source/scwx/common/products.cpp b/wxdata/source/scwx/common/products.cpp index 69577e16..86524416 100644 --- a/wxdata/source/scwx/common/products.cpp +++ b/wxdata/source/scwx/common/products.cpp @@ -47,14 +47,13 @@ const std::string& GetProductGroupName(RadarProductGroup group) return productGroupName_.at(group); } -const RadarProductGroup GetProductGroup(const std::string& name) +RadarProductGroup GetProductGroup(const std::string& name) { auto result = std::find_if( productGroupName_.cbegin(), productGroupName_.cend(), - [&](const std::pair& pair) -> bool { - return pair.second == name; - }); + [&](const std::pair& pair) -> bool + { return pair.second == name; }); if (result != productGroupName_.cend()) { @@ -81,14 +80,13 @@ const std::string& GetLevel2Palette(Level2Product product) return level2Palette_.at(product); } -const Level2Product GetLevel2Product(const std::string& name) +Level2Product GetLevel2Product(const std::string& name) { auto result = std::find_if( level2Name_.cbegin(), level2Name_.cend(), - [&](const std::pair& pair) -> bool { - return pair.second == name; - }); + [&](const std::pair& pair) -> bool + { return pair.second == name; }); if (result != level2Name_.cend()) { diff --git a/wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp b/wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp index 21697c7d..586cf40c 100644 --- a/wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp +++ b/wxdata/source/scwx/wsr88d/rda/digital_radar_data.cpp @@ -550,7 +550,7 @@ DigitalRadarData::DigitalRadarData(DigitalRadarData&&) noexcept = default; DigitalRadarData& DigitalRadarData::operator=(DigitalRadarData&&) noexcept = default; -const std::string& DigitalRadarData::radar_identifier() const +std::string DigitalRadarData::radar_identifier() const { return p->radarIdentifier_; } diff --git a/wxdata/source/scwx/wsr88d/rda/performance_maintenance_data.cpp b/wxdata/source/scwx/wsr88d/rda/performance_maintenance_data.cpp index 2a5e4e5f..e811d78b 100644 --- a/wxdata/source/scwx/wsr88d/rda/performance_maintenance_data.cpp +++ b/wxdata/source/scwx/wsr88d/rda/performance_maintenance_data.cpp @@ -821,7 +821,7 @@ uint16_t PerformanceMaintenanceData::rcp_status() const return p->rcpStatus_; } -const std::string& PerformanceMaintenanceData::rcp_string() const +std::string PerformanceMaintenanceData::rcp_string() const { return p->rcpString_; } diff --git a/wxdata/source/scwx/wsr88d/rda/rda_adaptation_data.cpp b/wxdata/source/scwx/wsr88d/rda/rda_adaptation_data.cpp index 0b579d1d..dd21c415 100644 --- a/wxdata/source/scwx/wsr88d/rda/rda_adaptation_data.cpp +++ b/wxdata/source/scwx/wsr88d/rda/rda_adaptation_data.cpp @@ -378,27 +378,27 @@ RdaAdaptationData::RdaAdaptationData(RdaAdaptationData&&) noexcept = default; RdaAdaptationData& RdaAdaptationData::operator=(RdaAdaptationData&&) noexcept = default; -const std::string& RdaAdaptationData::adap_file_name() const +std::string RdaAdaptationData::adap_file_name() const { return p->adapFileName_; } -const std::string& RdaAdaptationData::adap_format() const +std::string RdaAdaptationData::adap_format() const { return p->adapFormat_; } -const std::string& RdaAdaptationData::adap_revision() const +std::string RdaAdaptationData::adap_revision() const { return p->adapRevision_; } -const std::string& RdaAdaptationData::adap_date() const +std::string RdaAdaptationData::adap_date() const { return p->adapDate_; } -const std::string& RdaAdaptationData::adap_time() const +std::string RdaAdaptationData::adap_time() const { return p->adapTime_; } @@ -878,7 +878,7 @@ float RdaAdaptationData::el_correction_factor() const return p->elCorrectionFactor_; } -const std::string& RdaAdaptationData::site_name() const +std::string RdaAdaptationData::site_name() const { return p->siteName_; }