Skip to content

Commit 6d9c524

Browse files
reedan88reedan88
authored
Merge pull request #1570 from WHOIGit/main
Updating Papa branch with latest am updates
2 parents 55cbaff + 7ec6d39 commit 6d9c524

27 files changed

+440
-150
lines changed

‎bulk/eng_bulk_load-AssetRecord.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ CGCON-NDCL16-00036,,Sensor,0,Near Surface Instrument Frame Data Concentrator Log
428428
CGCON-NDCL16-00038,,Sensor,0,Near Surface Instrument Frame Data Concentrator Logger,Data Concentrator Logger,WHOI,DCL,38,,,,,
429429
CGCON-NDCL16-00042,,Sensor,0,Near Surface Instrument Frame Data Concentrator Logger,Data Concentrator Logger,WHOI,DCL,42,,,,,
430430
CGCON-NDCL16-00043,,Sensor,0,Near Surface Instrument Frame Data Concentrator Logger,Data Concentrator Logger,WHOI,DCL,43,,,,,
431+
CGCON-NDCL16-00045,,Sensor,0,Near Surface Instrument Frame Data Concentrator Logger,Data Concentrator Logger,WHOI,DCL,3703-00272-00001-00045,,,,,Woods Hole Oceanographic Institution
431432
CGCON-NDCL16-00047,,Sensor,0,Near Surface Instrument Frame Data Concentrator Logger,Data Concentrator Logger,WHOI,DCL,47,,,,,
432433
CGCON-NDCL16-00048,,Sensor,0,Near Surface Instrument Frame Data Concentrator Logger,Data Concentrator Logger,WHOI,DCL,48,,,,,
433434
CGCON-NDCL16-00049,,Sensor,0,Near Surface Instrument Frame Data Concentrator Logger,Data Concentrator Logger,WHOI,DCL,3703-00272-00001-00049,,,,,Woods Hole Oceanographic Institution

‎calibration/CTDGVM/CGINS-CTDGVM-00104__20240201.csv

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

‎calibration/CTDGVM/CGINS-CTDGVM-09307__20240201.csv

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

‎calibration/CTDMOG/CGINS-CTDMOG-12311__20240424.csv

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
serial,name,value,notes
2+
37-12311,CC_a0,-1.591732e-004, source_file CTDMO-G_SBE_37IM_SN_37-12311_Calibration_Files_2024-04-24.zip > 12311.cal
3+
37-12311,CC_a1,3.209710e-004,
4+
37-12311,CC_a2,-5.607050e-006,
5+
37-12311,CC_a3,2.315265e-007,
6+
37-12311,CC_cpcor,-9.570000e-008,
7+
37-12311,CC_ctcor,3.250000e-006,
8+
37-12311,CC_g,-9.784531e-001,
9+
37-12311,CC_h,1.708994e-001,
10+
37-12311,CC_i,-2.465884e-004,
11+
37-12311,CC_j,4.860812e-005,
12+
37-12311,CC_p_range,1450,
13+
37-12311,CC_pa0,3.120791e-001,
14+
37-12311,CC_pa1,4.576079e-003,
15+
37-12311,CC_pa2,-1.390417e-011,
16+
37-12311,CC_ptca0,5.248915e+005,
17+
37-12311,CC_ptca1,3.186746e+000,
18+
37-12311,CC_ptca2,-1.614905e-002,
19+
37-12311,CC_ptcb0,2.547063e+001,
20+
37-12311,CC_ptcb1,-3.075000e-003,
21+
37-12311,CC_ptcb2,0.000000e+000,
22+
37-12311,CC_ptempa0,-7.059676e+001,
23+
37-12311,CC_ptempa1,5.219687e-002,
24+
37-12311,CC_ptempa2,-7.792488e-007,
25+
37-12311,CC_wbotc,0.000000e+000,

‎calibration/DOSTAM/CGINS-DOSTAM-00341__20221005.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial,name,value,notes
2+
341,CC_calibration_date,1664928000000,sensor calibration date (milliseconds since 1970-01-01)
3+
341,CC_ref_salinity,0,Optode salinity setting

‎calibration/DOSTAM/CGINS-DOSTAM-00361__20220221.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial,name,value,notes
2+
361,CC_calibration_date,1645401600000,sensor calibration date (milliseconds since 1970-01-01)
3+
361,CC_ref_salinity,0,Optode salinity setting

‎calibration/DOSTAM/CGINS-DOSTAM-00438__20231219.csv

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial,name,value,notes
2+
438,CC_calibration_date,1702944000000,sensor calibration date (milliseconds since 1970-01-01)
3+
438,CC_ref_salinity,0,Optode salinity setting

