Skip to content

Commit

Permalink
Merge pull request #1172 from wruef/master
Browse files Browse the repository at this point in the history
adding new CTDBPN cal files
  • Loading branch information
jdduprey authored Sep 3, 2024
2 parents f79a585 + 3c5bf59 commit 3b47bfc
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 2 deletions.
4 changes: 2 additions & 2 deletions bulk/sensor_bulk_load-AssetRecord.csv
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ ATAPL-68073-00002,ATAPL-68073-00002,Sensor,0,ADCP Velocity Profiler (short range
ATAPL-68073-00003,ATAPL-68073-00003,Sensor,0,ADCP Velocity Profiler (short range): ADCPT Series E,ADCP E-WHM150-6000m (ADCPT-E),Teledyne RDI,WHM150-6000,19224,,20130201,53533,,University of Washington
ATAPL-68073-00004,ATAPL-68073-00004,Sensor,0,ADCP Velocity Profiler (short range): ADCPT Series E,ADCP E-WHM150-6000m (ADCPT-E),Teledyne RDI,WHM150-6000,23442,,20150529,56791,,University of Washington
ATAPL-68073-00005,ATAPL-68073-00005,Sensor,0,ADCP Velocity Profiler (short range): ADCPT Series E,ADCP E-WHM150-6000m (ADCPT-E),Teledyne RDI,WHM150-6000,23443,,20150529,56791,,University of Washington
ATAPL-69821-10004,ATAPL-69821-10004,Sensor,0,CTD Pumped: CTDBP Series N,CTDBP SERIES N (N-16PLUSV2),Sea-Bird Electronics,SBE 16plus V2,16-7248,,20130115,16-50634,,
ATAPL-69821-10005,ATAPL-69821-10005,Sensor,0,CTD Pumped: CTDBP Series N,CTDBP SERIES N (N-16PLUSV2),Sea-Bird Electronics,SBE 16plus V2,16-7248,,20130115,16-50635,,
ATAPL-69821-10004,ATAPL-69821-10004,Sensor,0,CTD Pumped: CTDBP Series N,CTDBP SERIES N (N-16PLUSV2),Sea-Bird Electronics,SBE 16plus V2,16-50634,,202406,,,
ATAPL-69821-10005,ATAPL-69821-10005,Sensor,0,CTD Pumped: CTDBP Series N,CTDBP SERIES N (N-16PLUSV2),Sea-Bird Electronics,SBE 16plus V2,16-50635,,202406,,,
ATAPL-69923-00001,ATAPL-69923-00001,Sensor,0,"Tidal Seafloor Pressure (Tsunameter 2,000 psia): PREST Series B","Seabird SBE54 Tsunameter 2,000 psia (1300 meter) (PREST)",Sea-Bird Electronics,SBE 54,5471540-0031,,20130102,15900,,University of Washington
ATAPL-69923-00002,ATAPL-69923-00002,Sensor,0,"Tidal Seafloor Pressure (Tsunameter 2,000 psia): PREST Series B",PREST-B,Sea-Bird Electronics,SBE 54,5471540-0047,,,,,University of Washington
ATAPL-69943-00001,ATAPL-69943-00001,Sensor,0,Spectrophotometer: OPTAA Series C,AC-S Deep (optical attenuation and absorption instrument with biofouling/pump) per OPTAA delivery order,WET Labs,AC-S Deep,ACS-141,,20130726,41710,,University of Washington
Expand Down
21 changes: 21 additions & 0 deletions calibration/CTDBPN/ATAPL-69821-10004__20240616.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
serial,name,value,notes
16-50634,CC_C1,1.022921e+003,
16-50634,CC_C2,-3.794850e-003,
16-50634,CC_C3,-1.120880e-004,
16-50634,CC_D1,4.182800e-002,
16-50634,CC_D2,0.000000e+000,
16-50634,CC_T1,2.759327e+001,
16-50634,CC_T2,-8.116990e-005,
16-50634,CC_T3,9.685380e-007,
16-50634,CC_T4,1.561150e-009,
16-50634,CC_T5,0.000000e+000,
16-50634,CC_a0,1.23112153e-003,
16-50634,CC_a1,2.76372092e-004,
16-50634,CC_a2,-8.68255309e-007,
16-50634,CC_a3,1.72934714e-007,
16-50634,CC_cpcor,-9.57000000e-008,
16-50634,CC_ctcor,3.2500e-006,
16-50634,CC_g,-1.00315147e+000,
16-50634,CC_h,1.50526229e-001,
16-50634,CC_i,-3.52696231e-004,
16-50634,CC_j,4.85020496e-005,
21 changes: 21 additions & 0 deletions calibration/CTDBPN/ATAPL-69821-10005__20240609.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
serial,name,value,notes
16-50635,CC_C1,1.010163e+003,
16-50635,CC_C2,-2.462560e-004,
16-50635,CC_C3,-9.255480e-005,
16-50635,CC_D1,3.162400e-002,
16-50635,CC_D2,0.000000e+000,
16-50635,CC_T1,2.776884e+001,
16-50635,CC_T2,-8.618810e-005,
16-50635,CC_T3,1.025970e-006,
16-50635,CC_T4,1.680000e-009,
16-50635,CC_T5,0.000000e+000,
16-50635,CC_a0,1.21527761e-003,
16-50635,CC_a1,2.79521508e-004,
16-50635,CC_a2,-1.18170916e-006,
16-50635,CC_a3,1.82950661e-007,
16-50635,CC_cpcor,-9.57000000e-008,
16-50635,CC_ctcor,3.2500e-006,
16-50635,CC_g,-1.00584897e+000,
16-50635,CC_h,1.41701616e-001,
16-50635,CC_i,-5.28702828e-005,
16-50635,CC_j,2.63405347e-005,
2 changes: 2 additions & 0 deletions tools/cal_scripts/RCA_sensorMap.csv
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ ADCPFP,PIRSN-PADCPA-00001,1023
CTDBPN,ATOSU-69827-00001,16-7230
CTDBPN,ATOSU-69827-00002,16-50114
CTDBPN,ATOSU-69827-00003,16-7248
CTDBPN,ATAPL-69821-10004,16-50634
CTDBPN,ATAPL-69821-10005,16-50635
CTDBPO,ATOSU-69828-00001,16-7231
CTDBPO,ATOSU-69828-00002,16-7249
CTDBPO,ATOSU-69828-00003,16-50117
Expand Down
2 changes: 2 additions & 0 deletions tools/cal_scripts/ctd_cal_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,8 @@ def write_cal_info(self):
return
elif self.asset_tracking_number.find('69827') != -1:
inst_type = 'CTDBPN'
elif self.asset_tracking_number.find('69821') != -1:
inst_type = 'CTDBPN'
elif self.asset_tracking_number.find('69828') != -1:
inst_type = 'CTDBPO'
# Writes the calibration information to a comma-separated value file
Expand Down

0 comments on commit 3b47bfc

Please sign in to comment.