Issue #14993 - Use calphase to calculate cabled DOSTA data (#103)

RELEASE_NOTES.md

@@ -1,3 +1,7 @@
+# Version 1.4.11 (2022-01-19)
+
+- Issue #14993 - Use calphase to calculate cabled DOSTA data
+
 # Version 1.4.10 (2021-08-15)
 
 - Issue #15118 - Incorrect calculation of depth parameter from pressure

csv/ParameterDefs.csv

@@ -30,7 +30,7 @@ BASE,,port_timestamp,,PD10,quantity,,float64,,seconds since 1900-01-01,-9999999,
 BASE,,driver_timestamp,,PD11,quantity,,float64,,seconds since 1900-01-01,-9999999,"Driver Timestamp, UTC",,FALSE,,,,,,"Driver timestamp, UTC",,,
 BASE,,internal_timestamp,,PD12,quantity,,float64,,seconds since 1900-01-01,-9999999,"Internal Timestamp, UTC",,FALSE,,,,,,"Internal timestamp, UTC",,,
 BASE,,practical_salinity,,PD13,function,,float32,,1,-9999999,Practical Salinity,4,,PFID26,"{""c"":""dpi_CONDWAT_L1"",""t"":""dpi_TEMPWAT_L1"",""p"":""dpi_PRESWAT_L1""}",PRACSAL,sea_water_practical_salinity,PRACSAL_L2,Salinity is generally defined as the concentration of dissolved salt in a parcel of seawater. Practical Salinity is a more specific unitless quantity calculated from the conductivity of seawater and adjusted for temperature and pressure. It is approximately equivalent to Absolute Salinity (the mass fraction of dissolved salt in seawater) but they are not interchangeable.,Seawater Practical Salinity,Science Data,L2
-,DOSTA,dissolved_oxygen,,PD14,function,,float32,,µmol kg-1,-9999999,DO - Pressure Temp Sal Corrected,4,,PFID61,"{""DO"":""dpi_DOCONCS_L1"", ""P"":[""PD2606"",""dpi_PRESWAT_L1"",""PD17""],""T"":[""dpi_TEMPWAT_L1"",""dpi_TEMPSRF_L1""],""SP"":[""dpi_PRACSAL_L2"",""dpi_SALSURF_L2""],""lat"":""CC_lat"",""lon"":""CC_lon""}",DOCONCS,moles_of_oxygen_per_unit_mass_in_sea_water,DOXYGEN_L2,"Dissolved Oxygen Concentration from the Stable Response Dissolved Oxygen Instrument is a measure of the concentration of gaseous oxygen mixed in seawater. This data product is corrected for salinity, temperature, and depth.",Dissolved Oxygen Concentration from Stable DO Instrument,Science Data,L2
+,DOSTA,dissolved_oxygen,,PD14,function,,float32,,µmol kg-1,-9999999,DO from Onboard Calculation - Corrected,4,,PFID61,"{""DO"":""dpi_DOCONCS_L1"", ""P"":[""PD2606"",""dpi_PRESWAT_L1"",""PD17""],""T"":[""dpi_TEMPWAT_L1"",""dpi_TEMPSRF_L1""],""SP"":[""dpi_PRACSAL_L2"",""dpi_SALSURF_L2""],""lat"":""CC_lat"",""lon"":""CC_lon""}",DOCONCS,moles_of_oxygen_per_unit_mass_in_sea_water,DOXYGEN_L2,"Dissolved Oxygen Concentration from the Stable Response Dissolved Oxygen Instrument is a measure of the concentration of gaseous oxygen mixed in seawater. This data product is corrected for salinity, temperature, and depth.",Dissolved Oxygen Concentration from Stable DO Instrument,Science Data,L2
 "BASE,PARAD_A",PARAD,checksum,,PD15,quantity,,int32,,1,-9999999,Checksum,0,,,,,,,Checksum,,,
 BASE,,preferred_timestamp,,PD16,quantity,,string,,1,empty,Preferred Timestamp,,FALSE,,,,,,Timestamp preferred as official record.,,,
 BASE,,ct_depth,,PD17,function,,float32,,1,-9999999,CT Depth,,FALSE,PFID16,"{""x"":""CC_depth_of_conductivity_and_temperature_measurements_m""}",,,,Depth of conductivity and temperature instrument.,,,
