Merge pull request #871 from lstoltz/master

adding CSPP cal coefficient CSVs and updated FLORT matlab processor
oceanobservatories · Nov 15, 2021 · ef6b8be · ef6b8be
2 parents 08c9593 + bc98d9a
commit ef6b8be
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 2 deletions.
diff --git a/calibration/DOSTAJ/CGINS-DOSTAJ-00308__20211027.csv b/calibration/DOSTAJ/CGINS-DOSTAJ-00308__20211027.csv
@@ -0,0 +1,3 @@
+serial,name,value,notes
+308,CC_conc_coef,"[-2.136486E+00, 1.136215E+00]",date in filename comes from factory calibration certificate
+308,CC_csv,"[2.909277E-03, 1.214303E-04, 2.518067E-06, 2.311124E+02, -3.406723E-01, -5.473330E+01, 4.575767E+00]",
diff --git a/calibration/DOSTAJ/CGINS-DOSTAJ-00672__20211027.csv b/calibration/DOSTAJ/CGINS-DOSTAJ-00672__20211027.csv
@@ -0,0 +1,3 @@
+serial,name,value,notes
+672,CC_conc_coef,"[-2.763658E-01, 1.063296E+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]",
diff --git a/calibration/FLORTJ/CGINS-FLORTJ-01207__20211020.csv b/calibration/FLORTJ/CGINS-FLORTJ-01207__20211020.csv
@@ -0,0 +1,11 @@
+serial,name,value,notes
+BBFL2W-1207,CC_dark_counts_cdom,48,date in filename comes from dev file
+BBFL2W-1207,CC_scale_factor_cdom,9.970E-02,
+BBFL2W-1207,CC_dark_counts_chlorophyll_a,56,
+BBFL2W-1207,CC_scale_factor_chlorophyll_a,1.130E-02,
+BBFL2W-1207,CC_dark_counts_volume_scatter,53,
+BBFL2W-1207,CC_scale_factor_volume_scatter,3.560E-06,
+BBFL2W-1207,CC_depolarization_ratio,0.039,Constant
+BBFL2W-1207,CC_measurement_wavelength,700,[nm]; Constant
+BBFL2W-1207,CC_scattering_angle,124,[degrees]; Constant
+BBFL2W-1207,CC_angular_resolution,1.076,Erroneously named constant; this coefficient scales the particulate scattering at 124 degrees to total backscatter from particles
diff --git a/calibration/SPKIRJ/CGINS-SPKIRJ-00264__20211011.csv b/calibration/SPKIRJ/CGINS-SPKIRJ-00264__20211011.csv
@@ -0,0 +1,4 @@
+serial,name,value,notes
+264,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 DI7264E.cal
+264,CC_offset,"[2147151414.9, 2147259077.3, 2147775097.9, 2147196481.0, 2147148857.9, 2147317908.6, 2147628728.0]",
+264,CC_scale,"[2.23105984749e-007, 2.10563213804e-007, 2.11880027498e-007, 2.16673037046e-007, 2.13808751664e-007, 2.00614802269e-007, 2.12784737709e-007]",
diff --git a/calibration/SPKIRJ/CGINS-SPKIRJ-00281__20211011.csv b/calibration/SPKIRJ/CGINS-SPKIRJ-00281__20211011.csv
@@ -0,0 +1,4 @@
+serial,name,value,notes
+281,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 DI7281D.cal
+281,CC_offset,"[2147376528.1, 2147350092.5, 2146962451.8, 2147737797.2, 2147609171.6, 2147607769.5, 2147998369.8]",
+281,CC_scale,"[2.21230861929e-007, 1.88334203003e-007, 2.00779997157e-007, 2.06293604225e-007, 2.19344390172e-007, 2.04800298396e-007, 2.1415911836e-007]",
diff --git a/tools/matlab/Endurance_cal_scripts/flort/write_flort_dev_to_csv.m b/tools/matlab/Endurance_cal_scripts/flort/write_flort_dev_to_csv.m
@@ -68,9 +68,9 @@
 idx = find(~cellfun(@isempty, strfind(C{2},'BBFL2W-')), 1);
 if ~isempty(idx)
     idx_ch = strfind(C{2}{idx}, 'BBFL2W-');
-    sernum = str2double(C{2}{idx}(idx_ch+7:end));
+    sernum = str2double(C2}{idx}(idx_ch+7:end));
 else
-    idx = find(~cellfun(@isempty, strfind(C{2},'BBFL2-')), 1);
+    idx = find(~cellfun(@isempty, strfind(C{1},'BBFL2-')), 1);
     if ~isempty(idx)
         idx_ch = strfind(C{2}{idx}, 'BBFL2-');
         sernum = str2double(C{2}{idx}(idx_ch+6:end));