Merge pull request #57 from sgfoote/master

Issue #13127 - Added deprecation comments for pco2_pco2wat calibratio…

RELEASE_NOTES.md

@@ -1,7 +1,11 @@
 # Next Version 1.1.2 (2018-09-11)
 
-- Issue # 9365 - Updated PFID48's data product identifier "PHWATER_L1" to "PHWATER_L2".
-- Issue # 11056 - Updated PD2606's attributes.
+- Issue #13127 - Added deprecation comments for pco2_pco2wat calibration arguments
+
+- Issue #9365 - Updated PFID48's data product identifier "PHWATER_L1" to "PHWATER_L2".
+
+- Issue #11056 - Updated PD2606's attributes.
+
 - Issue #13228 - Fix incorrectly defined function args for PFID59
 
 # Version 1.1.1 (2018-05-22)

csv/ParameterDefs.csv

@@ -739,7 +739,7 @@ LC_TEST,,reference_designator,PD906,array,,,,,,,,,,,,,,,,,
 "PCO2W_B,PCO2W_A",PCO2W,absorbance_blank_434,PD928,function,,float32,,1,-9999999,Optical Absorbance Ratio at 434 Nm - Blank,4,,PFID39,"{""light"":""PD2712""}",,,CO2ABS1-BLNK_L0,The Optical Absorbance ratio at 434 nm collected during the blank cycle and used to calculate the PCO2WAT data product.,,Unprocessed Data,L0
 "PCO2W_B,PCO2W_A",PCO2W,absorbance_blank_620,PD929,function,,float32,,1,-9999999,Optical Absorbance Ratio at 620 Nm - Blank,4,,PFID40,"{""light"":""PD2712""}",,,CO2ABS2-BLNK_L0,The Optical Absorbance ratio at 620 nm collected during the blank cycle and used to calculate the PCO2WAT data product.,,Unprocessed Data,L0
 "PCO2W_B,PCO2W_A",PCO2W,pco2w_thermistor_temperature,PD930,function,,float32,,ºC,-9999999,Thermistor Temperature,4,,PFID43,"{""traw"":""PD359""}",,,CO2THRM_L1,"This is the Thermistor Temperature measurement, used to calculate the L1 PCO2WAT Partial Pressure of CO2 in Seawater data product.",,Science Data,L1
-"PCO2W_B,PCO2W_A",PCO2W,pco2_seawater,PD931,function,,float32,,µatm,-9999999,pCO2 Seawater,4,,PFID44,"{""mtype"":""PD355"",""light"":""PD357"",""therm"":""PD359"",""ea434"":""CC_ea434"",""eb434"":""CC_eb434"",""ea620"":""CC_ea620"",""eb620"":""CC_eb620"",""calt"":""CC_calt"",""cala"":""CC_cala"",""calb"":""CC_calb"",""calc"":""CC_calc"",""a434blank"":""dpi_CO2ABS1-BLNK_L0"",""a620blank"":""dpi_CO2ABS2-BLNK_L0""}",PCO2WAT,,PCO2WAT_L1,"Partial Pressure of CO2 in Seawater provides a measure of the amount of CO2 and HCO3 in seawater. Specifically, it refers to the pressure that would be exerted by CO2 if all other gases were removed. Partial pressure of a gas dissolved in seawater is understood as the partial pressure in air that the gas would exert in a hypothetical air volume in equilibrium with that seawater.",Partial Pressure of CO2 in Seawater,Science Data,L1
+"PCO2W_B,PCO2W_A",PCO2W,pco2_seawater,PD931,function,,float32,,µatm,-9999999,pCO2 Seawater,4,,PFID44,"{""mtype"":""PD355"",""light"":""PD357"",""therm"":""PD359"",""ea434"":""CC_ea434"",""eb434"":""CC_eb434"",""ea620"":""CC_ea620"",""eb620"":""CC_eb620"",""calt"":""CC_calt"",""cala"":""CC_cala"",""calb"":""CC_calb"",""calc"":""CC_calc"",""a434blank"":""dpi_CO2ABS1-BLNK_L0"",""a620blank"":""dpi_CO2ABS2-BLNK_L0""}",PCO2WAT,,PCO2WAT_L1,"Partial Pressure of CO2 in Seawater provides a measure of the amount of CO2 and HCO3 in seawater. Specifically, it refers to the pressure that would be exerted by CO2 if all other gases were removed. Partial pressure of a gas dissolved in seawater is understood as the partial pressure in air that the gas would exert in a hypothetical air volume in equilibrium with that seawater. NOTE: the following calibration coefficients in the parameterfunctionmap are deprecated: ""ea434"", ""eb434"", ""ea620"", ""eb620"". Those arguments are still present in the function declaration, but they are completely unused and can be supplied with an arbitrary fill value.",Partial Pressure of CO2 in Seawater,Science Data,L1
 "CW_TEST,SP_MFLM,PHSEN",PHSEN,thermistor_start,PD932,quantity,,int16,,counts,-9999,Thermistor Resistivity at Start of Measurement,0,,,,,,,Starting thermistor value,,,
 "CW_TEST,SP_MFLM,PHSEN",PHSEN,reference_light_measurements,PD933,array<quantity>,,int16,,counts,-9999,Array of Reference Light Measurements,0,,,,,,,Array of reference light measurements,,,
 "CW_TEST,SP_MFLM,PHSEN",PHSEN,thermistor_end,PD935,quantity,,int16,,counts,-9999,Thermistor Resistivity at End of Measurement,0,,,,,,,Thermistor resistivity with a DC volt range of 0 to 5,,,