@@ -767,7 +767,7 @@ DEPRECATED,DOSTA,estimated_oxygen_concentration,,PD940,quantity,,float32,,µmol
 ,DOSTA,dissolved_oxygen,,PD953,quantity,,float32,,µmol kg-1,-9999999,Dissolved Oxygen Concentration,4,,,,,,,Calculated oxygen concentration,,,
 "CW_TEST,ADCPT_DE,ADCPS_IK,ADCPT_ACFGM_PD0_DCL,ADCPT_ACFGM_PD8_DCL",ADCP,upward_earth_seawater_velocity,,PD960,function,"[""bin""]",float32,,m s-1,-9999999,Upward Seawater Velocity,4,,PFID128,"{""w"":""PD716""}",VELPROF-VLU,upward_sea_water_velocity,VELPROF-VLU_L1,A Velocity Profile includes water velocity (speed & direction) throughout the depth range of an ADCP sensor. This instance is the upward seawater velocity component.,Upward Seawater Velocity Profile,Science Data,L1
 "CW_TEST,ADCPT_DE,ADCPS_IK,ADCPT_ACFGM_PD0_DCL,ADCPT_ACFGM_PD8_DCL",ADCP,earth_error_velocity,,PD961,function,"[""bin""]",float32,,m s-1,-9999999,Error Velocity,4,,PFID129,"{""e"":""PD717""}",VELPROF-ERR,,VELPROF-ERR_L1,A Velocity Profile includes water velocity (speed & direction) throughout the depth range of an ADCP sensor. This instance is the error component.,Error Seawater Velocity Profile,Science Data,L1
-"SP_TEST,CTD_CABLED","DOSTA, CTDBP",ctd_tc_oxygen,,PD964,function,,float32,,µmol L-1,-9999999,DO,4,,PFID60,"{""o2_counts"":""PD197""}",DOCONCS,,DOCONCS_L1,Dissolved Oxygen (DO) Concentration from the Stable Response Dissolved Oxygen Instrument is a measure of the concentration of gaseous oxygen mixed in seawater.,Dissolved Oxygen Concentration from Stable DO Instrument,Science Data,L1
+"SP_TEST,CTD_CABLED","DOSTA, CTDBP",ctd_tc_oxygen,,PD964,function,,float32,,µmol L-1,-9999999,DO from Onboard Calculation,4,,PFID60,"{""o2_counts"":""PD197""}",DOCONCS,,DOCONCS_L1,Dissolved Oxygen (DO) Concentration from the Stable Response Dissolved Oxygen Instrument is a measure of the concentration of gaseous oxygen mixed in seawater.,Dissolved Oxygen Concentration from Stable DO Instrument,Science Data,L1
 TRHPH_A,TRHPH,vent_fluid_temperaure,,PD965,function,,float32,,ºC,-9999999,Vent Fluid Absolute Temperature,4,,PFID63,"{""V_ts"":""PD428"",""V_tc"":""PD430"",""tc_slope"":""CC_tc_slope"",""ts_slope"":""CC_ts_slope""}",TRHPHTE,,TRHPHTE-ABS_L1,Vent Fluid Absolute Temperature refers to temperature calculated from the Temperature-Resistivity Probe Instrument (TRHPH) Thermistor and Thermocouple. It is calculated using response curves from Thermocouple and Thermistor Temperature (in volts) that are adjusted to the custom instrument design and corrected by laboratory calibration.,Vent Fluid Temperature,Science Data,L1
 TRHPH_A,TRHPH,vent_fluid_chloride_conc,,PD966,function,,float32,,mmol kg-1,-9999999,Vent Fluid Chloride Concentration,4,,PFID64,"{""V_R1"":""PD421"",""V_R2"":""PD422"",""V_R3"":""PD423"",""T"":""PD965""}",TRHPHCC,,TRHPHCC_L2,Vent Fluid Chloride Concentration (Cl-) is calculated using resistivity and temperature measured by a Hydrothermal Vent Fluid Temperature and Resistivity sensor placed in a high-temperature hydrothermal vent.,Vent Fluid Chloride Concentration (CI-),Science Data,L2
 TRHPH_A,TRHPH,vent_fluid_orp,,PD967,function,,float32,,mV,-9999999,Vent Fluid Oxidation-Reduction Potential,4,,PFID65,"{""V"":""PD427"",""offset"":""CC_offset"",""gain"":""CC_gain""}",TRHPHEH,,TRHPHEH_L1,"Vent Fluid Oxidation-Reduction Potential (ORP) is a measure of the tendency of a vent fluid, and the chemical species within it, to acquire electrons (i.e. be reduced). The more positive the potential, the greater the affinity for electrons and tendency to be reduced.",Vent Fluid Oxidation-Reduction Potential (ORP),Science Data,L1
