gammasimtools 0.6.1__py3-none-any.whl → 0.8.1__py3-none-any.whl

simtools/utils/geometry.py

@@ -1,12 +1,10 @@
-"""
-A collection of functions related to geometrical transformations.
-"""
+"""A collection of functions related to geometrical transformations."""
 
 import logging
 
 import astropy.units as u
 import numpy as np
-from astropy.coordinates.errors import UnitsError
+from astropy.units import UnitsError
 
 __all__ = [
     "convert_2d_to_radial_distr",
@@ -41,7 +39,6 @@ def convert_2d_to_radial_distr(hist_2d, xaxis, yaxis, bins=50, max_dist=1000):
         The bin edges of the 1D histogram with size = int(max_dist/bin_size) + 1.
 
     """
-
     # Check if the histogram will make sense
     bins_step = 2 * max_dist / bins  # in the 2d array, the positive and negative direction count.
     for axis in [xaxis, yaxis]:
@@ -73,7 +70,7 @@ def convert_2d_to_radial_distr(hist_2d, xaxis, yaxis, bins=50, max_dist=1000):
     distance_sorted = np.sort(radial_distance_map, axis=None)
 
     # For larger distances, we have more elements in a slice 'dr' in radius, hence, we need to
-    # acount for it using weights below.
+    # account for it using weights below.
 
     weights, radial_bin_edges = np.histogram(distance_sorted, bins=bins, range=(0, max_dist))
     histogram_1d = np.empty_like(weights, dtype=float)
@@ -94,9 +91,13 @@ def convert_2d_to_radial_distr(hist_2d, xaxis, yaxis, bins=50, max_dist=1000):
 @u.quantity_input(rotation_angle_phi=u.rad, rotation_angle_theta=u.rad)
 def rotate(x, y, rotation_around_z_axis, rotation_around_y_axis=0):
     """
-    Transform the x and y coordinates of the telescopes according to two rotations:
-    `rotation_angle_around_z_axis` gives the rotation on the observation plane (x, y) and
-    `rotation_angle_around_y_axis` allows to rotate the observation plane in space.
+    Rotate the x and y coordinates of the telescopes.
+
+    The two rotations are:
+
+    - rotation_angle_around_z_axis gives the rotation on the observation plane (x, y)
+    - rotation_angle_around_y_axis allows to rotate the observation plane in space.
+
     The function returns the rotated x and y values in the same unit given.
     The direction of rotation of the elements in the plane is counterclockwise, i.e.,
     the rotation of the coordinate system is clockwise.
@@ -126,14 +127,13 @@ def rotate(x, y, rotation_around_z_axis, rotation_around_y_axis=0):
     UnitsError:
         If the unit of x and y are different.
     """
-
     allowed_types = (list, np.ndarray, u.Quantity, float, int)
     if not all(isinstance(variable, (allowed_types)) for variable in [x, y]):
         raise TypeError("x and y types are not valid! Cannot perform transformation.")
 
-    if not isinstance(x, (list, np.ndarray)):
+    if not isinstance(x, list | np.ndarray):
         x = [x]
-    if not isinstance(y, (list, np.ndarray)):
+    if not isinstance(y, list | np.ndarray):
         y = [y]
 
     if (