diff --git a/masque/__init__.py b/masque/__init__.py index 86fae91..93eabdc 100644 --- a/masque/__init__.py +++ b/masque/__init__.py @@ -83,12 +83,10 @@ from .builder import ( from .utils import ( ports2data as ports2data, oneshot as oneshot, - R90 as R90, - R180 as R180, ) __author__ = 'Jan Petykiewicz' -__version__ = '3.3' +__version__ = '3.2' version = __version__ # legacy diff --git a/masque/utils/__init__.py b/masque/utils/__init__.py index f33142f..11391a5 100644 --- a/masque/utils/__init__.py +++ b/masque/utils/__init__.py @@ -25,8 +25,6 @@ from .transform import ( normalize_mirror as normalize_mirror, rotate_offsets_around as rotate_offsets_around, apply_transforms as apply_transforms, - R90 as R90, - R180 as R180, ) from .comparisons import ( annotation2key as annotation2key, diff --git a/masque/utils/curves.py b/masque/utils/curves.py index 1e41c35..027d205 100644 --- a/masque/utils/curves.py +++ b/masque/utils/curves.py @@ -2,11 +2,6 @@ import numpy from numpy.typing import ArrayLike, NDArray from numpy import pi -try: - from numpy import trapezoid -except ImportError: - from numpy import trapz as trapezoid - def bezier( nodes: ArrayLike, @@ -68,13 +63,13 @@ def euler_bend( num_points_spiral = numpy.floor(ll_max / ll_tot * num_points).astype(int) num_points_arc = num_points - 2 * num_points_spiral - def gen_spiral(ll_max: float) -> NDArray[numpy.float64]: + def gen_spiral(ll_max: float): xx = [] yy = [] for ll in numpy.linspace(0, ll_max, num_points_spiral): qq = numpy.linspace(0, ll, 1000) # integrate to current arclength - xx.append(trapezoid( numpy.cos(qq * qq / 2), qq)) - yy.append(trapezoid(-numpy.sin(qq * qq / 2), qq)) + xx.append(numpy.trapz( numpy.cos(qq * qq / 2), qq)) + yy.append(numpy.trapz(-numpy.sin(qq * qq / 2), qq)) xy_part = numpy.stack((xx, yy), axis=1) return xy_part diff --git a/masque/utils/transform.py b/masque/utils/transform.py index dfb6492..e2ea9aa 100644 --- a/masque/utils/transform.py +++ b/masque/utils/transform.py @@ -9,11 +9,6 @@ from numpy.typing import NDArray, ArrayLike from numpy import pi -# Constants for shorthand rotations -R90 = pi / 2 -R180 = pi - - @lru_cache def rotation_matrix_2d(theta: float) -> NDArray[numpy.float64]: """