From 9a0d83c2164749be844749d9cfea0d2287c95184 Mon Sep 17 00:00:00 2001
From: Hugo Oliveira <ocehugo@gmail.com>
Date: Mon, 27 Jul 2020 16:43:58 +1000
Subject: [PATCH] feat(bugfix): correct ADCP tilt flag broadcasting

When adding support to current meters in TiltQC,
I implemented wrong assignment logic to the flags
that broke ADCP processing (multi dimensional flags).

The problem was not picked up by adcp testing because
those tests were also wrongly based on current meter templates,
and the pitch/roll dimensions were wrongly assigned and bypassed
proper evaluations.
---
 AutomaticQC/imosTiltVelocitySetQC.m           |  5 ++--
 test/AutomaticQC/test_imosTiltVelocitySetQC.m | 24 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/AutomaticQC/imosTiltVelocitySetQC.m b/AutomaticQC/imosTiltVelocitySetQC.m
index bd4acd28f..c3b61875f 100644
--- a/AutomaticQC/imosTiltVelocitySetQC.m
+++ b/AutomaticQC/imosTiltVelocitySetQC.m
@@ -212,20 +212,19 @@
 
 % tilt test
 iPass = tilt < secondTiltThreshold;
-if ~isvector(flags)
+if isvector(flags)
   flags(iPass) = firstFlagThreshold;
 else
   flags(iPass,:) = firstFlagThreshold;
 end
 
 iPass = tilt < firstTiltThreshold;
-if ~isvector(flags)
+if isvector(flags)
   flags(iPass) = goodFlag;
 else
   flags(iPass,:) = goodFlag;
 end
 
-
 if idWcur
     sample_data.variables{idWcur}.flags = flags;
     varChecked = [varChecked, {'WCUR'}];
diff --git a/test/AutomaticQC/test_imosTiltVelocitySetQC.m b/test/AutomaticQC/test_imosTiltVelocitySetQC.m
index adfbc633c..9decbaf14 100644
--- a/test/AutomaticQC/test_imosTiltVelocitySetQC.m
+++ b/test/AutomaticQC/test_imosTiltVelocitySetQC.m
@@ -9,8 +9,8 @@
         function test_load_nortek_current_meter_values(~)
             ssize = [5, 1];
             sample_data = create_sample_data(ssize);
-            sample_data.variables{end}.data(:, :) = 0.; %roll
-            sample_data.variables{end - 1}.data(:, :) = 90.; %pitch
+            sample_data.variables{end}.data = zeros(5,1); %roll
+            sample_data.variables{end - 1}.data = zeros(5,1)+90; %pitch
             sample_data.instrument = 'Nortek Aquadopp Current Meter';
             e_logentry = 'firstTiltThreshold=30, secondTiltThreshold=45';
             v = sample_data.variables{1}.data * 0;
@@ -38,13 +38,17 @@ function test_load_nortek_current_meter_values(~)
         function test_load_nortek_adcp(~)
             ssize = [100, 6];
             sample_data = create_sample_data(ssize);
-            sample_data.variables{end}.data(:, :) = 0.; %roll
-            sample_data.variables{end - 1}.data(:, :) = 90.; %pitch
+            sample_data.variables{end}.data = zeros(100,1); %roll
+            sample_data.variables{end - 1}.data = zeros(100,1)+90.; %pitch
+            sample_data.variables{end - 1}.data([1,99]) = 0;
+            sample_data.variables{end - 1}.data([2,98]) = 21;
             sample_data.instrument = 'nortek';
             e_logentry = 'firstTiltThreshold=20, secondTiltThreshold=30';
             v = sample_data.variables{1}.data * 0;
 
             v3 = v + 3;
+            v3([1,99],:) = 1;
+            v3([2,98],:) = 2;
             [pdata, ~, logentry] = imosTiltVelocitySetQC(sample_data, true);
             assert(isequal(pdata.variables{1}.flags, v3))
             assert(isequal(e_logentry, logentry))
@@ -67,8 +71,8 @@ function test_load_nortek_adcp(~)
         function test_load_sentinel(~)
             ssize = [100, 33];
             sample_data = create_sample_data(ssize);
-            sample_data.variables{end}.data(:, :) = 0.; %roll
-            sample_data.variables{end - 1}.data(:, :) = 90.; %pitch
+            sample_data.variables{end}.data = zeros(100,1); %roll
+            sample_data.variables{end - 1}.data = zeros(100,1)+90.; %pitch
             sample_data.instrument = 'ADCP sentinel abcdefg';
             e_logentry = 'firstTiltThreshold=15, secondTiltThreshold=22';
             v = sample_data.variables{1}.data(:, :) * 0;
@@ -97,8 +101,8 @@ function test_below_secondThreshold_ui(testCase)
             if testCase.testUI
                 ssize = [100, 33];
                 sample_data = create_sample_data(ssize);
-                sample_data.variables{end}.data(:, :) = 0.; %roll
-                sample_data.variables{end - 1}.data(:, :) = 90.; %pitch
+                sample_data.variables{end}.data = zeros(100,1); %roll
+                sample_data.variables{end - 1}.data = zeros(100,1) +90; %pitch
                 sample_data.instrument = 'ADCP sentinel abcdefg';
                 e_logentry = 'firstTiltThreshold=15, secondTiltThreshold=91';
                 disp('Set firstFlagThreshold to be 4 and SecondTiltThreshold to be 91 for this test to pass');
@@ -116,8 +120,8 @@ function test_above_secondThreshold_ui(testCase)
             if testCase.testUI
                 ssize = [100, 33];
                 sample_data = create_sample_data(ssize);
-                sample_data.variables{end}.data(:, :) = 0.; %roll
-                sample_data.variables{end - 1}.data(:, :) = 81.; %pitch
+                sample_data.variables{end}.data = zeros(100,1); %roll
+                sample_data.variables{end - 1}.data = zeros(100,1)+81.; %pitch
                 sample_data.instrument = 'ADCP sentinel abcdefg';
                 e_logentry = 'firstTiltThreshold=15, secondTiltThreshold=80';
                 disp('Set SecondTiltThreshold to be 80 for this test to pass');