Added backgrounds to epochs only when a stimulus or background is missing

Author: cafarm

src/main/matlab/+symphonyui/+core/Controller.m

@@ -314,29 +314,31 @@ function processLoop(obj)
         function e = nextEpoch(obj)
             e = symphonyui.core.Epoch(class(obj.currentProtocol));
 
-            for i = 1:numel(obj.rig.devices)
-                d = obj.rig.devices{i};
-                if ~isempty(d.outputStreams)
+            obj.currentProtocol.prepareEpoch(e);
+            
+            devices = obj.rig.getOutputDevices();
+            for i = 1:numel(devices)
+                d = devices{i};
+                if ~e.hasStimulus(d) && ~e.hasBackground(d)
                     e.setBackground(d, d.background);
                 end
             end
-
-            obj.currentProtocol.prepareEpoch(e);
         end
 
-        function i = nextInterval(obj)
-            i = symphonyui.core.Epoch(class(obj.currentProtocol));
-            i.shouldBePersisted = false;
-            i.addKeyword(obj.INTERVAL_KEYWORD);
-
-            for k = 1:numel(obj.rig.devices)
-                d = obj.rig.devices{k};
-                if ~isempty(d.outputStreams)
-                    i.setBackground(d, d.background);
+        function e = nextInterval(obj)
+            e = symphonyui.core.Epoch(class(obj.currentProtocol));
+            e.shouldBePersisted = false;
+            e.addKeyword(obj.INTERVAL_KEYWORD);
+
+            obj.currentProtocol.prepareInterval(e);
+            
+            devices = obj.rig.getOutputDevices();
+            for i = 1:numel(devices)
+                d = devices{i};
+                if ~e.hasStimulus(d) && ~e.hasBackground(d)
+                    e.setBackground(d, d.background);
                 end
             end
-
-            obj.currentProtocol.prepareInterval(i);
         end
 
         function enqueueEpoch(obj, epoch)

src/main/matlab/+symphonyui/+core/Epoch.m

@@ -31,6 +31,10 @@ function addStimulus(obj, device, stimulus)
             cstim = obj.tryCoreWithReturn(@()obj.cobj.Stimuli.Item(device.cobj));
             s = symphonyui.core.Stimulus(cstim);
         end
+        
+        function tf = hasStimulus(obj, device)
+            tf = obj.tryCoreWithReturn(@()obj.cobj.Stimuli.ContainsKey(device.cobj));
+        end
 
         function addDirectCurrentStimulus(obj, device, measurement, duration, sampleRate)
             g = symphonyui.builtin.stimuli.DirectCurrentGenerator();
@@ -77,6 +81,10 @@ function addKeyword(obj, keyword)
         function setBackground(obj, device, background)
             obj.tryCore(@()obj.cobj.SetBackground(device.cobj, background.cobj, device.cobj.OutputSampleRate));
         end
+        
+        function tf = hasBackground(obj, device)
+            tf = obj.tryCoreWithReturn(@()obj.cobj.Backgrounds.ContainsKey(device.cobj));
+        end
 
         function tf = get.shouldWaitForTrigger(obj)
             tf = obj.cobj.ShouldWaitForTrigger;