diff --git a/AutomaticQC/imosRateOfChangeQC.m b/AutomaticQC/imosRateOfChangeQC.m index 06765cc16..12d7e5540 100644 --- a/AutomaticQC/imosRateOfChangeQC.m +++ b/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); diff --git a/AutomaticQC/qcFilterPrep.m b/AutomaticQC/qcFilterPrep.m index 2f5cacd8b..a4e8f198d 100644 --- a/AutomaticQC/qcFilterPrep.m +++ b/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 diff --git a/Parser/netcdfParse.m b/Parser/netcdfParse.m index 80ee30af7..8660d4b28 100644 --- a/Parser/netcdfParse.m +++ b/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 = ''; diff --git a/Parser/readParadoppBinary.m b/Parser/readParadoppBinary.m index 397e95508..a1de63dc0 100644 --- a/Parser/readParadoppBinary.m +++ b/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 diff --git a/imosToolbox.m b/imosToolbox.m index c1d8e7f24..3a9fd5dc4 100644 --- a/imosToolbox.m +++ b/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{:}); diff --git a/imosToolbox_Linux64.bin b/imosToolbox_Linux64.bin index a9daf7cd8..077c9c38c 100755 Binary files a/imosToolbox_Linux64.bin and b/imosToolbox_Linux64.bin differ diff --git a/imosToolbox_Win32.exe b/imosToolbox_Win32.exe index e9345fa21..4ce5a1695 100644 Binary files a/imosToolbox_Win32.exe and b/imosToolbox_Win32.exe differ diff --git a/imosToolbox_Win64.exe b/imosToolbox_Win64.exe index 9e2381b95..c5a0072c0 100644 Binary files a/imosToolbox_Win64.exe and b/imosToolbox_Win64.exe differ