Skip to content

Commit

Permalink
More variable renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
JorisVincent committed Dec 13, 2022
1 parent 1594120 commit 6bbb456
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
12 changes: 6 additions & 6 deletions stimuli/components/angular.py
Expand Up @@ -210,7 +210,7 @@ def grating(
n_segments=None,
segment_width=None,
rotation=0.0,
intensities=[1.0, 0.0],
intensities_segments=[1.0, 0.0],
):
"""Draw an angular grating, i.e., set of segments
Expand All @@ -231,7 +231,7 @@ def grating(
rotation : float, optional
angle of rotation (in degrees) grating segments,
counterclockwise away from 3 o'clock, by default 0.0
intensities : Sequence[Number, ...]
intensities_segments : Sequence[Number, ...]
intensity value for each segment, from inside to out, by default [1.0, 0.0]
If fewer intensities are passed than number of radii, cycles through intensities
Expand Down Expand Up @@ -267,7 +267,7 @@ def grating(
visual_size=visual_size,
ppd=ppd,
shape=shape,
intensity_segments=intensities,
intensity_segments=intensities_segments,
)

# Assemble output
Expand All @@ -286,7 +286,7 @@ def pinwheel(
segment_width=None,
rotation=0.0,
inner_radius=0.0,
intensities=[1.0, 0.0],
intensities_segments=[1.0, 0.0],
intensity_background=0.5,
visual_size=None,
ppd=None,
Expand All @@ -309,7 +309,7 @@ def pinwheel(
counterclockwise from 3 o'clock, by default 0.0
inner_radius : float, optional
inner radius (in degrees visual angle), to turn disc into a ring, by default 0.0
intensities : Sequence[Number, ...]
intensities_segments : Sequence[Number, ...]
intensity value for each segment, from inside to out, by default [1.0, 0.0]
If fewer intensities are passed than number of radii, cycles through intensities
intensity_background : float (optional)
Expand Down Expand Up @@ -348,7 +348,7 @@ def pinwheel(
n_segments=n_segments,
segment_width=segment_width,
rotation=rotation,
intensities=intensities,
intensities_segments=intensities_segments,
visual_size=visual_size,
shape=shape,
ppd=ppd,
Expand Down
5 changes: 2 additions & 3 deletions stimuli/illusions/angular.py
Expand Up @@ -5,7 +5,6 @@
from stimuli.components.angular import pinwheel
from stimuli.components.circular import ring


__all__ = [
"radial_white",
]
Expand Down Expand Up @@ -74,7 +73,7 @@ def radial_white(
dict with the stimulus (key: "img"),
mask with integer index for each target (key: "mask"),
and additional keys containing stimulus parameters
References
----------
Robinson, A. E., Hammon, P. S., & de Sa, V. R. (2007). Explaining brightness
Expand All @@ -89,7 +88,7 @@ def radial_white(
n_segments=n_segments,
segment_width=segment_width,
rotation=rotation,
intensities=intensities_segments,
intensities_segments=intensities_segments,
intensity_background=intensity_background,
visual_size=visual_size,
ppd=ppd,
Expand Down

0 comments on commit 6bbb456

Please sign in to comment.