Merge pull request #813 from WHOIGit/master

Updating glider_cals branch from updated WHOIGit master
oceanobservatories · Jan 31, 2022 · 8888e6e · 8888e6e
2 parents f0cf8b6 + db3cdb6
commit 8888e6e
Show file tree

Hide file tree

Showing 17 changed files with 112 additions and 2 deletions.
diff --git a/calibration/CTDGVM/CGINS-CTDGVM-09023__20201205.csv b/calibration/CTDGVM/CGINS-CTDGVM-09023__20201205.csv
@@ -0,0 +1,2 @@
+serial,name,value,notes
+9023,CC_calibration_date,1607126400000,sensor calibration date (milliseconds since 1970-01-01)
diff --git a/calibration/DOSTAM/CGINS-DOSTAM-00568__20201118.csv b/calibration/DOSTAM/CGINS-DOSTAM-00568__20201118.csv
@@ -0,0 +1,3 @@
+serial,name,value,notes
+568,CC_calibration_date,1605657600000,sensor calibration date (milliseconds since 1970-01-01)
+568,CC_ref_salinity,0,Optode salinity setting
diff --git a/calibration/FLORTD/CGINS-FLORTD-01102__20220105.csv b/calibration/FLORTD/CGINS-FLORTD-01102__20220105.csv
@@ -0,0 +1,11 @@
+serial,name,value,notes
+1102,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1102_Calibration_Files_2022-01-05.zip > BBFL2W-1102.dev
+1102,CC_dark_counts_cdom,49,
+1102,CC_dark_counts_chlorophyll_a,53,
+1102,CC_dark_counts_volume_scatter,75,
+1102,CC_depolarization_ratio,0.039,Constant
+1102,CC_measurement_wavelength,700,Constant
+1102,CC_scale_factor_cdom,9.070E-02,
+1102,CC_scale_factor_chlorophyll_a,1.180E-02,
+1102,CC_scale_factor_volume_scatter,2.242E-06,
+1102,CC_scattering_angle,124,Constant
diff --git a/calibration/FLORTD/CGINS-FLORTD-01212__20211223.csv b/calibration/FLORTD/CGINS-FLORTD-01212__20211223.csv
@@ -0,0 +1,11 @@
+serial,name,value,notes
+1212,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1212_Calibration_Files_2021-12-23.zip > BBFL2W-1212.dev
+1212,CC_dark_counts_cdom,48,
+1212,CC_dark_counts_chlorophyll_a,51,
+1212,CC_dark_counts_volume_scatter,49,
+1212,CC_depolarization_ratio,0.039,Constant
+1212,CC_measurement_wavelength,700,Constant
+1212,CC_scale_factor_cdom,9.060E-02,
+1212,CC_scale_factor_chlorophyll_a,1.160E-02,
+1212,CC_scale_factor_volume_scatter,2.210E-06,
+1212,CC_scattering_angle,124,Constant
diff --git a/calibration/FLORTD/CGINS-FLORTD-01221__20211223.csv b/calibration/FLORTD/CGINS-FLORTD-01221__20211223.csv
@@ -0,0 +1,11 @@
+serial,name,value,notes
+1221,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1221_Calibration_Files_2021-12-23.zip > BBFL2W-1221.dev
+1221,CC_dark_counts_cdom,49,
+1221,CC_dark_counts_chlorophyll_a,51,
+1221,CC_dark_counts_volume_scatter,51,
+1221,CC_depolarization_ratio,0.039,Constant
+1221,CC_measurement_wavelength,700,Constant
+1221,CC_scale_factor_cdom,9.060E-02,
+1221,CC_scale_factor_chlorophyll_a,1.180E-02,
+1221,CC_scale_factor_volume_scatter,2.136E-06,
+1221,CC_scattering_angle,124,Constant
diff --git a/calibration/FLORTD/CGINS-FLORTD-01319__20220105.csv b/calibration/FLORTD/CGINS-FLORTD-01319__20220105.csv
@@ -0,0 +1,11 @@
+serial,name,value,notes
+1319,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1319_Calibration_Files_2022-01-05.zip > BBFL2W-1319.dev
+1319,CC_dark_counts_cdom,50,
+1319,CC_dark_counts_chlorophyll_a,48,
+1319,CC_dark_counts_volume_scatter,49,
+1319,CC_depolarization_ratio,0.039,Constant
+1319,CC_measurement_wavelength,700,Constant
+1319,CC_scale_factor_cdom,9.050E-02,
+1319,CC_scale_factor_chlorophyll_a,1.080E-02,
+1319,CC_scale_factor_volume_scatter,2.126E-06,
+1319,CC_scattering_angle,124,Constant
diff --git a/calibration/FLORTD/CGINS-FLORTD-01320__20211229.csv b/calibration/FLORTD/CGINS-FLORTD-01320__20211229.csv
@@ -0,0 +1,11 @@
+serial,name,value,notes
+1320,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1320_Calibration_Files_2021-12-29.zip > BBFL2W-1320.dev; cal date is latest date on pdfs
+1320,CC_dark_counts_cdom,50,
+1320,CC_dark_counts_chlorophyll_a,55,
+1320,CC_dark_counts_volume_scatter,50,
+1320,CC_depolarization_ratio,0.039,Constant
+1320,CC_measurement_wavelength,700,Constant
+1320,CC_scale_factor_cdom,9.080E-02,
+1320,CC_scale_factor_chlorophyll_a,1.070E-02,
+1320,CC_scale_factor_volume_scatter,2.416E-06,
+1320,CC_scattering_angle,124,Constant
diff --git a/calibration/FLORTD/CGINS-FLORTD-01321__20211223.csv b/calibration/FLORTD/CGINS-FLORTD-01321__20211223.csv
@@ -0,0 +1,11 @@
+serial,name,value,notes
+1321,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1321_Calibration_Files_2021-12-23.zip > BBFL2W-1321.dev
+1321,CC_dark_counts_cdom,50,
+1321,CC_dark_counts_chlorophyll_a,50,
+1321,CC_dark_counts_volume_scatter,50,
+1321,CC_depolarization_ratio,0.039,Constant
+1321,CC_measurement_wavelength,700,Constant
+1321,CC_scale_factor_cdom,9.060E-02,
+1321,CC_scale_factor_chlorophyll_a,1.760E-02,
+1321,CC_scale_factor_volume_scatter,1.868E-06,
+1321,CC_scattering_angle,124,Constant
diff --git a/calibration/FLORTJ/CGINS-FLORTJ-01518__20211115.csv b/calibration/FLORTJ/CGINS-FLORTJ-01518__20211115.csv
@@ -0,0 +1,11 @@
+serial,name,value,notes
+BBFL2W-1518,CC_dark_counts_cdom,50,date in filename comes from dev file
+BBFL2W-1518,CC_scale_factor_cdom,0.0908,
+BBFL2W-1518,CC_dark_counts_chlorophyll_a,50,
+BBFL2W-1518,CC_scale_factor_chlorophyll_a,.0121,
+BBFL2W-1518,CC_dark_counts_volume_scatter,50,
+BBFL2W-1518,CC_scale_factor_volume_scatter,3.217e-06,
+BBFL2W-1518,CC_depolarization_ratio,0.039,Constant
+BBFL2W-1518,CC_measurement_wavelength,700,[nm]; Constant
+BBFL2W-1518,CC_scattering_angle,124,[degrees]; Constant
+BBFL2W-1518,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
diff --git a/calibration/FLORTM/CGINS-FLORTM-03189__20201203.csv b/calibration/FLORTM/CGINS-FLORTM-03189__20201203.csv
@@ -0,0 +1,5 @@
+serial,name,value,notes
+3189,CC_angular_resolution,1.076,
+3189,CC_depolarization_ratio,0.039,
+3189,CC_measurement_wavelength,700.0,
+3189,CC_scattering_angle,124.0,
diff --git a/calibration/PARADJ/CGINS-PARADJ-00411__20211011.csv b/calibration/PARADJ/CGINS-PARADJ-00411__20211011.csv
@@ -0,0 +1,4 @@
+serial,name,value,notes
+411,CC_Im,1.3589,date in filename comes from factory devfile
+411,CC_a0,4533,digital
+411,CC_a1,2890,digital
diff --git a/calibration/PARADJ/CGINS-PARADJ-00504__20211011.csv b/calibration/PARADJ/CGINS-PARADJ-00504__20211011.csv
@@ -0,0 +1,4 @@
+serial,name,value,notes
+504,CC_Im,1.3589,date in filename comes from factory devfile
+504,CC_a0,4359,digital
+504,CC_a1,2851,digital
diff --git a/calibration/PARADM/CGINS-PARADM-50160__20201117.csv b/calibration/PARADM/CGINS-PARADM-50160__20201117.csv
@@ -0,0 +1,2 @@
+serial,name,value,notes
+50160,CC_bsipar_par_scaling,1,
diff --git a/cruise/CruiseInformation.csv b/cruise/CruiseInformation.csv
@@ -270,3 +270,4 @@ PS20211129,Pacific Storm,2021-11-29T14:15:00,2021-11-30T04:10:00,Endurance glide
 PS20211207,Pacific Storm,2021-12-07T12:06:00,2021-12-07T20:30:00,Endurance glider 917-00003 recovery
 TS20211214,Tenacious II,2021-12-14T21:00:00,2021-12-15T20:00:00,Pioneer 17a glider deployments
 TS20220104,Tenacious II,2022-01-04T11:00:00,2022-01-05T09:00:00,Pioneer 17b glider deployments
