Merge pull request #362 from aodn/2.5.13

2.5.13

AutomaticQC/imosRateOfChangeQC.m

@@ -177,7 +177,7 @@
             % of 1 or 2 gradients
             threshold(2:end-1) = 2*threshold(2:end-1);
         catch
-            error(['Invalid threshold expression in imosRateOfChangeQC.txt for ' param]);
+            error(['Invalid threshold expression in imosRateOfChangeQC.txt for ' paramName]);
         end
 
         iGoodGrad = false(lenDataTested, 1);

AutomaticQC/qcFilterPrep.m

@@ -44,11 +44,10 @@
 % ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
 % POSSIBILITY OF SUCH DAMAGE.
 %
-fun = str2func([filtername 'Prep']);
-fun2 = functions(fun);
-ok = size(fun2.file, 2) > 0;
 
-if ok
+fun = [filtername 'Prep'];
+if exist(fun, 'file') % MATLAB function
+    fun = str2func(fun);
     type{1} = 'dimensions';
     type{2} = 'variables';
     qcPrep=struct;
@@ -57,7 +56,10 @@
             % check for previously computed stddev
             if isfield(sam.meta, 'qcPrep')
                 if isfield(sam.meta.qcPrep, filtername)
-                    continue;
+                    if isfield(sam.meta.qcPrep.(filtername), type{m})
+                        qcPrep.(type{m}){k} = sam.meta.qcPrep.(filtername).(type{m}){k};
+                        continue;
+                    end
                 end
             end
 

Parser/netcdfParse.m

@@ -184,6 +184,8 @@
       sample_data.meta.level = imosFileVersion(sample_data.file_version, 'index');
   end
 
+  sample_data.toolbox_input_file              = filename;
+
   [~, sample_data.meta.file_name, ext]        = fileparts(filename);
   sample_data.meta.file_name                  = [sample_data.meta.file_name, ext];
   sample_data.meta.site_id                    = '';

Parser/readParadoppBinary.m

@@ -175,6 +175,7 @@
     fprintf('%s\n', ['Warning : ' filename ' bad sync (idx '...
         num2str(idx) ', val ' num2str(data(idx)) ')']);
     fprintf('%s\n', ['Sect Type: ' num2str(sectType)]);
+    off = 1; % continue to the next byte
     return;
 end
 

imosToolbox.m

@@ -73,7 +73,7 @@ function imosToolbox(auto, varargin)
 end
 
 % Set current toolbox version
-toolboxVersion = ['2.5.12 - ' computer];
+toolboxVersion = ['2.5.13 - ' computer];
 
 switch auto  
   case 'auto', autoIMOSToolbox(toolboxVersion, varargin{:});