Skip to content

Commit 7afa8a0

Browse files
authored
Merge pull request #1045 from WHOIGit/master
Updating WFP_cals branch from updated WHOIGit master
2 parents 174901f + 0ec572a commit 7afa8a0

20 files changed

+230
-126
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
serial,name,value,notes
2+
9086,CC_calibration_date,1643241600000,sensor calibration date (milliseconds since 1970-01-01)

calibration/CTDPFA/ATAPL-66662-00001__20211001.csv

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
serial,name,value,notes
2-
16-6914,CC_a0,0.000000e+000,
3-
16-6914,CC_a1,0.000000e+000,
4-
16-6914,CC_a2,0.000000e+000,
5-
16-6914,CC_a3,0.000000e+000,
2+
16-6914,CC_a0,1.24369881e-003,
3+
16-6914,CC_a1,2.76887388e-004,
4+
16-6914,CC_a2,-1.32270128e-006,
5+
16-6914,CC_a3,1.91237621e-007,
66
16-6914,CC_cpcor,-9.57000000e-008,
77
16-6914,CC_ctcor,3.2500e-006,
88
16-6914,CC_g,-9.82271924e-001,
Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
1-
serial,name,value,notes
2-
16-50018,CC_a0,1.26065994e-003,
3-
16-50018,CC_a1,2.75072150e-004,
4-
16-50018,CC_a2,-1.35554804e-006,
5-
16-50018,CC_a3,1.91092627e-007,
6-
16-50018,CC_cpcor,-9.57000000e-008,
7-
16-50018,CC_ctcor,3.2500e-006,
8-
16-50018,CC_g,-9.86308553e-001,
9-
16-50018,CC_h,1.38745207e-001,
10-
16-50018,CC_i,-1.05955972e-004,
11-
16-50018,CC_j,2.87316570e-005,
12-
16-50018,CC_pa0,-4.07103372e-002,
13-
16-50018,CC_pa1,1.54530722e-003,
14-
16-50018,CC_pa2,6.16886782e-012,
15-
16-50018,CC_ptca0,5.24779220e+005,
16-
16-50018,CC_ptca1,8.37496381e-001,
17-
16-50018,CC_ptca2,-7.45928262e-002,
18-
16-50018,CC_ptcb0,2.50406250e+001,
19-
16-50018,CC_ptcb1,1.25000000e-004,
20-
16-50018,CC_ptcb2,0.00000000e+000,
21-
16-50018,CC_ptempa0,-6.27532501e+001,
22-
16-50018,CC_ptempa1,5.23592812e+001,
23-
16-50018,CC_ptempa2,-2.61433945e-001,
24-
16-50018,CC_offset,0,
1+
serial,name,value,notes
2+
16-50018,CC_a0,1.26065994e-003,
3+
16-50018,CC_a1,2.75072150e-004,
4+
16-50018,CC_a2,-1.35554804e-006,
5+
16-50018,CC_a3,1.91092627e-007,
6+
16-50018,CC_cpcor,-9.57000000e-008,
7+
16-50018,CC_ctcor,3.2500e-006,
8+
16-50018,CC_g,-9.86308553e-001,
9+
16-50018,CC_h,1.38745207e-001,
10+
16-50018,CC_i,-1.05955972e-004,
11+
16-50018,CC_j,2.87316570e-005,
12+
16-50018,CC_pa0,-4.07103372e-002,
13+
16-50018,CC_pa1,1.54530722e-003,
14+
16-50018,CC_pa2,6.16886782e-012,
15+
16-50018,CC_ptca0,5.24779220e+005,
16+
16-50018,CC_ptca1,8.37496381e-001,
17+
16-50018,CC_ptca2,-7.45928262e-002,
18+
16-50018,CC_ptcb0,2.50406250e+001,
19+
16-50018,CC_ptcb1,1.25000000e-004,
20+
16-50018,CC_ptcb2,0.00000000e+000,
21+
16-50018,CC_ptempa0,-6.27532501e+001,
22+
16-50018,CC_ptempa1,5.23592812e+001,
23+
16-50018,CC_ptempa2,-2.61433945e-001,
24+
16-50018,CC_offset,0,
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
serial,name,value,notes
2+
43-2708,CC_frequency_offset,-8.822879e+002,DOFST-K_SBE43F_SN_2708_Calibration_2022-07-02.zip > 2708.cal
3+
43-2708,CC_oxygen_signal_slope,3.1931e-004,use Soc(adj) on SOCAdjusted pdf
4+
43-2708,CC_residual_temperature_correction_factor_a,-4.476314e-003,
5+
43-2708,CC_residual_temperature_correction_factor_b,2.161883e-004,
6+
43-2708,CC_residual_temperature_correction_factor_c,-3.437302e-006,
7+
43-2708,CC_residual_temperature_correction_factor_e,3.600000e-002,
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial,name,value,notes
2+
209,CC_conc_coef,"[-3.654258E+00, 1.216268E+00]",date in filename comes from factory calibration certificate
3+
209,CC_csv,"[3.169868E-03, 1.344805E-04, 2.556592E-06, 2.312036E+02, -3.739662E-01, -5.840334E+01, 4.546729E+00]",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
serial,name,value,notes
2+
1003,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1003_Calibration_Files_2022-09-13.zip > BBFL2W-1003.dev
3+
1003,CC_dark_counts_cdom,43,
4+
1003,CC_dark_counts_chlorophyll_a,44,
5+
1003,CC_dark_counts_volume_scatter,46.175,
6+
1003,CC_depolarization_ratio,0.039,Constant
7+
1003,CC_measurement_wavelength,700,Constant
8+
1003,CC_scale_factor_cdom,8.887E-02,
9+
1003,CC_scale_factor_chlorophyll_a,1.205E-02,
10+
1003,CC_scale_factor_volume_scatter,1.835E-06,
11+
1003,CC_scattering_angle,124,Constant
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
serial,name,value,notes
2+
1124,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1124_Calibration_Files_2022-09-27.zip > BBFL2W-1124.dev
3+
1124,CC_dark_counts_cdom,47,
4+
1124,CC_dark_counts_chlorophyll_a,53,
5+
1124,CC_dark_counts_volume_scatter,50,
6+
1124,CC_depolarization_ratio,0.039,Constant
7+
1124,CC_measurement_wavelength,700,Constant
8+
1124,CC_scale_factor_cdom,9.147E-02,
9+
1124,CC_scale_factor_chlorophyll_a,1.154E-02,
10+
1124,CC_scale_factor_volume_scatter,1.586E-06,
11+
1124,CC_scattering_angle,124,Constant
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
serial,name,value,notes
2+
1295,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1295_Calibration_Files_2022-09-09.zip > BBFL2W-1295.dev; cal date from BBFL2W-1295 Characterization Sheet.pdf
3+
1295,CC_dark_counts_cdom,48,
4+
1295,CC_dark_counts_chlorophyll_a,55,
5+
1295,CC_dark_counts_volume_scatter,52,
6+
1295,CC_depolarization_ratio,0.039,Constant
7+
1295,CC_measurement_wavelength,700,Constant
8+
1295,CC_scale_factor_cdom,9.062E-02,
9+
1295,CC_scale_factor_chlorophyll_a,1.218E-02,
10+
1295,CC_scale_factor_volume_scatter,1.826E-06,
11+
1295,CC_scattering_angle,124,Constant
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
serial,name,value,notes
2+
1322,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1322_Calibration_Files_2022-09-12.zip > BBFL2W-1322.dev; cal date from BBFL2W-1322 Characterization Sheet.pdf
3+
1322,CC_dark_counts_cdom,50,
4+
1322,CC_dark_counts_chlorophyll_a,50,
5+
1322,CC_dark_counts_volume_scatter,51,
6+
1322,CC_depolarization_ratio,0.039,Constant
7+
1322,CC_measurement_wavelength,700,Constant
8+
1322,CC_scale_factor_cdom,8.968E-02,
9+
1322,CC_scale_factor_chlorophyll_a,1.207E-02,
10+
1322,CC_scale_factor_volume_scatter,1.817E-06,
11+
1322,CC_scattering_angle,124,Constant
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
serial,name,value,notes
2+
BBFL2W-1518,CC_dark_counts_cdom,50,date in filename comes from dev file
3+
BBFL2W-1518,CC_scale_factor_cdom,9.298E-02,
4+
BBFL2W-1518,CC_dark_counts_chlorophyll_a,54,
5+
BBFL2W-1518,CC_scale_factor_chlorophyll_a,1.217E-02,
6+
BBFL2W-1518,CC_dark_counts_volume_scatter,54,
7+
BBFL2W-1518,CC_scale_factor_volume_scatter,3.029E-06,
8+
BBFL2W-1518,CC_depolarization_ratio,0.039,Constant
9+
BBFL2W-1518,CC_measurement_wavelength,700,[nm]; Constant
10+
BBFL2W-1518,CC_scattering_angle,124,[degrees]; Constant
11+
BBFL2W-1518,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
serial,name,value,notes
2+
1117,CC_angular_resolution,1.076,source_file FLORT-K_BBFL2_SN_1117_Calibration_2022-07-13.zip > BBFL2-1117.dev
3+
1117,CC_dark_counts_cdom,49,
4+
1117,CC_dark_counts_chlorophyll_a,50,
5+
1117,CC_dark_counts_volume_scatter,50,
6+
1117,CC_depolarization_ratio,0.039,
7+
1117,CC_measurement_wavelength,700,
8+
1117,CC_scale_factor_cdom,8.860E-02,
9+
1117,CC_scale_factor_chlorophyll_a,1.211E-02,
10+
1117,CC_scale_factor_volume_scatter,3.258E-06,
11+
1117,CC_scattering_angle,124,
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
serial,name,value,notes
2+
3186,CC_angular_resolution,1.076,
3+
3186,CC_depolarization_ratio,0.039,
4+
3186,CC_measurement_wavelength,700.0,
5+
3186,CC_scattering_angle,124.0,
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
serial,name,value,notes
2+
365,CC_Im,1.3589,date in filename comes from factory devfile
3+
365,CC_a0,4588,digital
4+
365,CC_a1,2881,digital
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial,name,value,notes
2+
20610,CC_dark_offset,0.98,source_file PARAD-K_QSP2200_SN_20610_Calibration_2022-07-01.pdf
3+
20610,CC_scale_wet,9.42E-18,
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
serial,name,value,notes
2+
50164,CC_bsipar_par_scaling,1,
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
serial,name,value,notes
2+
237,CC_immersion_factor,"[1.368, 1.410, 1.365, 1.354, 1.372, 1.322, 1.347]",date in filename comes from latest caldate within factory calfile DI7237F.cal
3+
237,CC_offset,"[2147756179.9, 2147495917.9, 2147835443.7, 2147388451.8, 2148068122.2, 2147398681.0, 2147486864.1]",
4+
237,CC_scale,"[2.12482698208e-007, 2.10634279144e-007, 2.12840756124e-007, 2.26601675711e-007, 2.10900815404e-007, 2.15151905269e-007, 2.11106694202e-007]",