+EK20220125,Elakha,2022-01-25T16:25:00,2022-01-25T22:12:00,Endurance glider deployments
diff --git a/deployment/CE05MOAS-GL382_Deploy.csv b/deployment/CE05MOAS-GL382_Deploy.csv
@@ -53,3 +53,9 @@ TN394,,PS20211129,,CE05MOAS-GL382-02-FLORTM000,9,1,2021-09-09T16:30:00,2021-11-2
 TN394,,PS20211129,,CE05MOAS-GL382-03-ADCPAM000,9,1,2021-09-09T16:30:00,2021-11-29T23:45:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-ADCPAM-43473,44.617,-124.305,,1000,1000,,,
 TN394,,PS20211129,,CE05MOAS-GL382-04-DOSTAM000,9,1,2021-09-09T16:30:00,2021-11-29T23:45:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-DOSTAM-00605,44.617,-124.305,,1000,1000,,,
 TN394,,PS20211129,,CE05MOAS-GL382-05-CTDGVM000,9,1,2021-09-09T16:30:00,2021-11-29T23:45:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-CTDGVM-09345,44.617,-124.305,,1000,1000,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL382-00-ENG000000,10,1,2022-01-25T19:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGCON-GLDRCE-00382,44.639,-124.304,,1000,1000,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL382-01-PARADM000,10,1,2022-01-25T19:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-PARADM-50161,44.639,-124.304,,1000,1000,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL382-02-FLORTM000,10,1,2022-01-25T19:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-FLORTM-04221,44.639,-124.304,,1000,1000,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL382-03-ADCPAM000,10,1,2022-01-25T19:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-ADCPAM-43473,44.639,-124.304,,1000,1000,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL382-04-DOSTAM000,10,1,2022-01-25T19:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-DOSTAM-00026,44.639,-124.304,,1000,1000,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL382-05-CTDGVM000,10,1,2022-01-25T19:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-CTDGVM-09345,44.639,-124.304,,1000,1000,,,
