Update overview

computational-psychology · Mar 23, 2023 · cc8f0a6 · cc8f0a6
1 parent 27d10d0
commit cc8f0a6
Showing 1 changed file with 34 additions and 14 deletions.
diff --git a/stimupy/stimuli/waves.py b/stimupy/stimuli/waves.py
@@ -1425,28 +1425,48 @@ def overview(**kwargs):
         "period": "ignore",
         "phase_shift": 0,
         "round_phase_width": False,
-        "target_indices": (0, 5),
+    }
+
+    grating_params2 = {
+        "period": "ignore",
+        "phase_shift": 0,
+        "round_phase_width": False,
+        "target_indices": (2, 5),
     }
 
     # fmt: off
     stimuli = {
-        "sine wave - horizontal": sine_linear(**default_params, **grating_params, bar_width=1, rotation=0),
-        "sine wave - vertical": sine_linear(**default_params, **grating_params, bar_width=1, rotation=90),
-        "sine wave - oblique": sine_linear(**default_params, **grating_params, bar_width=1, rotation=45),
-        "sine wave - radial": sine_radial(**default_params, **grating_params, ring_width=1, clip=True),
-        "sine wave - rectilinear": sine_rectilinear(**default_params, **grating_params, frame_width=1, clip=True),
-        "sine wave - angular": sine_angular(**default_params, **grating_params, segment_width=10),
+        "sine_wave_linear": sine_linear(**default_params, **grating_params, bar_width=1, rotation=45),
+        "sine_wave_radial": sine_radial(**default_params, **grating_params, ring_width=1),
+        "sine_wave_rectilinear": sine_rectilinear(**default_params, **grating_params, frame_width=1),
+        "sine_wave_angular": sine_angular(**default_params, **grating_params, segment_width=10),
+
+
+        "square_wave_linear": square_linear(**default_params, **grating_params, bar_width=1, rotation=45),
+        "square_wave_radial": square_radial(**default_params, **grating_params, ring_width=1),
+        "square_wave_rectilinear": square_rectilinear(**default_params, **grating_params, frame_width=1, clip=True),
+        "square_wave_angular": square_angular(**default_params, **grating_params, segment_width=10),
+
+        "staircase_linear": staircase_linear(**default_params, **grating_params, frequency=0.4),
+        "staircase_radial": staircase_radial(**default_params, **grating_params, frequency=0.4),
+        "staircase_rectilinear": staircase_rectilinear(**default_params, **grating_params, frequency=0.4),
+        "staircase_angular": staircase_angular(**default_params, **grating_params, frequency=0.4),
 
+        "sine_wave_linear_with_targets": sine_linear(**default_params, **grating_params2, bar_width=1, rotation=45),
+        "sine_wave_radial_with_targets": sine_radial(**default_params, **grating_params2, ring_width=1),
+        "sine_wave_rectilinear_with_targets": sine_rectilinear(**default_params, **grating_params2, frame_width=1),
+        "sine_wave_angular_with_targets": sine_angular(**default_params, **grating_params2, segment_width=10),
 
-        "square wave - horizontal": square_linear(**default_params, **grating_params, bar_width=1, rotation=0),
-        "square wave - vertical": square_linear(**default_params, **grating_params, bar_width=1, rotation=90),
-        "square wave - oblique": square_linear(**default_params, **grating_params, bar_width=1, rotation=45),
-        "square wave - radial": square_radial(**default_params, **grating_params, ring_width=1, clip=True),
-        "square wave - rectilinear": square_rectilinear(**default_params, **grating_params, frame_width=1, clip=True),
-        "square wave - angular": square_angular(**default_params, **grating_params, segment_width=10),
 
+        "square_wave_linear_with_targets": square_linear(**default_params, **grating_params2, bar_width=1, rotation=45),
+        "square_wave_radial_with_targets": square_radial(**default_params, **grating_params2, ring_width=1),
+        "square_wave_rectilinear_with_targets": square_rectilinear(**default_params, **grating_params2, frame_width=1, clip=True),
+        "square_wave_angular_with_targets": square_angular(**default_params, **grating_params2, segment_width=10),
 
-        "square wave - multiple intensitites": square_linear(**default_params, **grating_params, bar_width=3.5, rotation=0, intensity_bars=(0, 0.25, 0.75)),
+        "staircase_linear_with_targets": staircase_linear(**default_params, **grating_params2, frequency=0.4),
+        "staircase_radial_with_targets": staircase_radial(**default_params, **grating_params2, frequency=0.4),
+        "staircase_rectilinear_with_targets": staircase_rectilinear(**default_params, **grating_params2, frequency=0.4),
+        "staircase_angular_with_targets": staircase_angular(**default_params, **grating_params2, frequency=0.4),
     }
     # fmt: on