docs(demos): update two_sided demos

docs/reference/demos/stimuli/bullseyes.md

@@ -264,7 +264,7 @@ def show_two_sided_bullseye(
             ppd=ppd,
             frequency=frequency,
             phase_shift=phase_shift,
-            intensity_rings=(int1, int2),
+            intensity_rings=((int1, int2),(int2, int1)),
             intensity_background=intensity_background,
             origin=origin,
             intensity_target=(intensity_target_l, intensity_target_r),
@@ -537,7 +537,7 @@ def show_rectangular_two_sided(
             ppd=ppd,
             frequency=frequency,
             phase_shift=phase_shift,
-            intensity_frames=(int1, int2),
+            intensity_frames=((int1, int2),(int2, int1)),
             intensity_background=intensity_background,
             intensity_target=(intensity_target_l, intensity_target_r),
             rotation=rotation,

docs/reference/demos/stimuli/delboeufs.md

@@ -121,8 +121,8 @@ w_height = iw.IntSlider(value=10, min=1, max=20, description="height [deg]")
 w_width = iw.IntSlider(value=20, min=1, max=40, description="width [deg]")
 w_ppd = iw.IntSlider(value=20, min=1, max=40, description="ppd")
 
-w_outr1 = iw.FloatSlider(value=4, min=0.5, max=8, description="outer radius1 [deg]")
-w_outr2 = iw.FloatSlider(value=2.5, min=0.5, max=8, description="outer radius2 [deg]")
+w_out_rad_l = iw.FloatSlider(value=4, min=0.5, max=8, description="outer radius1 [deg]")
+w_out_rad_r = iw.FloatSlider(value=2.5, min=0.5, max=8, description="outer radius2 [deg]")
 w_outw = iw.FloatSlider(value=0, min=0, max=2, description="outer line width [deg]")
 
 w_int1 = iw.FloatSlider(value=0, min=0, max=1, description="int line")
@@ -136,7 +136,7 @@ w_mask = iw.Dropdown(value=None, options=[None, 'target_mask', 'line_mask'], des
 
 # Layout
 b_im_size = iw.HBox([w_height, w_width, w_ppd])
-b_geometry = iw.HBox([w_outr1, w_outr2, w_outw])
+b_geometry = iw.HBox([w_out_rad_l, w_out_rad_r, w_outw])
 b_intensities = iw.HBox([w_int1, w_int_back])
 b_target = iw.HBox([w_tr, w_tint_l, w_tint_r])
 b_add = iw.HBox([w_mask])
@@ -161,7 +161,7 @@ def show_two_sided(
         stim = two_sided(
             visual_size=(height, width),
             ppd=ppd,
-            outer_radii=(outer_radius1, outer_radius2),
+            outer_radius=(outer_radius1, outer_radius2),
             outer_line_width=outer_line_width,
             target_radius=target_radius,
             intensity_outer_line=intensity_outer_line,
@@ -180,8 +180,8 @@ out = iw.interactive_output(
         "width": w_width,
         "ppd": w_ppd,
         "add_mask": w_mask,
-        "outer_radius1": w_outr1,
-        "outer_radius2": w_outr2,
+        "outer_radius_l": w_out_rad_l,
+        "outer_radius_r": w_out_rad_r,
         "outer_line_width": w_outw,
         "target_radius": w_tr,
         "intensity_target_l": w_tint_l,

docs/reference/demos/stimuli/rings.md

@@ -233,6 +233,7 @@ w_int2 = iw.FloatSlider(value=0, min=0, max=1, description="int-ring2")
 w_int_back = iw.FloatSlider(value=0.5, min=0, max=1, description="int background")
 
 w_ori = iw.Dropdown(value="mean", options=['mean', 'corner', 'center'], description="origin")
+w_clip = iw.ToggleButton(value=False, disabled=False, description="clip")
 w_mask = iw.Dropdown(value=None, options=[None, 'target_mask', 'ring_mask'], description="add mask")
 
 w_tidx = iw.IntSlider(value=2, min=0, max=10, description="target idx")
@@ -244,7 +245,7 @@ w_tint_r = iw.FloatSlider(value=0.5, min=0, max=1, description="right target int
 b_im_size = iw.HBox([w_height, w_width, w_ppd])
 b_geometry = iw.HBox([w_freq, w_phase])
 b_intensities = iw.HBox([w_int1, w_int2, w_int_back])
-b_add = iw.HBox([w_ori, w_mask])
+b_add = iw.HBox([w_ori, w_mask, w_clip])
 b_target = iw.HBox([w_tidx, w_tint_l, w_tint_r])
 ui = iw.VBox([b_im_size, b_geometry, b_intensities, b_target, b_add])
 
@@ -263,18 +264,20 @@ def show_circular_two_sided(
     target_indices=None,
     intensity_target_l=None,
     intensity_target_r=None,
+    clip=True,
 ):
     try:
         stim = circular_two_sided(
             visual_size=(height, width),
             ppd=ppd,
             frequency=frequency,
             phase_shift=phase_shift,
-            intensity_rings=(int1, int2),
+            intensity_rings=((int1, int2),(int2, int1)),
             intensity_background=intensity_background,
             origin=origin,
             target_indices=target_indices,
             intensity_target=(intensity_target_l, intensity_target_r),
+            clip=clip,
         )
         plot_stim(stim, mask=add_mask)
     except Exception as e:
@@ -297,6 +300,7 @@ out = iw.interactive_output(
         "target_indices": w_tidx,
         "intensity_target_l": w_tint_l,
         "intensity_target_r": w_tint_r,
+        "clip": w_clip,
     },
 )
 
@@ -509,6 +513,7 @@ w_int1 = iw.FloatSlider(value=1, min=0, max=1, description="int-ring1")
 w_int2 = iw.FloatSlider(value=0, min=0, max=1, description="int-ring2")
 w_int_back = iw.FloatSlider(value=0.5, min=0, max=1, description="intensity background")
 
+w_clip = iw.ToggleButton(value=False, disabled=False, description="clip")
 w_mask = iw.Dropdown(value=None, options=[None, 'target_mask', 'frame_mask'], description="add mask")
 
 w_tidx = iw.IntSlider(value=1, min=0, max=10, description="target idx")
@@ -520,7 +525,7 @@ b_im_size = iw.HBox([w_height, w_width, w_ppd])
 b_geometry = iw.HBox([w_freq, w_phase])
 b_intensities = iw.HBox([w_int1, w_int2, w_int_back])
 b_target = iw.HBox([w_tidx, w_tint_l, w_tint_r])
-b_add = iw.HBox([w_mask])
+b_add = iw.HBox([w_clip, w_mask])
 ui = iw.VBox([b_im_size, b_geometry, b_intensities, b_target, b_add])
 
 # Function for showing stim
@@ -537,17 +542,19 @@ def show_rectangular_two_sided(
     target_indices=None,
     intensity_target_l=None,
     intensity_target_r=None,
+    clip=None,
 ):
     try:
         stim = rectangular_two_sided(
             visual_size=(height, width),
             ppd=ppd,
             frequency=frequency,
             phase_shift=phase_shift,
-            intensity_frames=(int1, int2),
+            intensity_frames=((int1, int2),(int2, int1)),
             intensity_background=intensity_background,
             target_indices=target_indices,
             intensity_target=(intensity_target_l, intensity_target_r),
+            clip=clip,
         )
         plot_stim(stim, mask=add_mask)
     except Exception as e:
@@ -568,7 +575,8 @@ out = iw.interactive_output(
         "add_mask": w_mask,
         "intensity_target_l": w_tint_l,
         "intensity_target_r": w_tint_r,
-            "target_indices": w_tidx,
+        "target_indices": w_tidx,
+        "clip": w_clip,
     },
 )
 

docs/reference/demos/stimuli/sbcs.md

@@ -180,12 +180,12 @@ display(ui, out)
 ```
 
 ## Two sided
-{py:func}`stimupy.stimuli.sbcs.two_sided`
+{py:func}`stimupy.stimuli.sbcs.basic_two_sided`
 
 ```{code-cell} ipython3
 import ipywidgets as iw
 from stimupy.utils import plot_stim
-from stimupy.stimuli.sbcs import two_sided
+from stimupy.stimuli.sbcs import basic_two_sided
 
 # Define widgets
 w_height = iw.IntSlider(value=10, min=1, max=20, description="height [deg]")
@@ -225,11 +225,11 @@ def show_two_sided(
     add_mask=False,
 ):
     try:
-        stim = two_sided(
+        stim = basic_two_sided(
             visual_size=(height, width),
             ppd=ppd,
-            target_size=(target_height,target_width),
-            intensity_backgrounds=(intensity_background_l, intensity_background_r),
+            target_size=((target_height,target_width),(target_height,target_width)),
+            intensity_background=(intensity_background_l, intensity_background_r),
             intensity_target=(intensity_target_l, intensity_target_r),
         )
         plot_stim(stim, mask=add_mask)
@@ -413,7 +413,7 @@ def show_two_sided_with_dots(
             n_dots=(ndotsy, ndotsx),
             dot_radius=dot_radius,
             distance=dot_distance,
-            intensity_backgrounds=(intensity_background_l, intensity_background_r),
+            intensity_background=(intensity_background_l, intensity_background_r),
             intensity_target=intensity_target,
             intensity_dots=(intensity_dots_l, intensity_dots_r),
         )
@@ -603,7 +603,7 @@ def show_two_sided_dotted(
             n_dots=(ndotsy, ndotsx),
             dot_radius=dot_radius,
             distance=dot_distance,
-            intensity_backgrounds=(intensity_background_l, intensity_background_r),
+            intensity_background=(intensity_background_l, intensity_background_r),
             intensity_target=intensity_target,
             intensity_dots=(intensity_dots_l, intensity_dots_r),
         )

docs/reference/demos/stimuli/todorovics.md

@@ -298,10 +298,10 @@ def show_two_sided_rectangle(
         stim = rectangle_two_sided(
             visual_size=(height, width),
             ppd=ppd,
-            target_size=(theight, twidth),
-            covers_size=(cheight, cwidth),
-            covers_offset=(coffy, coffx),
-            intensity_backgrounds=(intback1, intback2),
+            target_size=((theight, twidth),(theight, twidth)),
+            covers_size=((cheight, cwidth),(cheight, cwidth)),
+            covers_offset=((coffy, coffx),(coffy, coffx)),
+            intensity_background=(intback1, intback2),
             intensity_target=(tint_l, tint_r),
             intensity_covers=(cint1, cint2),
         )
@@ -551,8 +551,8 @@ w_cwidth = iw.FloatSlider(value=2, min=0, max=4, description="cover width [deg]"
 w_cint1 = iw.FloatSlider(value=1, min=0, max=1, description="cover int1")
 w_cint2 = iw.FloatSlider(value=0, min=0, max=1, description="cover int2")
 
-w_int_back1 = iw.FloatSlider(value=0., min=0, max=1, description="int back1")
-w_int_back2 = iw.FloatSlider(value=1., min=0, max=1, description="int back12")
+w_int_back_l = iw.FloatSlider(value=0., min=0, max=1, description="int back1")
+w_int_back_r = iw.FloatSlider(value=1., min=0, max=1, description="int back12")
 w_mask = iw.Dropdown(value=None, options=[None, 'target_mask'], description="add mask")
 
 # Layout
@@ -577,18 +577,18 @@ def show_two_sided_cross(
     cwidth=None,
     cint1=None,
     cint2=None,
-    intback1=None,
-    intback2=None,
+    int_back_l=None,
+    int_back_r=None,
     add_mask=False,
 ):
     try:
         stim = cross_two_sided(
             visual_size=(height, width),
             ppd=ppd,
-            cross_size=(theight, twidth),
+            cross_size=((theight, twidth),(theight, twidth)),
             cross_thickness=tthick,
-            covers_size=(cheight, cwidth),
-            intensity_backgrounds=(intback1, intback2),
+            covers_size=((cheight, cwidth),(cheight, cwidth)),
+            intensity_background=(int_back_l, int_back_r),
             intensity_target=(tint_l, tint_r),
             intensity_covers=(cint1, cint2),
         )
@@ -612,8 +612,8 @@ out = iw.interactive_output(
         "cwidth": w_cwidth,
         "cint1": w_cint1,
         "cint2": w_cint2,
-        "intback1": w_int_back1,
-        "intback2": w_int_back2,
+        "int_back_l": w_int_back_l,
+        "int_back_r": w_int_back_r,
         "add_mask": w_mask,
     },
 )
@@ -720,11 +720,11 @@ w_tthick = iw.FloatSlider(value=2, min=0, max=4, description="cross thickness [d
 w_tint_l = iw.FloatSlider(value=0.5, min=0, max=1, description="left cross int")
 w_tint_r = iw.FloatSlider(value=0.5, min=0, max=1, description="right cross int")
 
-w_cint1 = iw.FloatSlider(value=1, min=0, max=1, description="cover1 int")
-w_cint2 = iw.FloatSlider(value=0, min=0, max=1, description="cover2 int")
+w_cint_l = iw.FloatSlider(value=1, min=0, max=1, description="cover1 int")
+w_cint_r = iw.FloatSlider(value=0, min=0, max=1, description="cover2 int")
 
-w_int_back1 = iw.FloatSlider(value=0., min=0, max=1, description="int back1")
-w_int_back2 = iw.FloatSlider(value=1., min=0, max=1, description="int back2")
+w_int_back_l = iw.FloatSlider(value=0., min=0, max=1, description="int back1")
+w_int_back_r = iw.FloatSlider(value=1., min=0, max=1, description="int back2")
 w_mask = iw.Dropdown(value=None, options=[None, 'target_mask'], description="add mask")
 
 # Layout
@@ -745,21 +745,21 @@ def show_two_sided_equal(
     tint_l=None,
     tint_r=None,
     tthick=None,
-    cint1=None,
-    cint2=None,
-    intback1=None,
-    intback2=None,
+    cint_l=None,
+    cint_r=None,
+    int_back_l=None,
+    int_back_r=None,
     add_mask=False,
 ):
     try:
         stim = equal_two_sided(
             visual_size=(height, width),
             ppd=ppd,
-            cross_size=(theight, twidth),
+            cross_size=((theight, twidth),(theight, twidth)),
             cross_thickness=tthick,
-            intensity_backgrounds=(intback1, intback2),
+            intensity_background=(int_back_l, int_back_r),
             intensity_target=(tint_l, tint_r),
-            intensity_covers=(cint1, cint2),
+            intensity_covers=(cint_l, cint_r),
         )
         plot_stim(stim, mask=add_mask)
     except Exception as e:
@@ -777,10 +777,10 @@ out = iw.interactive_output(
         "tint_l": w_tint_l,
         "tint_r": w_tint_r,
         "tthick": w_tthick,
-        "cint1": w_cint1,
-        "intback1": w_int_back1,
-        "cint2": w_cint2,
-        "intback2": w_int_back2,
+        "cint_l": w_cint1,
+        "int_back_l": w_int_back_l,
+        "cint_r": w_cint2,
+        "int_back_r": w_int_back_r,
         "add_mask": w_mask,
     },
 )