Skip to content

Updating cross-mio with latest updates from oceanobservatories #1793

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 61 commits into from
Mar 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
ba330c0
Merge pull request #1522 from WHOIGit/main
reedan88 May 8, 2024
484de46
Merge pull request #1534 from WHOIGit/main
reedan88 May 15, 2024
9820831
Merge pull request #1552 from WHOIGit/main
reedan88 May 22, 2024
ec7cad2
Merge pull request #1573 from WHOIGit/main
reedan88 Jun 13, 2024
c34ef34
Merge pull request #1585 from WHOIGit/main
reedan88 Jun 24, 2024
53db255
Merge pull request #1601 from WHOIGit/main
snwhite Jun 29, 2024
4582691
Merge pull request #1626 from WHOIGit/main
reedan88 Aug 8, 2024
e7c6348
Merge pull request #1642 from WHOIGit/main
reedan88 Aug 14, 2024
1ebb129
Merge pull request #1653 from WHOIGit/main
reedan88 Aug 23, 2024
cc8db18
Merge pull request #1673 from WHOIGit/main
reedan88 Sep 25, 2024
2f6949b
Merge pull request #1689 from WHOIGit/main
reedan88 Oct 28, 2024
7a2f9d2
Merge pull request #1703 from WHOIGit/main
reedan88 Nov 14, 2024
1c500b7
Merge pull request #1715 from WHOIGit/main
reedan88 Nov 18, 2024
1d759f7
Merge pull request #1732 from WHOIGit/main
reedan88 Dec 19, 2024
5a68761
NUTNR-B updates
desiderr Feb 10, 2025
8eab1f6
Merge pull request #1754 from WHOIGit/main
reedan88 Feb 11, 2025
42cbdf2
Merge pull request #1755 from WHOIGit/main
reedan88 Feb 11, 2025
0c0898f
Merge pull request #1765 from WHOIGit/main
reedan88 Feb 13, 2025
4029f96
Merge pull request #1764 from WHOIGit/main
reedan88 Feb 13, 2025
3242fd7
Merge pull request #1216 from WHOIGit/main
reedan88 Feb 13, 2025
2bafbfb
Merge pull request #1775 from WHOIGit/main
reedan88 Feb 13, 2025
6c38d47
Merge pull request #1774 from WHOIGit/main
reedan88 Feb 13, 2025
b8fa355
Merge branch 'master' into nutnr_cal_updates
desiderr Feb 13, 2025
2557b7a
Merge pull request #1214 from desiderr/nutnr_cal_updates
desiderr Feb 13, 2025
d3cffd7
METCTD Calibration Updates
desiderr Feb 13, 2025
e354e2d
updated P21 cal csvs plus new cal csvs
rtravis-whoi Feb 14, 2025
c359ee2
Merge pull request #1217 from desiderr/metct_updates
cwingard Feb 17, 2025
1fa834c
nutnr-j recovery cal updates
desiderr Feb 21, 2025
4ddb0bd
nutnr-b pre-deployment cal updates
desiderr Feb 21, 2025
a30c20b
Merge pull request #1780 from WHOIGit/cross-mio
reedan88 Feb 24, 2025
9640faa
Merge pull request #1781 from oceanobservatories/master
reedan88 Feb 24, 2025
10df1cc
Merge pull request #1219 from WHOIGit/main
reedan88 Feb 24, 2025
a80e2d9
Merge branch 'master' into nutnr_cal_updates
desiderr Feb 26, 2025
6ce36db
Merge pull request #1218 from desiderr/nutnr_cal_updates
desiderr Feb 26, 2025
cc07732
PHSEN-D Calibration Updates
desiderr Feb 27, 2025
cb41dde
dosta-j cal updates
desiderr Feb 27, 2025
3c3a2c8
dosta-d cal updates
desiderr Feb 28, 2025
bd35fa4
Pioneer 20f updates
cdobs Feb 28, 2025
cad9c02
Update ATAPL-78520-00003__20240809.csv
mvardaro Feb 28, 2025
c42793a
Update ATAPL-78520-00004__20240812.csv
mvardaro Feb 28, 2025
b80ffad
Merge pull request #1782 from WHOIGit/cross-mio
reedan88 Feb 28, 2025
90277f4
Merge pull request #1783 from WHOIGit/auvs
reedan88 Feb 28, 2025
679aafd
Merge pull request #1222 from oceanobservatories/mvardaro-patch-2
wruef Feb 28, 2025
c576c55
Merge pull request #1784 from oceanobservatories/master
reedan88 Feb 28, 2025
42f112c
Merge pull request #1223 from WHOIGit/main
reedan88 Feb 28, 2025
baf6bc0
Merge branch 'master' into dosta_dj_cal_updates
aguirremar Mar 3, 2025
655e39f
Merge branch 'master' into phsen-d_cal_updates
desiderr Mar 3, 2025
46f009c
Merge pull request #1220 from desiderr/phsen-d_cal_updates
desiderr Mar 3, 2025
7838b76
Merge branch 'master' into dosta_dj_cal_updates
desiderr Mar 4, 2025
bc15880
Merge pull request #1221 from desiderr/dosta_dj_cal_updates
desiderr Mar 4, 2025
ec222b1
Corrections of EA FLORTM serial numbers and cal dates
s-pearce Mar 4, 2025
26e9dca
updated cal dates on some EA FLORTS
s-pearce Mar 4, 2025
7165929
Added comment to CE 327-9
s-pearce Mar 4, 2025
cc98b5d
corrects oxygen for 382-15 which had salinity set to 35, and sets it …
s-pearce Mar 4, 2025
3d01fbe
needed to add quotes to DOSTA cal notes
s-pearce Mar 4, 2025
fecdfd7
Add end date to CE02SHSP_00038
aguirremar Mar 4, 2025
a3ba13e
Merge pull request #1224 from s-pearce/glider_flort_sn_fix
jwhitefield42 Mar 4, 2025
4a23b5a
Merge branch 'master' into CE02_00038
aguirremar Mar 5, 2025
7bd6dce
Merge pull request #1225 from aguirremar/CE02_00038
aguirremar Mar 5, 2025
dda8644
Merge pull request #1779 from WHOIGit/cals
reedan88 Mar 6, 2025
a8d7930
Merge pull request #1785 from oceanobservatories/master
reedan88 Mar 6, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00134__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
134,CC_conc_coef,"[-7.472992E+00, 1.051285E+00]",date in filename comes from factory calibration certificate
134,CC_csv,"[2.771977E-03, 1.193776E-04, 2.319064E-06, 1.392590E+02, -1.768776E-01, -3.578086E+01, 2.822485E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00136__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
136,CC_conc_coef,"[-3.360419E+00, 1.044335E+00]",date in filename comes from factory calibration certificate
136,CC_csv,"[2.786710E-03, 1.161630E-04, 2.326744E-06, 1.750117E+02, -2.152912E-01, -3.648289E+01, 3.505610E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00218__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
218,CC_conc_coef,"[-2.839306E+00, 1.037724E+00]",date in filename comes from factory calibration certificate
218,CC_csv,"[2.607594E-03, 1.147223E-04, 2.141095E-06, 1.992743E+02, -2.260555E-01, -5.010155E+01, 4.036013E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00220__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
220,CC_conc_coef,"[-8.073775E-01, 1.028574E+00]",date in filename comes from factory calibration certificate
220,CC_csv,"[2.588545E-03, 1.161331E-04, 2.079028E-06, 1.966280E+02, -2.449492E-01, -5.069499E+01, 3.947571E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00291__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
291,CC_conc_coef,"[-4.291467E+00, 1.147017E+00]",date in filename comes from factory calibration certificate
291,CC_csv,"[2.861700E-03, 1.265709E-04, 2.314874E-06, 1.631354E+02, -2.110281E-01, -4.190176E+01, 3.235527E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00313__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
313,CC_conc_coef,"[-8.997121E-01, 1.039481E+00]",date in filename comes from factory calibration certificate
313,CC_csv,"[2.650940E-03, 1.166284E-04, 2.212675E-06, 2.209639E+02, -2.666164E-01, -5.420997E+01, 4.425468E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00315__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
315,CC_conc_coef,"[-2.784125E+00, 1.056637E+00]",date in filename comes from factory calibration certificate
315,CC_csv,"[2.794689E-03, 1.242044E-04, 2.063696E-06, 1.596713E+02, -1.995395E-01, -3.852097E+01, 3.122664E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00478__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
478,CC_conc_coef,"[-2.740198E+00, 1.075478E+00]",date in filename comes from factory calibration certificate
478,CC_csv,"[2.621372E-03, 1.202236E-04, 1.825034E-06, 2.029090E+02, -2.231906E-01, -4.957514E+01, 3.994102E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00479__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
479,CC_conc_coef,"[-9.658092E-01, 1.080792E+00]",date in filename comes from factory calibration certificate
479,CC_csv,"[2.783855E-03, 1.160015E-04, 2.235423E-06, 7.146108E+01, -1.073487E-01, -1.577259E+01, 1.428462E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAD/CGINS-DOSTAD-00482__20250122.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
482,CC_conc_coef,"[-2.219144E+00, 1.028262E+00]",date in filename comes from factory calibration certificate
482,CC_csv,"[2.571943E-03, 1.143762E-04, 2.010628E-06, 1.352527E+02, -1.597942E-01, -3.187542E+01, 2.675187E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAJ/CGINS-DOSTAJ-00646__20250113.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
646,CC_conc_coef,"[-1.074202E+00, 1.055855E+00]",date in filename comes from factory calibration certificate
646,CC_csv,"[2.785293E-03, 1.176298E-04, 2.290713E-06, 2.325331E+02, -4.235047E-01, -5.093462E+01, 4.594281E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAJ/CGINS-DOSTAJ-00672__20250113.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
672,CC_conc_coef,"[-4.779433E-01, 1.038065E+00]",date in filename comes from factory calibration certificate
672,CC_csv,"[2.664254E-03, 1.127765E-04, 2.290584E-06, 2.281065E+02, -3.671889E-01, -5.776281E+01, 4.566197E+00]",
3 changes: 3 additions & 0 deletions calibration/DOSTAM/CGINS-DOSTAM-00864__20240618.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
864,CC_calibration_date,1691971200000,"sensor calibration date (milliseconds since 1970-01-01). This timestamp is the factory calibration date but does not match the filename date which is the start of a glider deployment where the optode salinity setting was 35 instead of 0."
864,CC_ref_salinity,35,"Optode salinity setting. Was set to 35 by TWR after the calibration date, so this is an intermediate configuration/calibration file that does not match the actual calibration date."
3 changes: 3 additions & 0 deletions calibration/DOSTAM/CGINS-DOSTAM-00864__20250128.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
serial,name,value,notes
864,CC_calibration_date,1691971200000,"sensor calibration date (milliseconds since 1970-01-01). This timestamp is the factory calibration date but does not match the filename date which is the start of a glider deployment where the salinity setting was changed."
864,CC_ref_salinity,0,"Optode salinity setting. This file was created as an intermediate file when a glider deployment updated the salinity setting to 0."
9 changes: 9 additions & 0 deletions calibration/FLORDG/CGINS-FLORDG-04032__20250129.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
serial,name,value,notes
4032,CC_angular_resolution,1.096,Constant; source_file FLORD-G_FLBBSB_SN_4032_Calibration_Files_2025-01-29.zip > FLBBSB-4032_CharSheet.pdf
4032,CC_dark_counts_chlorophyll_a,0.078,in Volts (because analog signal going to CTDBP)
4032,CC_dark_counts_volume_scatter,0.0690,in Volts (because analog signal going to CTDBP)
4032,CC_depolarization_ratio,0.039,Constant
4032,CC_measurement_wavelength,700,Constant
4032,CC_scale_factor_chlorophyll_a,6,in Volts (because analog signal going to CTDBP)
4032,CC_scale_factor_volume_scatter,1.392E-03,in Volts (because analog signal going to CTDBP)
4032,CC_scattering_angle,140,Constant
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01005__20250129.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1005,CC_angular_resolution,1.076,constant; source_file FLORT-D_BBFL2W_SN_1005_Calibration_Files_2025-01-29.zip > BBFL2W-1005.dev
1005,CC_dark_counts_cdom,46,
1005,CC_dark_counts_chlorophyll_a,43,
1005,CC_dark_counts_volume_scatter,46.12962963,
1005,CC_depolarization_ratio,0.039,constant
1005,CC_measurement_wavelength,700,constant
1005,CC_scale_factor_cdom,9.069E-02,
1005,CC_scale_factor_chlorophyll_a,1.183E-02,
1005,CC_scale_factor_volume_scatter,1.844E-06,
1005,CC_scattering_angle,124,constant
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01221__20250205.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1221,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1221_Calibration_Files_2025-02-05.zip > BBFL2W-1221.dev
1221,CC_dark_counts_cdom,47,
1221,CC_dark_counts_chlorophyll_a,49,
1221,CC_dark_counts_volume_scatter,47.63043478,
1221,CC_depolarization_ratio,0.039,Constant
1221,CC_measurement_wavelength,700,Constant
1221,CC_scale_factor_cdom,9.029E-02,
1221,CC_scale_factor_chlorophyll_a,1.198E-02,
1221,CC_scale_factor_volume_scatter,1.824E-06,
1221,CC_scattering_angle,124,Constant
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01299__20250203.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1299,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1299_Calibration_Files_2025-02-03.zip > BBFL2W-1299.dev
1299,CC_dark_counts_cdom,48,
1299,CC_dark_counts_chlorophyll_a,48,
1299,CC_dark_counts_volume_scatter,47.575,
1299,CC_depolarization_ratio,0.039,Constant
1299,CC_measurement_wavelength,700,Constant
1299,CC_scale_factor_cdom,9.074E-02,
1299,CC_scale_factor_chlorophyll_a,7.254E-03,
1299,CC_scale_factor_volume_scatter,1.784E-06,
1299,CC_scattering_angle,124,Constant
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01435__20250129.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1435,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1435_Calibration_Files_2025-01-29.zip > BBFL2W-1435.dev
1435,CC_dark_counts_cdom,49,
1435,CC_dark_counts_chlorophyll_a,63,
1435,CC_dark_counts_volume_scatter,56.5,
1435,CC_depolarization_ratio,0.039,Constant
1435,CC_measurement_wavelength,700,Constant
1435,CC_scale_factor_cdom,9.084E-02,
1435,CC_scale_factor_chlorophyll_a,7.504E-03,
1435,CC_scale_factor_volume_scatter,1.822E-06,
1435,CC_scattering_angle,124,Constant
5 changes: 0 additions & 5 deletions calibration/FLORTM/CGINS-FLORTM-02110__20160510.csv

