updated paper scripts to pass tests again (exception corrugated mondr…

…ians)
computational-psychology · Mar 16, 2023 · 3e3fa64 · 3e3fa64
1 parent f387bb9
commit 3e3fa64
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 3 deletions.
diff --git a/stimupy/papers/RHS2007.py b/stimupy/papers/RHS2007.py
@@ -1585,7 +1585,7 @@ def todorovic_benary1_2(ppd=PPD, pad=True):
         "L_width": 2.5,
         "target_size": 2.5,
         "target_type": ("t", "t"),
-        "target_orientation": (0.0, 180.0),
+        "target_rotation": (0.0, 180.0),
         "target_x": (2.5, 26.0),
         "target_y": (4.0, 6.5),
         "intensity_background": v3,
@@ -1643,7 +1643,7 @@ def todorovic_benary3_4(ppd=PPD, pad=True):
         "L_width": 2.5,
         "target_size": 2.5,
         "target_type": ("t", "t"),
-        "target_orientation": (45.0, 225.0),
+        "target_rotation": (45.0, 225.0),
         "target_x": (9.5, 18.0),
         "target_y": (6.5, 6.5 - np.sqrt(12.5) / 2.0 + 1 / ppd),
         "intensity_background": v3,
@@ -1701,7 +1701,7 @@ def todorovic_benary1_2_3_4(ppd=PPD, pad=True):
         "L_width": 2.5,
         "target_size": 2.5,
         "target_type": ("t", "t", "t", "t"),
-        "target_orientation": (0.0, 45.0, 225.0, 180.0),
+        "target_rotation": (0.0, 45.0, 225.0, 180.0),
         "target_x": (2.5, 9.5, 18.0, 26.0),
         "target_y": (4.0, 6.5, 6.5 - np.sqrt(12.5) / 2.0 + 1 / ppd, 6.5),
         "intensity_background": v3,
@@ -1756,6 +1756,7 @@ def bullseye_thin(ppd=PPD, pad=True):
         "ppd": ppd,
         "radii": radii,
         "intensity_target": v2,
+        "origin": "mean",
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1814,6 +1815,7 @@ def bullseye_thick(ppd=PPD, pad=True):
         "ppd": ppd,
         "radii": radii,
         "intensity_target": v2,
+        "origin": "mean",
     }
 
     stim1 = illusions.frames.bullseye_generalized(

diff --git a/stimupy/papers/bindmann2004.py b/stimupy/papers/bindmann2004.py
@@ -83,6 +83,7 @@
 INTENSITY_BACKGROUND = 60
 PAD1 = ((0, 1.2), (0, 2.7))
 PAD2 = ((1.2, 0), (2.7, 0))
+ORIGIN = "mean"
 
 
 def gen_all(ppd=PPD, skip=False):
@@ -163,6 +164,7 @@ def bullseye_thin_gw45_gb31(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -224,6 +226,7 @@ def bullseye_thin_gw45_gb38(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -285,6 +288,7 @@ def bullseye_thin_gw45_gb45(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -346,6 +350,7 @@ def bullseye_thin_gw45_gb52(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -407,6 +412,7 @@ def bullseye_thin_gw45_gb59(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -468,6 +474,7 @@ def bullseye_thin_gw60_gb46(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -529,6 +536,7 @@ def bullseye_thin_gw60_gb53(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -590,6 +598,7 @@ def bullseye_thin_gw60_gb60(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -651,6 +660,7 @@ def bullseye_thin_gw60_gb67(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -712,6 +722,7 @@ def bullseye_thin_gw60_gb74(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -773,6 +784,7 @@ def bullseye_thin_gw75_gb61(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -834,6 +846,7 @@ def bullseye_thin_gw75_gb68(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -895,6 +908,7 @@ def bullseye_thin_gw75_gb75(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -956,6 +970,7 @@ def bullseye_thin_gw75_gb82(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1017,6 +1032,7 @@ def bullseye_thin_gw75_gb89(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1078,6 +1094,7 @@ def bullseye_thick_gw45_gb31(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1139,6 +1156,7 @@ def bullseye_thick_gw45_gb38(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1200,6 +1218,7 @@ def bullseye_thick_gw45_gb45(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1261,6 +1280,7 @@ def bullseye_thick_gw45_gb52(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1322,6 +1342,7 @@ def bullseye_thick_gw45_gb59(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1383,6 +1404,7 @@ def bullseye_thick_gw60_gb46(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1444,6 +1466,7 @@ def bullseye_thick_gw60_gb53(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1505,6 +1528,7 @@ def bullseye_thick_gw60_gb60(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1566,6 +1590,7 @@ def bullseye_thick_gw60_gb67(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1627,6 +1652,7 @@ def bullseye_thick_gw60_gb74(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1688,6 +1714,7 @@ def bullseye_thick_gw75_gb61(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1749,6 +1776,7 @@ def bullseye_thick_gw75_gb68(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1810,6 +1838,7 @@ def bullseye_thick_gw75_gb75(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1871,6 +1900,7 @@ def bullseye_thick_gw75_gb82(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(
@@ -1932,6 +1962,7 @@ def bullseye_thick_gw75_gb89(ppd=PPD):
         "shape": (target_size_half + band_width * 4) * 2 * ppd - 1,
         "ppd": ppd,
         "radii": radii,
+        "origin": ORIGIN,
     }
 
     stim1 = illusions.frames.bullseye_generalized(

diff --git a/stimupy/papers/domijan2015.py b/stimupy/papers/domijan2015.py
@@ -425,6 +425,7 @@ def rings(visual_size=VSIZES["rings"], ppd=PPD, shape=SHAPES["rings"]):
         "visual_size": radii.max() * 2,
         "ppd": ppd,
         "radii": radii,
+        "origin": "mean",
     }
 
     stim1 = illusions.frames.rings_generalized(
@@ -490,6 +491,7 @@ def bullseye(visual_size=VSIZES["bullseye"], ppd=PPD, shape=SHAPES["bullseye"]):
         "visual_size": radii.max() * 2,
         "ppd": ppd,
         "radii": radii,
+        "origin": "mean",
     }
 
     stim1 = illusions.frames.bullseye_generalized(