diff --git a/deployment/CE05MOAS-GL384_Deploy.csv b/deployment/CE05MOAS-GL384_Deploy.csv
@@ -53,3 +53,9 @@ SKQ202104S,,SKQ202104S,,CE05MOAS-GL384-02-FLORTM000,9,1,2021-03-25T22:15:00,2021
 SKQ202104S,,SKQ202104S,,CE05MOAS-GL384-03-ADCPAM000,9,1,2021-03-25T22:15:00,2021-03-28T02:52:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-ADCPAM-42931,46.993,-124.598,,200,200,,,
 SKQ202104S,,SKQ202104S,,CE05MOAS-GL384-04-DOSTAM000,9,1,2021-03-25T22:15:00,2021-03-28T02:52:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-DOSTAM-00176,46.993,-124.598,,200,200,,,
 SKQ202104S,,SKQ202104S,,CE05MOAS-GL384-05-CTDGVM000,9,1,2021-03-25T22:15:00,2021-03-28T02:52:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-CTDGVM-09354,46.993,-124.598,,200,200,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL384-00-ENG000000,10,1,2022-01-25T18:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGCON-GLDRCE-00384,44.639,-124.303,,200,200,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL384-01-PARADM000,10,1,2022-01-25T18:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-PARADM-50160,44.639,-124.303,,200,200,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL384-02-FLORTM000,10,1,2022-01-25T18:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-FLORTM-03189,44.639,-124.303,,200,200,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL384-03-ADCPAM000,10,1,2022-01-25T18:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-ADCPAM-43105,44.639,-124.303,,200,200,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL384-04-DOSTAM000,10,1,2022-01-25T18:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-DOSTAM-00568,44.639,-124.303,,200,200,,,
