From bcb90c6af1d669355609bd51777426e6c0013eac Mon Sep 17 00:00:00 2001 From: Kellen <42391110+krosburg@users.noreply.github.com> Date: Mon, 9 Sep 2019 15:52:07 -0700 Subject: [PATCH 1/5] New params for PARAD_A Updated ParameterDefs.csv to add new parameters to support updates to the PARAD_A driver. --- csv/ParameterDefs.csv | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/csv/ParameterDefs.csv b/csv/ParameterDefs.csv index 1ab9ffc..bd7d378 100644 --- a/csv/ParameterDefs.csv +++ b/csv/ParameterDefs.csv @@ -131,6 +131,10 @@ BETA,PRESF,press_coeff_b,PD173,quantity,,float32,,1,-9999999,Pressure Coefficien "BETA,CTD_CABLED,CTD_CABLED_SBE43",PRESF,cond_coeff_cslope,PD187,quantity,,float32,,1,-9999999,Conductivity Coefficient Slope,6,,,,,,,,,, PARAD_A,PARAD,par,PD188,quantity,,uint32,,counts,0,PAR Measurement,0,,,,,,OPTPARW_L0,Photosynthetically Active Radiation (PAR) unprocessed sensor reading.,Photosynthetically Active Radiation (400-700 nm) Measurement,Unprocessed Data,L0 PARAD_A,PARAD,par_counts_output,PD192,function,,float32,,µmol photons m-2 s-1,-99999999,Photosynthetically Active Radiation,4,,PFID83,"{""counts_output"":""PD188"",""a0"":""CC_a0"",""a1"":""CC_a1"",""Im"":""CC_Im""}",OPTPARW,downwelling_photosynthetic_photon_flux_in_sea_water,OPTPARW_L1,Photosynthetically Active Radiation (PAR) is the measure of the density of photons per unit area that are in the spectral range of light (400-700 nanometers) that primary producers use for photosynthesis.,Photosynthetically Active Radiation (400-700 nm),Science Data,L1 +PARAD_A,PARAD,par_measured,PD191,quantity,,float32,,µmol photons m-2 s-1,-99999999,Measured Photosynthetically Active Radiation,4,,,,OPTPARW,downwelling_photosynthetic_photon_flux_in_sea_water,OPTPARW_L1,Photosynthetically Active Radiation (PAR) is the measure of the density of photons per unit area that are in the spectral range of light (400-700 nanometers) that primary producers use for photosynthesis.,Photosynthetically Active Radiation (400-700 nm),Science Data,L1 +PARAD_A,PARAD,input_voltage,PD27,quantity,,float32,,volts,-99999999,Instrument Input Voltage,9,FALSE,,,,,,Instrument input voltage.,Instrument Input Voltage,Engineering Data,L0 +PARAD_A,PARAD,voltage_out,PD189,quantity,,float32,,volts,-99999999,Instrument Output Voltage,7,FALSE,,,,,,Instrument output voltage.,Instrument Output Voltage,Engineering Data,L0 +PARAD_A,PARAD,temperature_volts,PD190,quantity,,float32,,volts,-99999999,Internal Temperature Raw Voltage,5,FALSE,,,,,,Raw analog voltage of instrument internal temperature sensor.,Temperature Raw Voltage,Engineering Data,L0 "BETA,CTD_CABLED,CTD_CABLED_SBE43,CTDPF_CKL_CSTL,CTDMO_GHQR",CTDBP,temperature,PD193,quantity,,int32,,counts,-9999999,Seawater Temperature Measurement,0,,,,,,TEMPWAT_L0,Seawater temperature unprocessed measurement near the sensor.,Seawater Temperature Measurement,Unprocessed Data,L0 "BETA,CTD_CABLED,CTD_CABLED_SBE43,CTDPF_CKL_CSTL,CTDMO_GHQR",CTDBP,conductivity,PD194,quantity,,int32,,counts,-9999999,Seawater Conductivity Measurement,0,,,,,,CONDWAT_L0,"Seawater conductivity refers to the ability of seawater to conduct electricity. The presence of ions in the seawater, such as salt, increases the electrical conducting ability of seawater. As such, conductivity can be used as a proxy for determining the quantity of salt in a sample of seawater. This is the unprocessed data that are output directly from the sensor which are then converted to salinity in S m-1.",Seawater Electrical Conductivity Measurement,Unprocessed Data,L0 "BETA,CTD_CABLED,CTD_CABLED_SBE43,CTDPF_CKL_CSTL,CTDMO_GHQR",CTDBP,pressure,PD195,quantity,,int32,,counts,-9999999,Seawater Pressure Measurement,0,,,,,,PRESWAT_L0,Seawater Pressure refers to the pressure exerted on a sensor in situ by the weight of the column of seawater above it. It is calculated by subtracting one standard atmosphere from the absolute pressure at the sensor to remove the weight of the atmosphere on top of the water column. The pressure at a sensor in situ provides a metric of the depth of that sensor. This is the unprocessed data that are output directly from the sensor which are then converted to pressure in dbar.,Seawater Pressure Measurement,Unprocessed Data,L0 @@ -3602,3 +3606,7 @@ ADCP_PD0,,non_zero_pressure,PD8083,function,,float32,,dbar,-9999999,Non-zero Pre ADCP_PD0,,depth_from_pressure,PD8084,function,,float32,,m,-9999999,Depth calculated from pressure,3,FALSE,PFID217,"{""latitude"":""CC_lat"", ""pressure"":""PD8083""}",,,,Depth (m) calculated from pressure (dbar) and latitude.,,,L1 ADCP_PD0,,non_zero_depth,PD8085,function,,float32,,m,-9999999,Non-zero Depth,3,FALSE,PFID216,"{""a1"":""PD8084"", ""a2"":""CC_depth""}",,,,A non-zero depth value.,,,L1 ADCP_PD0,ADCP_PD0,bin_depths,PD8086,function,"[""bin""]",float32,,m,-9999999,Bin Depths,3,,PFID203,"{""sensor_depth"":""PD8085"", ""bin_size"":""PD623"", ""dist_first_bin"":""PD651"", ""num_bins"":""PD621"", ""adcp_orientation"":""PD617""}",,,,Bin Depths,,,L1 +PARAD_A,PARAD,x_accel_counts,PD8087,quantity,,int32,,counts,0,X-Axis Acceleration Counts,0,FALSE,,,,,,X-Axis Accelerometer Counts,X-Axis Acceleration Counts,Engineering Data,L0 +PARAD_A,PARAD,y_accel_counts,PD8088,quantity,,int32,,counts,0,Y-Axis Acceleration Counts,0,FALSE,,,,,,Y-Axis Accelerometer Counts,Y-Axis Acceleration Counts,Engineering Data,L0 +PARAD_A,PARAD,z_accel_counts,PD8089,quantity,,int32,,counts,0,Z-Axis Acceleratiton Counts,0,FALSE,,,,,,Z-Axis Accelerometer Counts,Z-Axis Acceleratiton Counts,Engineering Data,L0 +PARAD_A,PARAD,status,PD8090,quantity,,int32,,,0,Z-Axis Acceleratiton Counts,0,FALSE,,,,,,Z-Axis Accelerometer Counts,Z-Axis Acceleratiton Counts,Engineering Data,L0 From fc2206edc8800655f7ccdffcc7658c52ace240d7 Mon Sep 17 00:00:00 2001 From: Kellen <42391110+krosburg@users.noreply.github.com> Date: Tue, 10 Sep 2019 16:56:45 -0700 Subject: [PATCH 2/5] Updated for changes to PARAD_A driver. Removed an unnecessary field, "STATUS". --- csv/ParameterDefs.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/csv/ParameterDefs.csv b/csv/ParameterDefs.csv index bd7d378..b074c7e 100644 --- a/csv/ParameterDefs.csv +++ b/csv/ParameterDefs.csv @@ -3609,4 +3609,3 @@ ADCP_PD0,ADCP_PD0,bin_depths,PD8086,function,"[""bin""]",float32,,m,-9999999,Bin PARAD_A,PARAD,x_accel_counts,PD8087,quantity,,int32,,counts,0,X-Axis Acceleration Counts,0,FALSE,,,,,,X-Axis Accelerometer Counts,X-Axis Acceleration Counts,Engineering Data,L0 PARAD_A,PARAD,y_accel_counts,PD8088,quantity,,int32,,counts,0,Y-Axis Acceleration Counts,0,FALSE,,,,,,Y-Axis Accelerometer Counts,Y-Axis Acceleration Counts,Engineering Data,L0 PARAD_A,PARAD,z_accel_counts,PD8089,quantity,,int32,,counts,0,Z-Axis Acceleratiton Counts,0,FALSE,,,,,,Z-Axis Accelerometer Counts,Z-Axis Acceleratiton Counts,Engineering Data,L0 -PARAD_A,PARAD,status,PD8090,quantity,,int32,,,0,Z-Axis Acceleratiton Counts,0,FALSE,,,,,,Z-Axis Accelerometer Counts,Z-Axis Acceleratiton Counts,Engineering Data,L0 From c9903464a01468c0fb9176d070e79e9728f4a2f2 Mon Sep 17 00:00:00 2001 From: Kellen <42391110+krosburg@users.noreply.github.com> Date: Tue, 10 Sep 2019 17:13:33 -0700 Subject: [PATCH 3/5] Update ParamDefs to include new PARAD_A fields --- csv/ParameterDictionary.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/csv/ParameterDictionary.csv b/csv/ParameterDictionary.csv index 7c2f62f..a0c7808 100644 --- a/csv/ParameterDictionary.csv +++ b/csv/ParameterDictionary.csv @@ -11,7 +11,7 @@ DOSTA,DICT22,,do_stable_sample,"PD7,PD10,PD11,PD12,PD16,PD863,PD197,PD964,PD835, "SP_TEST,CTD_CABLED",DICT25,,ctdbp_no_calibration_coefficients,"PD7,PD10,PD11,PD12,PD16,PD863,PD312,PD175,PD176,PD177,PD178,PD179,PD229,PD180,PD181,PD182,PD183,PD184,PD186,PD185,PD187,PD280,PD158,PD163,PD164,PD165,PD166,PD167,PD168,PD169,PD170,PD171,PD256,PD174,PD281,PD244,PD243,PD246,PD245,PD248,PD247,PD250,PD249,PD252,PD251,PD254,PD253,PD255,PD257,PD258",PD7,,Engineering,Calibration Data, "SP_TEST,CTD_CABLED",DICT26,,ctdbp_no_status,"PD7,PD10,PD11,PD12,PD16,PD863,PD312,PD93,PD202,PD263,PD121,PD122,PD120,PD199,PD200,PD201,PD204,PD203,PD264,PD265,PD2293",PD7,,Engineering,Status Data, "SP_TEST,CTD_CABLED",DICT27,,ctdbp_no_configuration,"PD7,PD10,PD11,PD12,PD16,PD863,PD312,PD211,PD218,PD219,PD220,PD221,PD222,PD223,PD213,PD215,PD216,PD217,PD224,PD267,PD225,PD2294,PD2295,PD2296,PD2297,PD2298,PD2299,PD2300",PD7,,Engineering,Configuration Data, -PARAD_A,DICT28,,parad_sa_sample,"PD7,PD10,PD11,PD12,PD16,PD863,PD312,PD28,PD188,PD15,PD192",PD7,,Science,Data Products, +PARAD_A,DICT28,,parad_sa_sample,"PD7,PD10,PD11,PD12,PD16,PD863,PD312,PD28,PD188,PD15,PD192,PD191,PD27,PD189,PD190,PD8087,PD8088,PD8089,PD320,PD1144,PD438,PD437",PD7,,Science,Data Products, PREST,DICT31,,prest_real_time,"PD7,PD10,PD11,PD12,PD16,PD73,PD74,PD93,PD94,PD29,PD863,PD891",PD7,,Science,Data Products, PREST,DICT32,,prest_reference_oscillator,"PD7,PD10,PD11,PD12,PD16,PD268,PD269,PD73,PD74,PD93,PD271,PD272,PD273,PD270,PD863",PD7,,Engineering,Reference Oscillator Data, PREST,DICT33,,prest_configuration_data,"PD7,PD10,PD11,PD12,PD16,PD274,PD312,PD275,PD276,PD277,PD278,PD279,PD280,PD158,PD159,PD160,PD161,PD162,PD163,PD164,PD165,PD166,PD167,PD168,PD169,PD170,PD171,PD174,PD281,PD282,PD283,PD284,PD285,PD286,PD863",PD7,,Engineering,Configuration Data, From 71539a756ec8ad308c3ea937cfb57f3c5f29915a Mon Sep 17 00:00:00 2001 From: Kellen <42391110+krosburg@users.noreply.github.com> Date: Wed, 11 Sep 2019 14:55:01 -0700 Subject: [PATCH 4/5] Reorganized order of PD# entries --- csv/ParameterDefs.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/csv/ParameterDefs.csv b/csv/ParameterDefs.csv index b074c7e..47a11f9 100644 --- a/csv/ParameterDefs.csv +++ b/csv/ParameterDefs.csv @@ -42,6 +42,7 @@ FLOR,,fluorometric_chlorophyll_a,PD22,function,,float32,,µg L-1,-9999999,Chloro FLOR,,fluorometric_cdom,PD23,function,,float32,,ppb,-9999999,CDOM Concentration,6,,PFID79,"{""counts_output"":""PD1143"",""counts_dark"":""CC_dark_counts_cdom"",""scale_factor"":""CC_scale_factor_cdom""}",,,CDOMFLO_L1,"Fluorometric CDOM Concentration is a measure of how much light has been re-emitted (fluoresced) from colored organic compounds found in the colored dissolved organic matter (CDOM) in seawater. Examples of CDOM include tannins (polyphenols that bind to proteins and other large molecules) or lignins (polymers of phenolic acids) from decaying plant material and byproducts from the decomposition of animals. It accounts for the tea-like color in seawater. CDOM is not particulate, but seawater can contain both CDOM and turbidity.",Fluorometric CDOM Concentration,Science Data,L1 FLOR,,total_volume_scattering_coefficient,PD24,function,,float32,,m-1 sr-1,-9999999,Total Volume Scattering Coefficient,6,,PFID81,"{""counts_output"":""dpi_FLUBSCT_L0"",""counts_dark"":""CC_dark_counts_volume_scatter"", ""scale_factor"":""CC_scale_factor_volume_scatter""}",FLUBSCT,,FLUBSCT_L1,Total Volume Scattering Coefficient values represent the volume scattering from particles and the molecular scattering from water at a given wavelength of light and the default angle of 117 degrees for the ECO meter.,Total Volume Scattering Coefficient,,L1 FLOR,,optical_backscatter,PD25,function,,float32,,m-1,-9999999,Optical Backscatter,4,,PFID78,"{""beta"":""dpi_FLUBSCT_L1"", ""degC"":[""dpi_TEMPWAT_L1"",""dpi_TEMPSRF_L1""], ""psu"":[""dpi_PRACSAL_L2"",""dpi_SALSURF_L2""], ""theta"":""CC_scattering_angle"", ""wlngth"":""CC_measurement_wavelength"", ""xfactor"":""CC_angular_resolution""}",,,FLUBSCT_L2,"Optical Backscatter (Red Wavelengths) is a measure of the amount of red light (630-740 nm wavelengths) scattered in the backward direction due to suspended matter within seawater, providing a proxy for turbidity and suspended solids.",Optical Backscatter (Red Wavelengths),Science Data,L2 +PARAD_A,PARAD,input_voltage,PD27,quantity,,float32,,volts,-99999999,Instrument Input Voltage,9,FALSE,,,,,,Instrument input voltage.,Instrument Input Voltage,Engineering Data,L0 "BASE,PARAD_A",PARAD,elapsed_time,PD28,quantity,,float64,,s,-1,Time Since Reset,,,,,,,,,,, BASE,,pressure_temp,PD29,quantity,,float32,,ºC,-9999,Pressure Sensor Internal Temperature,,,,,,,,"The temperature at the pressure sensor (inside the housing, but isolated from housing and the electronics.",,, "BETA,CTDMO_GHQR",,sample_number,PD73,quantity,,int32,,count,-9999,Sample Number,0,FALSE,,,,,,,,, @@ -130,11 +131,10 @@ BETA,PRESF,press_coeff_b,PD173,quantity,,float32,,1,-9999999,Pressure Coefficien "BETA,CTD_CABLED,CTD_CABLED_SBE43",PRESF,cond_coeff_cpcor,PD186,quantity,,float32,,1,-9999999,Conductivity Coefficient PCor,6,,,,,,,,,, "BETA,CTD_CABLED,CTD_CABLED_SBE43",PRESF,cond_coeff_cslope,PD187,quantity,,float32,,1,-9999999,Conductivity Coefficient Slope,6,,,,,,,,,, PARAD_A,PARAD,par,PD188,quantity,,uint32,,counts,0,PAR Measurement,0,,,,,,OPTPARW_L0,Photosynthetically Active Radiation (PAR) unprocessed sensor reading.,Photosynthetically Active Radiation (400-700 nm) Measurement,Unprocessed Data,L0 -PARAD_A,PARAD,par_counts_output,PD192,function,,float32,,µmol photons m-2 s-1,-99999999,Photosynthetically Active Radiation,4,,PFID83,"{""counts_output"":""PD188"",""a0"":""CC_a0"",""a1"":""CC_a1"",""Im"":""CC_Im""}",OPTPARW,downwelling_photosynthetic_photon_flux_in_sea_water,OPTPARW_L1,Photosynthetically Active Radiation (PAR) is the measure of the density of photons per unit area that are in the spectral range of light (400-700 nanometers) that primary producers use for photosynthesis.,Photosynthetically Active Radiation (400-700 nm),Science Data,L1 -PARAD_A,PARAD,par_measured,PD191,quantity,,float32,,µmol photons m-2 s-1,-99999999,Measured Photosynthetically Active Radiation,4,,,,OPTPARW,downwelling_photosynthetic_photon_flux_in_sea_water,OPTPARW_L1,Photosynthetically Active Radiation (PAR) is the measure of the density of photons per unit area that are in the spectral range of light (400-700 nanometers) that primary producers use for photosynthesis.,Photosynthetically Active Radiation (400-700 nm),Science Data,L1 -PARAD_A,PARAD,input_voltage,PD27,quantity,,float32,,volts,-99999999,Instrument Input Voltage,9,FALSE,,,,,,Instrument input voltage.,Instrument Input Voltage,Engineering Data,L0 PARAD_A,PARAD,voltage_out,PD189,quantity,,float32,,volts,-99999999,Instrument Output Voltage,7,FALSE,,,,,,Instrument output voltage.,Instrument Output Voltage,Engineering Data,L0 PARAD_A,PARAD,temperature_volts,PD190,quantity,,float32,,volts,-99999999,Internal Temperature Raw Voltage,5,FALSE,,,,,,Raw analog voltage of instrument internal temperature sensor.,Temperature Raw Voltage,Engineering Data,L0 +PARAD_A,PARAD,par_measured,PD191,quantity,,float32,,µmol photons m-2 s-1,-99999999,Measured Photosynthetically Active Radiation,4,,,,OPTPARW,downwelling_photosynthetic_photon_flux_in_sea_water,OPTPARW_L1,Photosynthetically Active Radiation (PAR) is the measure of the density of photons per unit area that are in the spectral range of light (400-700 nanometers) that primary producers use for photosynthesis.,Photosynthetically Active Radiation (400-700 nm),Science Data,L1 +PARAD_A,PARAD,par_counts_output,PD192,function,,float32,,µmol photons m-2 s-1,-99999999,Photosynthetically Active Radiation,4,,PFID83,"{""counts_output"":""PD188"",""a0"":""CC_a0"",""a1"":""CC_a1"",""Im"":""CC_Im""}",OPTPARW,downwelling_photosynthetic_photon_flux_in_sea_water,OPTPARW_L1,Photosynthetically Active Radiation (PAR) is the measure of the density of photons per unit area that are in the spectral range of light (400-700 nanometers) that primary producers use for photosynthesis.,Photosynthetically Active Radiation (400-700 nm),Science Data,L1 "BETA,CTD_CABLED,CTD_CABLED_SBE43,CTDPF_CKL_CSTL,CTDMO_GHQR",CTDBP,temperature,PD193,quantity,,int32,,counts,-9999999,Seawater Temperature Measurement,0,,,,,,TEMPWAT_L0,Seawater temperature unprocessed measurement near the sensor.,Seawater Temperature Measurement,Unprocessed Data,L0 "BETA,CTD_CABLED,CTD_CABLED_SBE43,CTDPF_CKL_CSTL,CTDMO_GHQR",CTDBP,conductivity,PD194,quantity,,int32,,counts,-9999999,Seawater Conductivity Measurement,0,,,,,,CONDWAT_L0,"Seawater conductivity refers to the ability of seawater to conduct electricity. The presence of ions in the seawater, such as salt, increases the electrical conducting ability of seawater. As such, conductivity can be used as a proxy for determining the quantity of salt in a sample of seawater. This is the unprocessed data that are output directly from the sensor which are then converted to salinity in S m-1.",Seawater Electrical Conductivity Measurement,Unprocessed Data,L0 "BETA,CTD_CABLED,CTD_CABLED_SBE43,CTDPF_CKL_CSTL,CTDMO_GHQR",CTDBP,pressure,PD195,quantity,,int32,,counts,-9999999,Seawater Pressure Measurement,0,,,,,,PRESWAT_L0,Seawater Pressure refers to the pressure exerted on a sensor in situ by the weight of the column of seawater above it. It is calculated by subtracting one standard atmosphere from the absolute pressure at the sensor to remove the weight of the atmosphere on top of the water column. The pressure at a sensor in situ provides a metric of the depth of that sensor. This is the unprocessed data that are output directly from the sensor which are then converted to pressure in dbar.,Seawater Pressure Measurement,Unprocessed Data,L0 From 43fd403d21e288c6d044b9c38b164834c154c01d Mon Sep 17 00:00:00 2001 From: Kellen <42391110+krosburg@users.noreply.github.com> Date: Wed, 11 Sep 2019 15:07:16 -0700 Subject: [PATCH 5/5] Included notes PARAD_A driver update. --- RELEASE_NOTES.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6f12c2f..655a9da 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,3 +1,7 @@ +# Version 1.4.0 (2019-09-11) + +- Issue #14170 - Added support for new Seabird version of PARAD_A. + # Version 1.3.0 (2019-09-069) - Issue #11399 - Bin depths for adcp_velocity_beam and vadcp_velocity_beam streams