Circular White's uses (is) waves.square_radial

computational-psychology · Mar 21, 2023 · 2aa7623 · 2aa7623
1 parent 2dd9297
commit 2aa7623
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/stimupy/papers/RHS2007.py b/stimupy/papers/RHS2007.py
@@ -716,17 +716,18 @@ def WE_circular1(ppd=PPD, pad=True):
         "target_indices": 4,
         "intensity_background": v2,
         "intensity_target": v2,
+        "clip": True,
     }
 
     stim1 = stimupy.whites.circular(
         visual_size=(height, width),
-        intensity_rings=(v1, v3),
+        intensity_rings=(v3, v1),
         **params,
     )
 
     stim2 = stimupy.whites.circular(
         visual_size=(height, width),
-        intensity_rings=(v3, v1),
+        intensity_rings=(v1, v3),
         **params,
     )
     stim = stack_dicts(stim1, stim2)
@@ -776,17 +777,18 @@ def WE_circular05(ppd=PPD, pad=True):
         "target_indices": 10,
         "intensity_background": v2,
         "intensity_target": v2,
+        "clip": True,
     }
 
     stim1 = stimupy.whites.circular(
         visual_size=(height, width),
-        intensity_rings=(v1, v3),
+        intensity_rings=(v3, v1),
         **params,
     )
 
     stim2 = stimupy.whites.circular(
         visual_size=(height, width),
-        intensity_rings=(v3, v1),
+        intensity_rings=(v1, v3),
         **params,
     )
     stim = stack_dicts(stim1, stim2)
@@ -836,17 +838,18 @@ def WE_circular025(ppd=PPD, pad=True):
         "target_indices": 22,
         "intensity_background": v2,
         "intensity_target": v2,
+        "clip": True,
     }
 
     stim1 = stimupy.whites.circular(
         visual_size=(height, width),
-        intensity_rings=(v1, v3),
+        intensity_rings=(v3, v1),
         **params,
     )
 
     stim2 = stimupy.whites.circular(
         visual_size=(height, width),
-        intensity_rings=(v3, v1),
+        intensity_rings=(v1, v3),
         **params,
     )
     stim = stack_dicts(stim1, stim2)

diff --git a/stimupy/whites.py b/stimupy/whites.py
@@ -6,8 +6,8 @@
 from stimupy.components import image_base
 from stimupy.gratings import squarewave
 from stimupy.illusions.angulars import pinwheel as radial
-from stimupy.illusions.circulars import rings as circular
 from stimupy.utils import resolution
+from stimupy.waves import square_radial as circular
 from stimupy.wedding_cakes import wedding_cake
 
 __all__ = [