+EK20220125,S.Pearce,,,CE05MOAS-GL384-05-CTDGVM000,10,1,2022-01-25T18:07:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00384,CGINS-CTDGVM-09023,44.639,-124.303,,200,200,,,
diff --git a/deployment/CP04OSSM_Deploy.csv b/deployment/CP04OSSM_Deploy.csv
@@ -97,7 +97,7 @@ AR4,,AR8,,CP04OSSM-MFD35-00-DCLENG000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:0
 AR4,,AR8,,CP04OSSM-MFD35-01-ADCPSJ000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:00,CGMCP-04OSSM-00004,,CGINS-ADCPSJ-22642,39.94003,-70.87743,,445,446,,,
 AR4,,AR8,,CP04OSSM-MFD35-02-PRESFC000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:00,CGMCP-04OSSM-00004,,CGINS-PRESFB-01386,39.94003,-70.87743,,445,446,,,
 AR4,,AR8,,CP04OSSM-MFD35-04-VELPTB000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:00,CGMCP-04OSSM-00004,,CGINS-VELPTB-09952,39.94003,-70.87743,,445,446,,,
-#AR4,,AR8,,CP04OSSM-MFD35-05-PCO2WB000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:00,CGMCP-04OSSM-00004,,CGINS-PCO2WB-C0071,39.94003,-70.87743,,445,446,,,
+AR4,,AR8,,CP04OSSM-MFD35-05-PCO2WB000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:00,CGMCP-04OSSM-00004,,CGINS-PCO2WB-C0071,39.94003,-70.87743,,445,446,,,
 AR4,,AR8,,CP04OSSM-MFD35-06-PHSEND000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:00,CGMCP-04OSSM-00004,,CGINS-PHSEND-P0098,39.94003,-70.87743,,445,446,,,
 AR4,,AR8,,CP04OSSM-MFD37-00-DCLENG000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:00,CGMCP-04OSSM-00004,,CGCON-MDCL37-00013,39.94003,-70.87743,,445,446,,,
 AR4,,AR8,,CP04OSSM-MFD37-01-OPTAAD000,4,1,2016-05-27T15:50:00,2016-10-12T17:12:00,CGMCP-04OSSM-00004,,CGINS-OPTAAD-00165,39.94003,-70.87743,,445,446,,,
@@ -434,4 +434,4 @@ AR61,,,,CP04OSSM-SBD11-02-HYDGN0000,14,1,2021-10-30T20:10:00,,CGMCP-04OSSM-00014
 AR61,,,,CP04OSSM-SBD11-06-METBKA000,14,1,2021-10-30T20:10:00,,CGMCP-04OSSM-00014,,CGINS-METLGR-00038,39.940462,-70.877457,,0,445,,,
 AR61,,,,CP04OSSM-SBD12-00-DCLENG000,14,1,2021-10-30T20:10:00,,CGMCP-04OSSM-00014,,CGCON-BDCL12-50002,39.940462,-70.877457,,0,445,,,
 AR61,,,,CP04OSSM-SBD12-03-HYDGN0000,14,1,2021-10-30T20:10:00,,CGMCP-04OSSM-00014,,CGINS-HYDGN0-Z5975,39.940462,-70.877457,,0,445,,,
-AR61,,,,CP04OSSM-SBD12-04-PCO2AA000,14,1,2021-10-30T20:10:00,,CGMCP-04OSSM-00014,,CGINS-PCO2AA-33183,39.940462,-70.877457,,0,445,,,
+AR61,,,,CP04OSSM-SBD12-04-PCO2AA000,14,1,2021-10-30T20:10:00,,CGMCP-04OSSM-00014,,CGINS-PCO2AA-33183,39.940462,-70.877457,,0,445,,,