o.group=‘A’

denispelli · May 10, 2020 · 52fc2da · 52fc2da
1 parent 642309c
commit 52fc2da
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/runCSFTest2.m b/runCSFTest2.m
@@ -28,9 +28,9 @@
 if IsWin
     o.useNative11Bit=false;
 end
-o.isTargetLocationUnpredictable=true;
 % o.useFractionOfScreenToDebug=0.3; % USE ONLY FOR DEBUGGING.
 % o.skipScreenCalibration=true; % USE ONLY FOR DEBUGGING.
+o.group='A'; % Include all conditions in a group, so they differ solely in their target.
 o.isTargetLocationMarked=true;
 o.useFixationGrid=false;
 o.useFixationDots=true;
@@ -252,7 +252,7 @@
 if false
     %% RUN EACH CONDITION WITH FOUR KINDS OF NOISE AND NO NOISE, INTERLEAVED.
     noiseTypeList={'gaussian' 'uniform' 'ternary' 'binary'};
-    maxNoiseSD=min([MaxNoiseSD('gaussian') MaxNoiseSD('uniform') MaxNoiseSD('ternary') MaxNoiseSD('binary') ]);
+    maxNoiseSD=MaxNoiseSD('gaussian',SignalNegPos(oo(1)));
     for block=1:length(ooo)
         oo=ooo{block};
         for oi=length(oo):-1:1
@@ -264,12 +264,12 @@
             end
             if oo(oi).targetHeightDeg>20
                 % Avoid raising threshold for 32 deg gabor too high.
-                noiseSD=MaxNoiseSD('gaussian')/2;
+                noiseSD=MaxNoiseSD('gaussian',SignalNegPos(o))/2;
             end
             oo(oi).noiseSD=noiseSD;
             oo(oi).noiseCheckDeg=oo(oi).targetHeightDeg/40;
             if oo(oi).targetHeightDeg<1
-                oo(oi).noiseSD=min([MaxNoiseSD('ternary') MaxNoiseSD('binary') ]);
+                oo(oi).noiseSD=min([MaxNoiseSD('ternary',SignalNegPos(oo(oi))) MaxNoiseSD('binary',SignalNegPos(oo(oi))) ]);
             end
         end
         [oo.noiseType]=deal(noiseTypeList{1});
@@ -293,7 +293,7 @@
 for block=1:length(ooo)
     oo=ooo{block};
     for oi=1:length(oo)
-        maxNoiseSD=MaxNoiseSD(oo(oi).noiseType);
+        maxNoiseSD=MaxNoiseSD(oo(oi).noiseType,SignalNegPos(oo(oi)));
         if ismember(oo(oi).targetKind,{'image'})
             maxNoiseSD=0.8*maxNoiseSD;
         end