cruise/CruiseInformation.csv

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,4 +299,6 @@ TN407,Thomas G. Thompson,2022-08-08T00:00:00,2022-09-16T23:59:59,Cabled (rvdata)
299299
TS20220822,Tenacious II,2022-08-22T08:00:00,2022-08-23T04:00:00,Pioneer 18d glider deployments
300300
TS20220911,Tenacious II,2022-09-11T08:00:00,2022-09-12T04:00:00,Pioneer glider cp_376 recovery
301301
WJ20220920,Warren Jr.,2022-09-20T09:00:00,2022-09-22T13:00:00,Pioneer 18e AUV deployment and test glider deployments
302-
TN408,Thomas G. Thompson,2022-09-21T19:05:00,2022-10-04T17:30:00,Endurance 17 moorings profilers and gliders
302+
TN408,Thomas G. Thompson,2022-09-21T19:05:00,2022-10-04T15:30:00,Endurance 17 moorings profilers and gliders
303+
TS20221006,Tenacious II,2022-10-06T10:00:00,2022-10-07T02:00:00,Pioneer glider cp_340 recovery
304+
EK20221017,Elakha,2022-10-17T15:10:00,2022-10-17T20:41:00,Endurance glider recovery and deployment

deployment/CE05MOAS-GL312_Deploy.csv

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,9 @@ SKQ202205S,"Pearce, Whitefield",,,CE05MOAS-GL312-02-FLORTM000,12,1,2022-03-24T15
7171
SKQ202205S,"Pearce, Whitefield",,,CE05MOAS-GL312-03-ADCPAM000,12,1,2022-03-24T15:47:00,2022-04-15T06:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGINS-ADCPAM-55731,46.985,-124.567,,200,200,,,
7272
SKQ202205S,"Pearce, Whitefield",,,CE05MOAS-GL312-04-DOSTAM000,12,1,2022-03-24T15:47:00,2022-04-15T06:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGINS-DOSTAM-00191,46.985,-124.567,,200,200,,,
7373
SKQ202205S,"Pearce, Whitefield",,,CE05MOAS-GL312-05-CTDGVM000,12,1,2022-03-24T15:47:00,2022-04-15T06:13:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGINS-CTDGVM-09088,46.985,-124.567,,200,200,,,
74+
EK20221017,Whitefield,,,CE05MOAS-GL312-00-ENG000000,13,1,2022-10-17T16:41:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGCON-GLDRCE-00312,44.642,-124.305,,1000,1000,,,
75+
EK20221017,Whitefield,,,CE05MOAS-GL312-01-PARADM000,13,1,2022-10-17T16:41:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGINS-PARADM-50164,44.642,-124.305,,1000,1000,,,
76+
EK20221017,Whitefield,,,CE05MOAS-GL312-02-FLORTM000,13,1,2022-10-17T16:41:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGINS-FLORTM-03186,44.642,-124.305,,1000,1000,,,
77+
EK20221017,Whitefield,,,CE05MOAS-GL312-03-ADCPAM000,13,1,2022-10-17T16:41:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGINS-ADCPAM-55980,44.642,-124.305,,1000,1000,,,
78+
EK20221017,Whitefield,,,CE05MOAS-GL312-04-DOSTAM000,13,1,2022-10-17T16:41:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGINS-DOSTAM-00027,44.642,-124.305,,1000,1000,,,
79+
EK20221017,Whitefield,,,CE05MOAS-GL312-05-CTDGVM000,13,1,2022-10-17T16:41:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00312,CGINS-CTDGVM-09086,44.642,-124.305,,1000,1000,,,

