In convertSBEcnvVar.m, SBE oxsol and oxsat are different from the act…

…ual o2 reading from the instrument. These parameters are not read any more. Also fix bug on supporting voltage outputs with non word characters in their label.
aodn · Aug 29, 2017 · 967bed0 · 967bed0
1 parent dc1a63b
commit 967bed0
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Parser/convertSBEcnvVar.m b/Parser/convertSBEcnvVar.m
@@ -142,7 +142,7 @@
 
     % oxygen (mg/l)
     % mg/l
-    case {'oxsolMg0x2FL', 'oxsatMg0x2FL', 'sbeox0Mg0x2FL'}
+    case 'sbeox0Mg0x2FL'
       name = 'DOXY';
       comment = '';
 
@@ -160,7 +160,7 @@
 
     % oxygen (umol/Kg)
     % umol/Kg
-    case {'oxsolMm0x2FKg', 'oxsatMm0x2FKg', 'sbeox0Mm0x2FKg', 'sbeopoxMm0x2FKg'}
+    case {'sbeox0Mm0x2FKg', 'sbeopoxMm0x2FKg'}
       name = 'DOX2';
       comment = '';
 
@@ -219,7 +219,7 @@
       origName = name;
       name = getVoltageName(origName, instHeader);
       if ~strcmpi(name, 'not_assigned')
-          name = ['volt_', getVoltageName(origName, instHeader)];
+          name = ['volt_', name];
           comment = getVoltageComment(origName, procHeader);
       else
           name = '';
@@ -328,6 +328,6 @@
         end
 end
 
-name = strrep(name, ' ', '_');
+name = regexprep(name, '[^a-zA-Z0-9]', '_'); % to make a valid var name for structure, only keep word characters
 
 end