csv/ParameterFunctions.csv

@@ -38,7 +38,7 @@ BASE,PFID24,dataqc_propagateflags__,dataqc_propagateflags,,,QCPythonFunction,dat
 "PCO2W_B,PCO2W_A",PFID40,pco2_abs620_ratio_PCO2W_All,pco2_abs620_ratio,PCO2W,All,PythonFunction,pco2_abs620_ratio,ion_functions.data.co2_functions,['light'],,Optical Absorbance Ratio at 620 nm,,,
 "PCO2W_B,PCO2W_A",PFID41,pco2_blank_PCO2W_All,pco2_blank,PCO2W,All,PythonFunction,pco2_blank,ion_functions.data.co2_functions,['raw_blank'],,Calculates the absorbance blank at 434 or 620 nm from the SAMI2-pCO2 instrument.,,,
 "PCO2W_B,PCO2W_A",PFID43,pco2_thermistor_PCO2W_All,pco2_thermistor,PCO2W,All,PythonFunction,pco2_thermistor,ion_functions.data.co2_functions,['traw'],,Convert the raw thermistor resistivity from counts to deg_C for use in subsequent pCO2 calculations,,,
-"PCO2W_B,PCO2W_A",PFID44,pco2_pco2wat_PCO2W_All,pco2_pco2wat,PCO2W,All,PythonFunction,pco2_pco2wat,ion_functions.data.co2_functions,"['mtype','light','therm','ea434','eb434','ea620','eb620','calt','cala','calb','calc','a434blank','a620blank']",,Compute  the L1 PCO2WAT data product from the SAMI-II pCO2 instruments,,,
+"PCO2W_B,PCO2W_A",PFID44,pco2_pco2wat_PCO2W_All,pco2_pco2wat,PCO2W,All,PythonFunction,pco2_pco2wat,ion_functions.data.co2_functions,"['mtype','light','therm','ea434','eb434','ea620','eb620','calt','cala','calb','calc','a434blank','a620blank']",,"Compute  the L1 PCO2WAT data product from the SAMI-II pCO2 instruments. NOTE: the following calibration coefficients in the list of arguments are deprecated: ""ea434"", ""eb434"", ""ea620"", ""eb620"". Those arguments are still present in the function declaration, but they are completely unused and can be supplied with an arbitrary fill value.",,,
 "SP_MFLM,PHSEN",PFID45,ph_434_intensity_PHSEN_All,ph_434_intensity,PHSEN,All,PythonFunction,ph_434_intensity,ion_functions.data.ph_functions,['light'],,Extract the absorbance signal intensity at 434 nm from the light measurements collected by the SAMI-II pH instrument,,,
 "SP_MFLM,PHSEN",PFID46,ph_578_intensity_PHSEN_All,ph_578_intensity,PHSEN,All,PythonFunction,ph_578_intensity,ion_functions.data.ph_functions,['light'],,Extract the absorbance signal intensity at 620 nm from the light measurements collected by the SAMI-II pH instrument,,,
 "SP_MFLM,PHSEN",PFID47,ph_thermistor_PHSEN_All,ph_thermistor,PHSEN,All,PythonFunction,ph_thermistor,ion_functions.data.ph_functions,['traw'],,Convert the raw thermistor resistivity from counts to deg_C for use in subsequent pH calculations,,,