deployment/CE05MOAS-GL382_Deploy.csv

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ EK20220510,S.Pearce,,Yogi,CE05MOAS-GL382-02-FLORTM000,11,1,2022-05-10T17:58:00,2
6565
EK20220510,S.Pearce,,Yogi,CE05MOAS-GL382-03-ADCPAM000,11,1,2022-05-10T17:58:00,2022-07-18T22:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-ADCPAM-43473,44.633,-124.303,,1000,1000,,,
6666
EK20220510,S.Pearce,,Yogi,CE05MOAS-GL382-04-DOSTAM000,11,1,2022-05-10T17:58:00,2022-07-18T22:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-DOSTAM-00026,44.633,-124.303,,1000,1000,,,
6767
EK20220510,S.Pearce,,Yogi,CE05MOAS-GL382-05-CTDGVM000,11,1,2022-05-10T17:58:00,2022-07-18T22:29:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-CTDGVM-09341,44.633,-124.303,,1000,1000,,,
68-
TN408,J.Whitefield,,,CE05MOAS-GL382-00-ENG000000,12,1,2022-09-23T01:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGCON-GLDRCE-00382,46.983,-124.567,,1000,1000,,,
69-
TN408,J.Whitefield,,,CE05MOAS-GL382-01-PARADM000,12,1,2022-09-23T01:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-PARADM-50245,46.983,-124.567,,1000,1000,,,
70-
TN408,J.Whitefield,,,CE05MOAS-GL382-02-FLORTM000,12,1,2022-09-23T01:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-FLORTM-03188,46.983,-124.567,,1000,1000,,,
71-
TN408,J.Whitefield,,,CE05MOAS-GL382-03-ADCPAM000,12,1,2022-09-23T01:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-ADCPAM-43473,46.983,-124.567,,1000,1000,,,
72-
TN408,J.Whitefield,,,CE05MOAS-GL382-04-DOSTAM000,12,1,2022-09-23T01:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-DOSTAM-00100,46.983,-124.567,,1000,1000,,,
73-
TN408,J.Whitefield,,,CE05MOAS-GL382-05-CTDGVM000,12,1,2022-09-23T01:19:00,,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-CTDGVM-09036,46.983,-124.567,,1000,1000,,,
68+
TN408,J.Whitefield,EK20221017,Whitefield,CE05MOAS-GL382-00-ENG000000,12,1,2022-09-23T01:19:00,2022-10-17T18:15:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGCON-GLDRCE-00382,46.983,-124.567,,1000,1000,,,
69+
TN408,J.Whitefield,EK20221017,Whitefield,CE05MOAS-GL382-01-PARADM000,12,1,2022-09-23T01:19:00,2022-10-17T18:15:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-PARADM-50245,46.983,-124.567,,1000,1000,,,
70+
TN408,J.Whitefield,EK20221017,Whitefield,CE05MOAS-GL382-02-FLORTM000,12,1,2022-09-23T01:19:00,2022-10-17T18:15:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-FLORTM-03188,46.983,-124.567,,1000,1000,,,
71+
TN408,J.Whitefield,EK20221017,Whitefield,CE05MOAS-GL382-03-ADCPAM000,12,1,2022-09-23T01:19:00,2022-10-17T18:15:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-ADCPAM-43473,46.983,-124.567,,1000,1000,,,
72+
TN408,J.Whitefield,EK20221017,Whitefield,CE05MOAS-GL382-04-DOSTAM000,12,1,2022-09-23T01:19:00,2022-10-17T18:15:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-DOSTAM-00100,46.983,-124.567,,1000,1000,,,
73+
TN408,J.Whitefield,EK20221017,Whitefield,CE05MOAS-GL382-05-CTDGVM000,12,1,2022-09-23T01:19:00,2022-10-17T18:15:00,CGVCE-05MOAS-00000,CGVEH-GLDRCE-00382,CGINS-CTDGVM-09036,46.983,-124.567,,1000,1000,,,

0 commit comments

Comments
 (0)