Skip to content
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

Updating Irminger branch with latest changes from oceanobservatories asset management #1649

Merged
merged 26 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
34ef000
FLORT-D,J Calibration Updates
desiderr Aug 9, 2024
0ec953e
RCA 2024, leg 1 deployments
wruef Aug 14, 2024
848517f
RCA 2024, leg 1 deployments, second set
wruef Aug 15, 2024
b823c98
RCA 2024, leg 1 deployments, third set
wruef Aug 15, 2024
ca3ea2d
Merge branch 'master' into master
mvardaro Aug 15, 2024
7d097a5
Merge pull request #1162 from wruef/master
mvardaro Aug 15, 2024
14b8ce9
RCA 2024, leg 1 deployments, final set
wruef Aug 16, 2024
23d631f
Merge pull request #1163 from wruef/master
mvardaro Aug 16, 2024
526934d
NUTNR vendor calibration updates
desiderr Aug 20, 2024
8152dfc
Close CE01 D00023 (add end date).
aguirremar Aug 20, 2024
7c92ff5
correct recovery time CE01ISSP_D23
aguirremar Aug 21, 2024
74454f6
Add recovery date-time to CE02SHSP_D35
aguirremar Aug 21, 2024
b4745e9
add recovery date-time to CE07SHSP_D16
aguirremar Aug 21, 2024
e3173f3
open deployment CE01ISSP_D24
aguirremar Aug 21, 2024
93a28de
open deployment CE02SHSP_D36
aguirremar Aug 21, 2024
4b63c75
Open/Close CE06ISSP_D18
aguirremar Aug 21, 2024
8fdf70a
Added the platform to bulk
aguirremar Aug 21, 2024
4382678
Merge branch 'master' into flortUpdates
cwingard Aug 21, 2024
d5971ce
Merge pull request #1158 from desiderr/flortUpdates
cwingard Aug 21, 2024
1c59f13
Merge branch 'master' into nutnrVendorCalUpdates
cwingard Aug 21, 2024
bf76c5f
Add two CSPP cruises
aguirremar Aug 21, 2024
3ba7ebf
Fix cruise ID
aguirremar Aug 21, 2024
b474488
Merge pull request #1164 from desiderr/nutnrVendorCalUpdates
cwingard Aug 22, 2024
868e87c
Merge branch 'master' into cspp_closeD
cwingard Aug 22, 2024
e4877c3
Merge pull request #1165 from aguirremar/cspp_closeD
cwingard Aug 22, 2024
fca0aa7
Merge pull request #1646 from oceanobservatories/master
reedan88 Aug 23, 2024
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 bulk/platform_bulk_load-AssetRecord.csv
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ CGMCE-01ISSP-00020,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing
CGMCE-01ISSP-00021,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00021,,,,,Oregon State University
CGMCE-01ISSP-00022,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00022,,,,,Oregon State University
CGMCE-01ISSP-00023,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00023,,,,,Oregon State University
CGMCE-01ISSP-00024,,Platform,0,Coastal Endurance Oregon Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE01ISSP,CE01ISSP-00024,,,,,Oregon State University
CGMCE-02SHSM-00001,N00211,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00001,,,,,Oregon State University
CGMCE-02SHSM-00002,N00266,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00002,,,,,Oregon State University
CGMCE-02SHSM-00003,OL000316,Platform,0,Coastal Endurance Oregon Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE02SHSM,CE02SHSM-00003,,,,,Oregon State University
Expand Down Expand Up @@ -107,6 +108,7 @@ CGMCE-02SHSP-00032,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing P
CGMCE-02SHSP-00033,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE02SHSP,CE02SHSP-00033,,,,,Oregon State University
CGMCE-02SHSP-00034,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE02SHSP,CE02SHSP-00034,,,,,Oregon State University
CGMCE-02SHSP-00035,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE02SHSP,CE02SHSP-00035,,,,,Oregon State University
CGMCE-02SHSP-00036,,Platform,0,Coastal Endurance Oregon Shelf Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE02SHSP,CE02SHSP-00036,,,,,Oregon State University
CGMCE-04OSSM-00001,N00212,Platform,0,Coastal Endurance Oregon Offshore Surface Mooring,MOORING ENDURANCE OS SURFACE,WHOI,CE04OSSM,CE04OSSM-00001,,,,,Oregon State University
CGMCE-04OSSM-00002,OL000385,Platform,0,Coastal Endurance Oregon Offshore Surface Mooring,MOORING ENDURANCE OS SURFACE,WHOI,CE04OSSM,CE04OSSM-00002,,,,,Oregon State University
CGMCE-04OSSM-00003,,Platform,0,Coastal Endurance Oregon Offshore Surface Mooring,MOORING ENDURANCE OS SURFACE,WHOI,CE04OSSM,CE04OSSM-00003,,,,,Oregon State University
Expand Down Expand Up @@ -160,6 +162,7 @@ CGMCE-06ISSP-00014,,Platform,0,Coastal Endurance Washington Inshore Surface Pier
CGMCE-06ISSP-00015,,Platform,0,Coastal Endurance Washington Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE06ISSP,CE06ISSP-00015,,,,,Oregon State University
CGMCE-06ISSP-00016,,Platform,0,Coastal Endurance Washington Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE06ISSP,CE06ISSP-00016,,,,,Oregon State University
CGMCE-06ISSP-00017,,Platform,0,Coastal Endurance Washington Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE06ISSP,CE06ISSP-00017,,,,,Oregon State University
CGMCE-06ISSP-00018,,Platform,0,Coastal Endurance Washington Inshore Surface Piercing Profiler Mooring,MOORING ENDURANCE,WHOI,CE06ISSP,CE06ISSP-00018,,,,,Oregon State University
CGMCE-07SHSM-00001,N00213,Platform,0,Coastal Endurance Washington Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE07SHSM,CE07SHSM-00001,,,,,Oregon State University
CGMCE-07SHSM-00002,N00271,Platform,0,Coastal Endurance Washington Shelf Surface Mooring,MOORING ENDURANCE OS PROFILER,WHOI,CE07SHSM,CE07SHSM-00002,,,,,Oregon State University
CGMCE-07SHSM-00003,OL000429,Platform,0,Coastal Endurance Washington Shelf Surface Mooring,MOORING ENDURANCE SHELF SM,WHOI,CE07SHSM,CE07SHSM-00003,,,,,Oregon State University
Expand Down
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-00995__20240723.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
995,CC_dark_counts_cdom,53,date in filename comes from dev file
995,CC_scale_factor_cdom,9.110E-02,
995,CC_dark_counts_chlorophyll_a,50,
995,CC_scale_factor_chlorophyll_a,1.241E-02,
995,CC_dark_counts_volume_scatter,56.025,
995,CC_scale_factor_volume_scatter,1.892E-06,
995,CC_depolarization_ratio,0.039,Constant
995,CC_measurement_wavelength,700,[nm]; Constant
995,CC_scattering_angle,124,[degrees]; Constant
995,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01123__20240604.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1123,CC_dark_counts_cdom,49,date in filename comes from dev file
1123,CC_scale_factor_cdom,9.060E-02,
1123,CC_dark_counts_chlorophyll_a,50,
1123,CC_scale_factor_chlorophyll_a,1.210E-02,
1123,CC_dark_counts_volume_scatter,46,
1123,CC_scale_factor_volume_scatter,1.921E-06,
1123,CC_depolarization_ratio,0.039,Constant
1123,CC_measurement_wavelength,700,[nm]; Constant
1123,CC_scattering_angle,124,[degrees]; Constant
1123,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01152__20240528.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1152,CC_dark_counts_cdom,39,date in filename comes from dev file
1152,CC_scale_factor_cdom,9.013E-02,
1152,CC_dark_counts_chlorophyll_a,44,
1152,CC_scale_factor_chlorophyll_a,1.207E-02,
1152,CC_dark_counts_volume_scatter,46,
1152,CC_scale_factor_volume_scatter,2.893E-06,
1152,CC_depolarization_ratio,0.039,Constant
1152,CC_measurement_wavelength,700,[nm]; Constant
1152,CC_scattering_angle,124,[degrees]; Constant
1152,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01155__20240606.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1155,CC_dark_counts_cdom,40,date in filename comes from dev file
1155,CC_scale_factor_cdom,9.134E-02,
1155,CC_dark_counts_chlorophyll_a,45,
1155,CC_scale_factor_chlorophyll_a,7.238E-03,
1155,CC_dark_counts_volume_scatter,47,
1155,CC_scale_factor_volume_scatter,1.848E-06,
1155,CC_depolarization_ratio,0.039,Constant
1155,CC_measurement_wavelength,700,[nm]; Constant
1155,CC_scattering_angle,124,[degrees]; Constant
1155,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01197__20240528.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1197,CC_dark_counts_cdom,42,date in filename comes from dev file
1197,CC_scale_factor_cdom,9.018E-02,
1197,CC_dark_counts_chlorophyll_a,47,
1197,CC_scale_factor_chlorophyll_a,1.208E-02,
1197,CC_dark_counts_volume_scatter,38,
1197,CC_scale_factor_volume_scatter,1.814E-06,
1197,CC_depolarization_ratio,0.039,Constant
1197,CC_measurement_wavelength,700,[nm]; Constant
1197,CC_scattering_angle,124,[degrees]; Constant
1197,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01290__20240523.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1290,CC_dark_counts_cdom,44,date in filename comes from dev file
1290,CC_scale_factor_cdom,9.055E-02,
1290,CC_dark_counts_chlorophyll_a,47,
1290,CC_scale_factor_chlorophyll_a,1.207E-02,
1290,CC_dark_counts_volume_scatter,48,
1290,CC_scale_factor_volume_scatter,1.834E-06,
1290,CC_depolarization_ratio,0.039,Constant
1290,CC_measurement_wavelength,700,[nm]; Constant
1290,CC_scattering_angle,124,[degrees]; Constant
1290,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01487__20240730.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1487,CC_dark_counts_cdom,53,date in filename comes from dev file
1487,CC_scale_factor_cdom,9.100E-02,
1487,CC_dark_counts_chlorophyll_a,51,
1487,CC_scale_factor_chlorophyll_a,1.246E-02,
1487,CC_dark_counts_volume_scatter,50.625,
1487,CC_scale_factor_volume_scatter,1.824E-06,
1487,CC_depolarization_ratio,0.039,Constant
1487,CC_measurement_wavelength,700,[nm]; Constant
1487,CC_scattering_angle,124,[degrees]; Constant
1487,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
11 changes: 11 additions & 0 deletions calibration/FLORTD/CGINS-FLORTD-01488__20240607.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
1488,CC_dark_counts_cdom,51,date in filename comes from dev file
1488,CC_scale_factor_cdom,9.077E-02,
1488,CC_dark_counts_chlorophyll_a,51,
1488,CC_scale_factor_chlorophyll_a,1.242E-02,
1488,CC_dark_counts_volume_scatter,50.6,
1488,CC_scale_factor_volume_scatter,1.779E-06,
1488,CC_depolarization_ratio,0.039,Constant
1488,CC_measurement_wavelength,700,[nm]; Constant
1488,CC_scattering_angle,124,[degrees]; Constant
1488,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
11 changes: 11 additions & 0 deletions calibration/FLORTJ/CGINS-FLORTJ-01518__20240605.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
serial,name,value,notes
BBFL2W-1518,CC_dark_counts_cdom,49,date in filename comes from dev file
BBFL2W-1518,CC_scale_factor_cdom,9.107E-02,
BBFL2W-1518,CC_dark_counts_chlorophyll_a,46,
BBFL2W-1518,CC_scale_factor_chlorophyll_a,1.207E-02,
BBFL2W-1518,CC_dark_counts_volume_scatter,45.525,
BBFL2W-1518,CC_scale_factor_volume_scatter,2.941E-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
Loading
Loading