This file was deleted.

5 changes: 0 additions & 5 deletions calibration/FLORTM/CGINS-FLORTM-02760__20141006.csv

This file was deleted.

5 changes: 0 additions & 5 deletions calibration/FLORTM/CGINS-FLORTM-03185__20150121.csv

This file was deleted.

12 changes: 12 additions & 0 deletions calibration/METBKA/CGINS-METCTD-10904__20250105.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
serial,name,value,notes
37-10904,CC_a0,-5.916092e-05,source: QCT 3305-00116-00208
37-10904,CC_a1,3.036899e-04,
37-10904,CC_a2,-4.468610e-06,
37-10904,CC_a3,2.000197e-07,
37-10904,CC_g,-1.022376e+00,
37-10904,CC_h,1.411594e-01,
37-10904,CC_i,-2.388206e-04,
37-10904,CC_j,3.747731e-05,
37-10904,CC_cpcor,-9.570000e-08,
37-10904,CC_ctcor,3.250000e-06,
37-10904,CC_wbotc,6.803412e-07,
12 changes: 12 additions & 0 deletions calibration/METBKA/CGINS-METCTD-13468__20241220.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
serial,name,value,notes
37-13468,CC_a0,-1.386777e-04,source: QCT 3305-00116-00209
37-13468,CC_a1,3.106167e-04,
37-13468,CC_a2,-4.590514e-06,
37-13468,CC_a3,2.059033e-07,
37-13468,CC_g,-9.875441e-01,
37-13468,CC_h,1.374193e-01,
37-13468,CC_i,-2.300506e-04,
37-13468,CC_j,3.337267e-05,
37-13468,CC_cpcor,-9.570000e-08,
37-13468,CC_ctcor,3.250000e-06,
37-13468,CC_wbotc,1.552126e-07,
12 changes: 12 additions & 0 deletions calibration/METBKA/CGINS-METCTD-13469__20241220.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
serial,name,value,notes
37-13469,CC_a0,-1.613288e-04,source: QCT 3305-00116-00211
37-13469,CC_a1,3.172639e-04,
37-13469,CC_a2,-5.233800e-06,
37-13469,CC_a3,2.228369e-07,
37-13469,CC_g,-9.745251e-01,
37-13469,CC_h,1.338287e-01,
37-13469,CC_i,-1.855880e-04,
37-13469,CC_j,2.983712e-05,
37-13469,CC_cpcor,-9.570000e-08,
37-13469,CC_ctcor,3.250000e-06,
37-13469,CC_wbotc,2.776292e-07,
12 changes: 12 additions & 0 deletions calibration/METBKA/CGINS-METCTD-13471__20250103.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
serial,name,value,notes
37-13471,CC_a0,-6.790996e-05,source: QCT 3305-00116-00210
37-13471,CC_a1,2.997428e-04,
37-13471,CC_a2,-3.942313e-06,
37-13471,CC_a3,1.869104e-07,
37-13471,CC_g,-9.888583e-01,
37-13471,CC_h,1.372379e-01,
37-13471,CC_i,-3.409193e-04,
37-13471,CC_j,4.438249e-05,
37-13471,CC_cpcor,-9.570000e-08,
37-13471,CC_ctcor,3.250000e-06,
37-13471,CC_wbotc,4.336702e-07,
9 changes: 9 additions & 0 deletions calibration/METBKA/CGINS-METLGR-00008__20250328.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
serial,name,value,notes
LGR008,CC_depth_of_conductivity_and_temperature_measurements_m,0.98,CP11NOSM-00002
LGR008,CC_height_of_air_humidity_measurement_m,4.255,
LGR008,CC_height_of_air_temperature_measurement_m,4.255,
LGR008,CC_height_of_windspeed_sensor_above_sealevel_m,4.74,
LGR008,CC_jcool,1,Constant
LGR008,CC_jwarm,1,Constant
LGR008,CC_zinvpbl,600,Constant
LGR008,CC_use_velpt,1,
9 changes: 9 additions & 0 deletions calibration/METBKA/CGINS-METLGR-00016__20250328.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
serial,name,value,notes
LGR016,CC_depth_of_conductivity_and_temperature_measurements_m,0.98,CP11SOSM-00002
LGR016,CC_height_of_air_humidity_measurement_m,4.255,
LGR016,CC_height_of_air_temperature_measurement_m,4.255,
LGR016,CC_height_of_windspeed_sensor_above_sealevel_m,4.74,
LGR016,CC_jcool,1,Constant
LGR016,CC_jwarm,1,Constant
LGR016,CC_zinvpbl,600,Constant
LGR016,CC_use_velpt,1,
Loading