@@ -3558,7 +3558,7 @@ PRESF_ABC,PRESF,presf_tide_pressure,,PD8035,function,,float32,,dbar,-9999999,Sea
 PRESF_ABC,PRESF,presf_tide_temperature,,PD8036,function,,float32,,ºC,-9999999,Seawater Temperature,4,,PFID208,"{""t0"":""PD8032""}",PRESTMP,sea_water_temperature,PRESTMP_L1,Seafloor Pressure family of instruments (PRESF) temperature measurement near the sensor.,Seawater Tide Temperature,Science Data,L1
 PRESF_ABC,PRESF,presf_wave_burst_pressure,,PD8037,function,,float32,,dbar,-9999999,Seafloor Pressure,4,,PFID132,"{""ptcn"":""PD8033"",""p_dec_wave"":""PD8034"",""u0"":""CC_u0"",""y1"":""CC_y1"",""y2"":""CC_y2"",""y3"":""CC_y3"",""c1"":""CC_c1"",""c2"":""CC_c2"",""c3"":""CC_c3"",""d1"":""CC_d1"",""d2"":""CC_d2"",""t1"":""CC_t1"",""t2"":""CC_t2"",""t3"":""CC_t3"",""t4"":""CC_t4"",""poff"":""CC_pressure_offset_calibration_coefficient"",""slope"":""CC_slope_correction_factor"",""offset"":""CC_offset_correction_factor""}",SFLPRES,sea_water_pressure_at_sea_floor,SFLPRES-WAVE_L1,Seafloor Pressure is a measurement of the force on the seafloor exerted by the weight of the overlying seawater column plus the weight of the atmosphere (hydrostatic plus atmospheric).,Seafloor Pressure,Science Data,L1
 DOSTA_D,DOSTA,oxy_calphase_voltage,,PD8038,function,,float32,,V,-9999999,Calibrated Phase Difference,3,,PFID209,"{""counts"":""PD835""}",,,DOCONCS-VLT_L0,"Calibrated phase difference in Volts, used to calculate temperature compensated oxygen concentration.",Calibrated Phase Difference,Unprocessed Data,L0
-DOSTA_D,DOSTA,oxy_temp_voltage,,PD8039,function,,float32,,V,-9999999,DOSTA Temperature,3,,PFID209,"{""counts"":""PD836""}",,,DOCONCS-VLT_L0,Oxygen sensor ambient temperature in Volts,Oxygen Sensor Ambient Temperature,Unprocessed Data,L0
+DOSTA_D,DOSTA,oxy_temp_voltage,,PD8039,function,,float32,,V,-9999999,DOSTA Temperature,3,,PFID209,"{""counts"":""PD836""}",,,,Oxygen sensor ambient temperature in Volts,Oxygen Sensor Ambient Temperature,Unprocessed Data,L0
 DOSTA_D,DOSTA,dosta_calibrated_phase,,PD8040,function,,float32,,degrees,-9999999,Calibrated Phase Difference,3,,PFID200,"{""phase_volt"":""PD8038""}",,,DOCONCS-DEG_L0,"Calibrated phase difference, used to calculate temperature compensated oxygen concentration.",Calibrated Phase Difference,Science Data,L1
 DOSTA_D,DOSTA,dosta_optode_temperature,,PD8041,function,,float32,,ºC,-9999999,Oxygen Sensor Temperature,3,,PFID199,"{""T_optode_volt"":""PD8039""}",,,,Oxygen sensor ambient temperature,Oxygen Sensor Ambient Temperature,Science Data,L1
 DOSTA_D,DOSTA,dosta_tc_oxygen,,PD8042,function,,float32,,µmol L-1,-9999999,Dissolved Oxygen Concentration,4,,PFID59,"{""calphase"":""PD8040"", ""temp"":""PD8041"", ""csv"":""CC_csv"", ""conc_coef"":""CC_conc_coef""}",DOCONCS,,DOCONCS_L1,"Dissolved Oxygen Concentration from the Stable Response Dissolved Oxygen (DO) Instrument  is a measure of the concentration of gaseous oxygen mixed in seawater. This instrument measures dissolved oxygen concentrations on mobile assets, deep profilers, and moorings.This data product is corrected for temperature from a collocated CTD.",Dissolved Oxygen Concentration from Stable DO Instrument,Science Data,L2
@@ -3626,3 +3626,5 @@ PARAD_A,PARAD,z_accel_counts,,PD8089,quantity,,int32,,counts,0,Z-Axis Accelerati
 ,,depth,depth,PD8104,function,,float32,,m,-9999999,Depth calculated from pressure,3,True,PFID217,"{""latitude"":""CC_lat"", ""pressure"":""PD2820"", ""pressure_scale_factor"":1}",,,,Depth (m) calculated from pressure (dbar) and latitude.,,,L1
 BETA,Gliders,interp_lat,,PD8105,quantity,,float32,,degree_north,,Interpolated GPS Latitude,4,,,,,latitude,,"Interpolated GPS latitude in decimal degrees.",,,
 BETA,Gliders,interp_lon,,PD8106,quantity,,float32,,degree_east,,Interpolated GPS Longitude,4,,,,,longitude,,"Interpolated GPS longitude in decimal degrees.",,,