‎calibration/FLORDM/CGINS-FLORDM-03063__20240102.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
serial,name,value,notes
2+
3063,CC_angular_resolution,1.096,
3+
3063,CC_depolarization_ratio,0.039,
4+
3063,CC_measurement_wavelength,700.0,
5+
3063,CC_scattering_angle,140.0,

‎calibration/FLORTD/CGINS-FLORTD-01324__20240422.csv

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
serial,name,value,notes
2+
1324,CC_angular_resolution,1.076,Constant; source_file FLORT-D_BBFL2W_SN_1324_Calibration_Files_2024-04-22.zip > BBFL2W-1324.dev
3+
1324,CC_dark_counts_cdom,49,
4+
1324,CC_dark_counts_chlorophyll_a,50,
5+
1324,CC_dark_counts_volume_scatter,47.125,
6+
1324,CC_depolarization_ratio,0.039,Constant
7+
1324,CC_measurement_wavelength,700,Constant
8+
1324,CC_scale_factor_cdom,9.099E-02,
9+
1324,CC_scale_factor_chlorophyll_a,1.209E-02,
10+
1324,CC_scale_factor_volume_scatter,1.780E-06,
11+
1324,CC_scattering_angle,124,Constant

‎calibration/FLORTM/CGINS-FLORTM-04093__20240103.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
serial,name,value,notes
2+
4093,CC_angular_resolution,1.076,
3+
4093,CC_depolarization_ratio,0.039,
4+
4093,CC_measurement_wavelength,700,
5+
4093,CC_scattering_angle,124,

‎calibration/FLORTO/CGINS-FLORTO-01348__20231227.csv

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
serial,name,value,notes
2+
1348,CC_angular_resolution,1.076,
3+
1348,CC_depolarization_ratio,0.039,
4+
1348,CC_measurement_wavelength,700,
5+
1348,CC_scattering_angle,124,

‎calibration/NUTNRB/CGINS-NUTNRM-00658__20231018.csv renamed to ‎calibration/NUTNRM/CGINS-NUTNRM-00658__20231018.csv

File renamed without changes.

‎calibration/NUTNRB/CGINS-NUTNRM-00658__20240319.csv renamed to ‎calibration/NUTNRM/CGINS-NUTNRM-00658__20240319.csv

File renamed without changes.

‎calibration/NUTNRB/CGINS-NUTNRM-00660__20231025.csv renamed to ‎calibration/NUTNRM/CGINS-NUTNRM-00660__20231025.csv

File renamed without changes.

‎calibration/NUTNRB/CGINS-NUTNRM-00660__20240318.csv renamed to ‎calibration/NUTNRM/CGINS-NUTNRM-00660__20240318.csv

File renamed without changes.

‎calibration/NUTNRB/CGINS-NUTNRM-00662__20230717.csv renamed to ‎calibration/NUTNRM/CGINS-NUTNRM-00662__20230717.csv

File renamed without changes.

‎calibration/NUTNRB/CGINS-NUTNRM-00662__20240318.csv renamed to ‎calibration/NUTNRM/CGINS-NUTNRM-00662__20240318.csv

File renamed without changes.