+DOSTA_D,DOSTA,oxygen_from_calphase,,PD8107,function,,float32,,µmol L-1,-9999999,DO from Phase,4,,PFID59,"{""calphase"":""PD8040"", ""temp"":""PD8041"", ""csv"":""CC_csv"", ""conc_coef"":""CC_conc_coef""}",DOCONCS,,,"Dissolved Oxygen Concentration from the Stable Response Dissolved Oxygen (DO) Instrument  is a measure of the concentration of gaseous oxygen mixed in seawater. This instrument measures dissolved oxygen concentrations on mobile assets, deep profilers, and moorings.This data product is corrected for temperature from a collocated CTD.",Dissolved Oxygen Concentration from Stable DO Instrument,Science Data,L1
+,DOSTA,corrected_dissolved_oxygen,,PD8108,function,,float32,,µmol kg-1,-9999999,DO from Phase - Corrected,4,,PFID61,"{""DO"":""PD8107"", ""P"":[""PD2606"",""dpi_PRESWAT_L1"",""PD17""],""T"":[""dpi_TEMPWAT_L1"",""dpi_TEMPSRF_L1""],""SP"":[""dpi_PRACSAL_L2"",""dpi_SALSURF_L2""],""lat"":""CC_lat"",""lon"":""CC_lon""}",DOCONCS,moles_of_oxygen_per_unit_mass_in_sea_water,,"Dissolved Oxygen Concentration from the Stable Response Dissolved Oxygen Instrument is a measure of the concentration of gaseous oxygen mixed in seawater. This data product is corrected for salinity, temperature, and depth.",Dissolved Oxygen Concentration from Stable DO Instrument,Science Data,L2

csv/ParameterDictionary.csv

@@ -5,7 +5,7 @@ BETA,DICT15,,presf_tide_measurement,"PD7,PD10,PD11,PD12,PD16,PD93,PD94,PD29,PD74
 BETA,DICT16,,presf_operating_status,"PD7,PD10,PD11,PD12,PD16,PD113,PD312,PD93,PD115,PD116,PD117,PD118,PD119,PD120,PD121,PD122,PD123,PD124,PD126,PD127,PD128,PD129,PD130,PD131,PD132,PD133,PD134,PD135,PD136,PD137,PD138,PD139,PD140,PD141,PD142,PD143,PD144,PD156,PD157,PD863",PD7,,Engineering,Status Data,
 BETA,DICT17,,presf_calibration_coefficients,"PD7,PD10,PD11,PD12,PD16,PD158,PD159,PD160,PD161,PD162,PD163,PD164,PD165,PD166,PD167,PD168,PD169,PD170,PD171,PD172,PD173,PD174,PD175,PD176,PD177,PD178,PD179,PD180,PD181,PD182,PD183,PD184,PD185,PD186,PD187,PD863",PD7,,Engineering,Calibration Data,
 DOFST,DICT21,,do_fast_sample,"PD7,PD10,PD11,PD12,PD16,PD863,PD2310,PD3777",PD7,,Science,Data Products,
-DOSTA,DICT22,,do_stable_sample,"PD7,PD10,PD11,PD12,PD16,PD863,PD197,PD964,PD835,PD836,PD14",PD7,,Science,Data Products,
+DOSTA,DICT22,,do_stable_sample,"PD7,PD10,PD11,PD12,PD16,PD863,PD197,PD964,PD835,PD836,PD14,PD8038,PD8039,PD8040,PD8041,PD8107,PD8108",PD7,,Science,Data Products,
 "SP_TEST,CTD_CABLED",DICT23,,ctdbp_no_sample,"PD7,PD10,PD11,PD12,PD16,PD863,PD193,PD194,PD195,PD196,PD835,PD836,PD197,PD908,PD3647,PD3648,PD13,PD5,PD964,PD14,PD8099",PD7,,Science,Data Products,
 "SP_TEST,CTD_CABLED",DICT24,,ctdbp_no_hardware,"PD7,PD10,PD11,PD12,PD16,PD863,PD312,PD113,PD293,PD259,PD295,PD261,PD297,PD257,PD258,PD212,PD116,PD2277,PD2278,PD2279,PD2280",PD7,,Engineering,Hardware Data,
 "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,