‎calibration/OPTAAD/CGINS-OPTAAD-00422__20240426.csv

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
serial,name,value,notes
2+
ACS-422,CC_tcal,21.6,date in filename comes from 'offsets saved' date within factory devfile; source_file: ACS422.DEV
3+
ACS-422,CC_awlngth,"[400.1, 402.8, 405.1, 407.3, 408.9, 411.2, 414.8, 418.5, 423.5, 428.3, 432.5, 436.8, 440.3, 444.6, 449.0, 453.0, 456.9, 461.0, 465.2, 469.4, 474.1, 478.9, 483.2, 487.6, 491.8, 496.0, 500.0, 504.5, 508.8, 513.3, 517.7, 522.0, 526.0, 529.9, 533.5, 537.3, 541.3, 545.1, 549.0, 553.1, 557.0, 561.0, 564.9, 568.5, 572.0, 575.1, 578.6, 582.0, 585.8, 589.3, 593.2, 597.1, 601.1, 605.3, 609.3, 613.5, 617.7, 621.7, 625.4, 629.5, 633.4, 637.3, 641.2, 645.3, 649.3, 653.4, 657.7, 661.6, 665.7, 669.6, 673.6, 677.5, 681.2, 684.8, 688.7, 692.1, 695.5, 699.4, 702.8, 706.0, 709.9, 713.2, 716.8, 720.0, 724.0, 727.3, 730.4, 733.7, 737.0, 740.4, 744.2]",
4+
ACS-422,CC_acwo,"[-1.914763, -1.814258, -1.725854, -1.648274, -1.566207, -1.469658, -1.357810, -1.236220, -1.112174, -0.992777, -0.882564, -0.787910, -0.700488, -0.617273, -0.537640, -0.457658, -0.378740, -0.301696, -0.224645, -0.151158, -0.079460, -0.011023, 0.054197, 0.118505, 0.179165, 0.236094, 0.291399, 0.342912, 0.392270, 0.440742, 0.487232, 0.533528, 0.577978, 0.619943, 0.660745, 0.699150, 0.735367, 0.770712, 0.804147, 0.837081, 0.869123, 0.899027, 0.928041, 0.954464, 0.977957, 0.996255, 1.014427, 1.029004, 1.039835, 1.045603, 1.047159, 1.046043, 1.047665, 1.056042, 1.071849, 1.091818, 1.112464, 1.132814, 1.152746, 1.171546, 1.189439, 1.206698, 1.221682, 1.234361, 1.243521, 1.249564, 1.254849, 1.261294, 1.270371, 1.280765, 1.289947, 1.296835, 1.298864, 1.295323, 1.285230, 1.267317, 1.239511, 1.199546, 1.147248, 1.079965, 0.989912, 0.879742, 0.744788, 0.582457, 0.393842, 0.189131, -0.023376, -0.233525, -0.411314, -0.539311, -0.622182]",
5+
ACS-422,CC_cwlngth,"[400.5, 402.8, 405.1, 407.3, 409.1, 411.0, 414.2, 418.2, 423.1, 427.8, 432.4, 436.6, 440.3, 444.4, 448.6, 453.0, 457.1, 461.0, 465.2, 469.6, 474.3, 479.0, 483.2, 487.6, 491.6, 495.8, 500.0, 504.5, 508.8, 513.2, 517.7, 522.0, 526.0, 529.9, 533.7, 537.5, 541.3, 545.2, 549.2, 553.3, 557.2, 561.1, 565.0, 568.6, 572.2, 575.4, 578.6, 582.4, 585.9, 589.6, 593.5, 597.2, 601.3, 605.3, 609.5, 613.7, 617.7, 621.7, 625.5, 629.4, 633.4, 637.2, 641.2, 645.5, 649.3, 653.4, 657.3, 661.4, 665.4, 669.5, 673.2, 677.3, 681.1, 684.5, 688.4, 691.8, 695.3, 698.9, 702.5, 705.8, 709.2, 712.8, 716.1, 719.7, 723.3, 726.8, 729.6, 732.0, 736.4, 740.0, 743.2]",
6+
ACS-422,CC_ccwo,"[-1.043856, -0.918474, -0.759128, -0.592756, -0.439661, -0.320319, -0.241931, -0.230264, -0.213948, -0.209759, -0.197800, -0.153380, -0.084839, -0.019602, 0.043239, 0.098658, 0.152466, 0.197752, 0.233696, 0.272676, 0.304251, 0.335983, 0.366794, 0.394290, 0.419103, 0.442783, 0.461856, 0.479828, 0.498906, 0.518689, 0.542837, 0.569897, 0.594521, 0.622366, 0.646490, 0.667560, 0.686973, 0.702714, 0.717622, 0.729236, 0.739860, 0.750768, 0.758319, 0.765074, 0.770359, 0.770707, 0.769495, 0.766022, 0.761513, 0.752741, 0.738840, 0.723449, 0.709735, 0.703030, 0.702794, 0.709080, 0.717578, 0.725382, 0.734667, 0.741320, 0.751297, 0.752299, 0.761343, 0.763459, 0.763298, 0.760975, 0.754705, 0.751044, 0.750451, 0.748182, 0.751586, 0.748238, 0.740174, 0.733060, 0.712562, 0.686935, 0.656657, 0.608348, 0.552433, 0.483553, 0.391830, 0.282894, 0.147553, -0.011250, -0.199208, -0.413659, -0.622283, -0.842367, -1.049708, -1.193449, -1.295719]",
7+
ACS-422,CC_tbins,"[0.585343, 1.178047, 2.490455, 3.543684, 4.466000, 5.653571, 6.494231, 7.500800, 8.507600, 9.512917, 10.507826, 11.494583, 12.505000, 13.506087, 14.490833, 15.501600, 16.519565, 17.492917, 18.483600, 19.496957, 20.499600, 21.524000, 22.493182, 23.493600, 24.491200, 25.491200, 26.488800, 27.511250, 28.471667, 29.512308, 30.480000, 31.478148, 32.480385, 33.486207, 34.512121]",
8+
ACS-422,CC_taarray,SheetRef:CC_taarray,
9+
ACS-422,CC_tcarray,SheetRef:CC_tcarray,

0 commit comments

Comments
 (0)