pygeosimplify 0.0.13__tar.gz → 0.0.14__tar.gz

{pygeosimplify-0.0.13 → pygeosimplify-0.0.14}/PKG-INFO

@@ -1,22 +1,23 @@
 Metadata-Version: 2.3
 Name: pygeosimplify
-Version: 0.0.13
+Version: 0.0.14
 Summary: Python package for automatic, cell-based inference of clash-free simplified detector geometry.
 Author: Joshua Falco Beirer
 Author-email: jbeirer@cern.ch
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.9,<3.13
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: distinctipy (>=1.3.4,<2.0.0)
-Requires-Dist: matplotlib (>=3.10.0,<4.0.0)
-Requires-Dist: numpy (>=2.2.1,<3.0.0)
+Requires-Dist: matplotlib (>=3.9.0,<4.0.0)
+Requires-Dist: numpy (>=2.0.2,<3.0.0)
 Requires-Dist: pandas (>=2.2.3,<3.0.0)
-Requires-Dist: pyg4ometry (>=1.3.2,<2.0.0)
-Requires-Dist: scipy (>=1.15.1,<2.0.0)
+Requires-Dist: pyg4ometry (==1.3.2)
+Requires-Dist: scipy (>=1.13.1,<2.0.0)
 Requires-Dist: tqdm (>=4.67.1,<5.0.0)
-Requires-Dist: uproot (>=5.5.1,<6.0.0)
+Requires-Dist: uproot (>=5.6.0,<6.0.0)
 Description-Content-Type: text/markdown
 
 <img src=https://github.com/jbeirer/pygeosimplify/raw/main/docs/logo.svg alt="Logo" width="250">

{pygeosimplify-0.0.13 → pygeosimplify-0.0.14}/pygeosimplify/geo/base.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, Union
 
 import numpy as np
 
@@ -61,7 +61,7 @@ class Cell(VertexSet):
     def __init__(
         self,
         vertices: np.ndarray,
-        facecolor: tuple[float, float, float] | str = "tab:orange",
+        facecolor: Union[tuple[float, float, float], str] = "tab:orange",
         alpha: float = 0.1,
         edgecolor: tuple = (1, 1, 1, 1),
         edgewidth: float = 1,

{pygeosimplify-0.0.13 → pygeosimplify-0.0.14}/pygeosimplify/simplify/layer.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
@@ -25,7 +27,7 @@ class GeoLayer:
         The coordinate system used to represent the cell positions.
     is_barrel : bool
         True if the layer is a barrel layer, False otherwise.
-    cells : List[Union[XYZCell, EtaPhiRCell, EtaPhiZCell, RPhiZCell]]
+    cells : list[Union[XYZCell, EtaPhiRCell, EtaPhiZCell, RPhiZCell]]
         A list of cell objects representing the cells in the layer.
     extent : dict
         A dictionary containing the minimum and maximum values of r and z coordinates of the cells in the layer.
@@ -77,7 +79,9 @@ class GeoLayer:
                 return coordinate_system
         raise Exception(f"Could not infer set coordinate system found for layer {self.idx}.")
 
-    def _get_cells(self, df: pd.DataFrame) -> list[XYZCell] | list[EtaPhiRCell] | list[EtaPhiZCell] | list[RPhiZCell]:
+    def _get_cells(
+        self, df: pd.DataFrame
+    ) -> Union[list[XYZCell], list[EtaPhiRCell], list[EtaPhiZCell], list[RPhiZCell]]:
         """
         Returns a list of cell objects representing the cells in the layer.
 
@@ -88,46 +92,46 @@ class GeoLayer:
 
         Returns:
         --------
-        Union[List[XYZCell], List[EtaPhiRCell], List[EtaPhiZCell], List[RPhiZCell]]:
+        Union[list[XYZCell], list[EtaPhiRCell], list[EtaPhiZCell], list[RPhiZCell]]:
             A list of cell objects representing the cells in the layer.
         """
         if self.coordinate_system == "XYZ":
             return [
                 XYZCell(dx, dy, dz, pos=XYZ(x, y, z))
-                for dx, dy, dz, x, y, z in zip(df.dx, df.dy, df.dz, df.x, df.y, df.z, strict=False)
+                for dx, dy, dz, x, y, z in zip(df.dx, df.dy, df.dz, df.x, df.y, df.z)
             ]
         elif self.coordinate_system == "EtaPhiR":
             return [
                 EtaPhiRCell(deta, dphi, dr, pos=EtaPhiR(eta, phi, r))
-                for deta, dphi, dr, eta, phi, r in zip(df.deta, df.dphi, df.dr, df.eta, df.phi, df.r, strict=False)
+                for deta, dphi, dr, eta, phi, r in zip(df.deta, df.dphi, df.dr, df.eta, df.phi, df.r)
             ]
         elif self.coordinate_system == "EtaPhiZ":
             return [
                 EtaPhiZCell(deta, dphi, dz, pos=EtaPhiZ(eta, phi, z))
-                for deta, dphi, dz, eta, phi, z in zip(df.deta, df.dphi, df.dz, df.eta, df.phi, df.z, strict=False)
+                for deta, dphi, dz, eta, phi, z in zip(df.deta, df.dphi, df.dz, df.eta, df.phi, df.z)
             ]
         elif self.coordinate_system == "RPhiZ":
             return [
                 RPhiZCell(dr, dphi, dz, pos=RPhiZ(r, phi, z))
-                for dr, dphi, dz, r, phi, z in zip(df.dr, df.dphi, df.dz, df.r, df.phi, df.z, strict=False)
+                for dr, dphi, dz, r, phi, z in zip(df.dr, df.dphi, df.dz, df.r, df.phi, df.z)
             ]
         else:
             raise Exception(f"Invalid coordinate system {self.coordinate_system}.")
 
     def _cell_vertices_rz(
-        self, cells: list[XYZCell] | list[EtaPhiRCell] | list[EtaPhiZCell] | list[RPhiZCell]
+        self, cells: Union[list[XYZCell], list[EtaPhiRCell], list[EtaPhiZCell], list[RPhiZCell]]
     ) -> tuple[list[float], list[float]]:
         """
         Returns the r and z values of the cell vertices in the layer.
 
         Parameters:
         -----------
-        cells : Union[List[XYZCell], List[EtaPhiRCell], List[EtaPhiZCell], List[RPhiZCell]]
+        cells : Union[list[XYZCell], list[EtaPhiRCell], list[EtaPhiZCell], list[RPhiZCell]]
             A list of XYZ, EtaPhiR, EtaPhiZ or RPhiZCell cells.
 
         Returns:
         --------
-        Tuple[List[float], List[float]]:
+        tuple[list[float], list[float]]:
             A tuple containing the r and z values of cell vertices.
         """
         vertex_list = np.concatenate([cell.vertices for cell in cells], axis=0)
@@ -148,14 +152,14 @@ class GeoLayer:
         return r_values, z_values
 
     def _min_max_rz_extent(
-        self, cells: list[XYZCell] | list[EtaPhiRCell] | list[EtaPhiZCell] | list[RPhiZCell]
+        self, cells: Union[list[XYZCell], list[EtaPhiRCell], list[EtaPhiZCell], list[RPhiZCell]]
     ) -> dict:
         """
         Returns a dictionary containing the minimum and maximum values of r and z coordinates of the cells in the layer.
 
         Parameters:
         -----------
-        cells : Union[List[XYZCell], List[EtaPhiRCell], List[EtaPhiZCell], List[RPhiZCell]]
+        cells : Union[list[XYZCell], list[EtaPhiRCell], list[EtaPhiZCell], list[RPhiZCell]]
             A list of cell objects representing the cells in the layer.
 
         Returns:
@@ -217,8 +221,8 @@ class GeoLayer:
 
     def plot_cell_vertices_rz(
         self,
-        ax: None | plt.Axes = None,
-        color: tuple[float, float, float] | str = "tab:blue",
+        ax: Union[None, plt.Axes] = None,
+        color: Union[tuple[float, float, float], str] = "tab:blue",
         marker_size: float = 0.01,
         x_label: str = "z",
         y_label: str = "r",
@@ -258,7 +262,7 @@ class GeoLayer:
         return ax
 
     def plot_symmetrized_cylinder(
-        self, cyl: Cylinder, ax: Axes3D = None, color: tuple[float, float, float] | str = "black"
+        self, cyl: Cylinder, ax: Axes3D = None, color: Union[tuple[float, float, float], str] = "black"
     ) -> Axes3D:
         # If layer is continuous in z, plot as single cylinder
         if self.is_continuous_in_z():
@@ -271,7 +275,7 @@ class GeoLayer:
             plot_cylinder(cyl_pos_z_halfspace, ax=ax, color=color)
             plot_cylinder(cyl_neg_z_halfspace, ax=ax, color=color)
 
-    def plot_thinned_cylinder(self, ax: Axes3D = None, color: tuple[float, float, float] | str = "red") -> Axes3D:
+    def plot_thinned_cylinder(self, ax: Axes3D = None, color: Union[tuple[float, float, float], str] = "red") -> Axes3D:
         """
         Plots the thinned version of the layer in 3D space.
 
@@ -297,7 +301,7 @@ class GeoLayer:
 
         return ax
 
-    def plot_cell_envelope(self, ax: Axes3D = None, color: tuple[float, float, float] | str = "red") -> Axes3D:
+    def plot_cell_envelope(self, ax: Axes3D = None, color: Union[tuple[float, float, float], str] = "red") -> Axes3D:
         """
         Plots the envelope of the cells in the layer in 3D space.
 

{pygeosimplify-0.0.13 → pygeosimplify-0.0.14}/pygeosimplify/simplify/post_process.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 import pandas as pd
 
 from pygeosimplify.simplify.cylinder import Cylinder
@@ -155,7 +157,7 @@ def get_cylinder_envelope(df: pd.DataFrame, min_dist: float, envelope_width: flo
     return envelope_dict
 
 
-def get_cyl_limiting_r_extension(df: pd.DataFrame, layer: pd.DataFrame, side: str = "OUT") -> Cylinder | None:
+def get_cyl_limiting_r_extension(df: pd.DataFrame, layer: pd.DataFrame, side: str = "OUT") -> Union[Cylinder, None]:
     if side not in ["OUT", "IN"]:
         raise ValueError("side must be either OUT or IN")
 
@@ -193,7 +195,7 @@ def get_cyl_limiting_r_extension(df: pd.DataFrame, layer: pd.DataFrame, side: st
     return limiting_cyl
 
 
-def get_cyl_limiting_z_extension(df: pd.DataFrame, layer: pd.DataFrame, side: str = "RIGHT") -> Cylinder | None:
+def get_cyl_limiting_z_extension(df: pd.DataFrame, layer: pd.DataFrame, side: str = "RIGHT") -> Union[Cylinder, None]:
     if side not in ["RIGHT", "LEFT"]:
         raise ValueError("side must be either RIGHT or LEFT")
 

{pygeosimplify-0.0.13 → pygeosimplify-0.0.14}/pygeosimplify/vis/cylinder.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 import matplotlib.pyplot as plt
 import numpy as np
 from mpl_toolkits.mplot3d import Axes3D
@@ -60,7 +62,7 @@ def generate_cylinder_endcap_points(rmin: float, rmax: float, z: float, linspace
 def plot_cylinder(
     cylinder: Cylinder,
     ax: Axes3D = None,
-    color: tuple[float, float, float] | str = "black",
+    color: Union[tuple[float, float, float], str] = "black",
     alpha: float = 0.2,
     linspace_count: int = 300,
 ) -> Axes3D:

{pygeosimplify-0.0.13 → pygeosimplify-0.0.14}/pygeosimplify/vis/geo.py

@@ -1,4 +1,4 @@
-from typing import Any
+from typing import Any, Optional, Union
 
 import matplotlib.colors as mcolors
 import matplotlib.pyplot as plt
@@ -16,14 +16,14 @@ from pygeosimplify.vis.scene import CellScene
 
 def plot_geometry(  # noqa: C901
     df: pd.DataFrame,
-    ax: Axes3D = None,
-    layer_list: list[int] | None = None,
-    eta_range: list | None = None,
-    phi_range: list | None = None,
-    axis_labels: list | None = None,
-    color: str | None = None,
+    ax: Union[None, Axes3D] = None,
+    layer_list: Optional[list[int]] = None,
+    eta_range: Optional[list] = None,
+    phi_range: Optional[list] = None,
+    axis_labels: Optional[list] = None,
+    color: Optional[str] = None,
     unit_scale: float = 1,
-    cell_energy_col: str | None = None,
+    cell_energy_col: Optional[str] = None,
     unit_scale_energy: float = 1,
     energy_label: str = "Cell Energy",
     color_map: str = "gist_heat_r",
@@ -34,10 +34,10 @@ def plot_geometry(  # noqa: C901
     Parameters:
         df (pd.DataFrame): The DataFrame containing the geometry data.
         ax (Axes3D, optional): The 3D axes to plot on. If not provided, a new figure and axes will be created.
-        layer_list (List[int], optional): The list of layers to consider. If not provided, all layers will be considered.
-        eta_range (List, optional): The range of eta values to filter the data. If not provided, the default range is [-5, 5].
-        phi_range (List, optional): The range of phi values to filter the data. If not provided, the default range is [0, np.pi].
-        axis_labels (List, optional): The labels for the x, y, and z axes. If not provided, the default labels are ["x", "y", "z"].
+        layer_list (list[int], optional): The list of layers to consider. If not provided, all layers will be considered.
+        eta_range (list, optional): The range of eta values to filter the data. If not provided, the default range is [-5, 5].
+        phi_range (list, optional): The range of phi values to filter the data. If not provided, the default range is [0, np.pi].
+        axis_labels (list, optional): The labels for the x, y, and z axes. If not provided, the default labels are ["x", "y", "z"].
         color (str, optional): The color to use for the cells. If not provided, colors will be automatically assigned based on the layers.
         unit_scale (float, optional): The scale factor for the unit of measurement. Default is 1.
         cell_energy_col (str, optional): The name of the column containing the cell energy values. If provided, the cells will be colored based on the energy values.
@@ -75,7 +75,7 @@ def plot_geometry(  # noqa: C901
 
     if not cell_energy_col:
         # Create a color dict mapping a layer to a color
-        layer_color_dict = dict(zip(layer_list, get_colors(len(layer_list), rng=0), strict=False))
+        layer_color_dict = dict(zip(layer_list, get_colors(len(layer_list), rng=0)))
         # If color is specifically provided, override the color dict
         if color:
             layer_color_dict = {layer: color for layer in layer_list}
@@ -117,7 +117,8 @@ def plot_geometry(  # noqa: C901
     # Regularize x,y limits so that limits are identical for x and y (to avoid distortions)
     minMaxX = vis.min_max_cell_list_extent(0)
     minMaxY = vis.min_max_cell_list_extent(1)
-    minMax = [min(minMaxX[0], minMaxY[0]), max(minMaxX[1], minMaxY[1])]
+    minMax: tuple[float, float] = (min(minMaxX[0], minMaxY[0]), max(minMaxX[1], minMaxY[1]))
+
     ax.set_xlim(minMax)
     ax.set_ylim(minMax)
 
@@ -130,8 +131,8 @@ def filter_df_eta_phi(df: pd.DataFrame, eta_range: list, phi_range: list) -> pd.
 
     Args:
         df (pd.DataFrame): The DataFrame to filter.
-        eta_range (List): A list containing the minimum and maximum eta values.
-        phi_range (List): A list containing the minimum and maximum phi values.
+        eta_range (list): A list containing the minimum and maximum eta values.
+        phi_range (list): A list containing the minimum and maximum phi values.
 
     Returns:
         pd.DataFrame: The filtered DataFrame.
@@ -148,10 +149,10 @@ def add_cells_to_scene(
     df: pd.DataFrame,
     scene: CellScene,
     unit_scale: float,
-    unit_scale_energy: float | None = 1,
-    layer_color_dict: dict | None = None,
-    colormap: Any | None = None,
-    norm: mcolors.Normalize | None = None,
+    unit_scale_energy: Optional[float] = 1,
+    layer_color_dict: Optional[dict] = None,
+    colormap: Optional[Any] = None,
+    norm: Optional[mcolors.Normalize] = None,
 ) -> None:
     """
     Adds cells to a given scene.
@@ -161,7 +162,7 @@ def add_cells_to_scene(
         scene (CellScene): The scene to which the cells will be added.
         unit_scale (float): The scale factor for the cell units.
         unit_scale_energy (Optional[float], optional): The scale factor for the cell energy units. Defaults to 1.
-        layer_color_dict (Optional[Dict], optional): A dictionary mapping layer names to colors. Defaults to None.
+        layer_color_dict (Optional[dict], optional): A dictionary mapping layer names to colors. Defaults to None.
         colormap (Optional[Any], optional): The colormap used to map cell energy values to colors. Defaults to None.
         norm (Optional[mcolors.Normalize], optional): The normalization function used for the colormap. Defaults to None.
     """

{pygeosimplify-0.0.13 → pygeosimplify-0.0.14}/pygeosimplify/vis/scene.py

@@ -1,3 +1,5 @@
+from typing import Union
+
 import matplotlib.pyplot as plt
 import numpy as np
 from mpl_toolkits.mplot3d import Axes3D
@@ -14,7 +16,7 @@ class CellScene:
 
     Attributes:
     -----------
-    cell_list : List[Cell]
+    cell_list : list[Cell]
         A list of Cell objects to be plotted in the scene.
 
     Methods:
@@ -31,7 +33,7 @@ class CellScene:
     min_max_cell_list_extent(dimIdx: int) -> tuple[float, float]
         Returns the minimum and maximum extent of the cell_list along the specified dimension.
 
-    plot(ax: Axes3D = None, axisLabels: List[str] = []) -> Axes3D
+    plot(ax: Axes3D = None, axisLabels: list[str] = []) -> Axes3D
         Plots the cells in the cell_list in a 3D plot with specified axis labels.
     """
 
@@ -41,7 +43,7 @@ class CellScene:
     def add_cell(
         self,
         cell: Cell,
-        facecolor: tuple[float, float, float] | str = "tab:orange",
+        facecolor: Union[tuple[float, float, float], str] = "tab:orange",
         alpha: float = 0.1,
         edgecolor: tuple = (1, 1, 1, 1),
         edgewidth: float = 1,
@@ -68,8 +70,8 @@ class CellScene:
     def plot(
         self,
         ax: Axes3D = None,
-        axis_limits: list[tuple[float, float]] | None = None,
-        axis_labels: list[str] | None = None,
+        axis_limits: Union[list[tuple[float, float]], None] = None,
+        axis_labels: Union[list[str], None] = None,
     ) -> Axes3D:
         if self.n_cells() == 0:
             raise RuntimeWarning("No cells to plot. Add cells using the add_cell method.")

{pygeosimplify-0.0.13 → pygeosimplify-0.0.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pygeosimplify"
-version = "v0.0.13"
+version = "v0.0.14"
 description = "Python package for automatic, cell-based inference of clash-free simplified detector geometry."
 authors = [
   { name = "Joshua Falco Beirer", email = "jbeirer@cern.ch" }
@@ -12,19 +12,20 @@ packages = [
   { include = "pygeosimplify" }
 ]
 
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.9,<3.13"
 dynamic = ["dependencies"]
 
 [tool.poetry.dependencies]
-python = ">=3.10,<3.13"
-uproot = "^5.5.1"
+python = ">=3.9,<3.13"
+uproot = "^5.6.0"
 pandas = "^2.2.3"
-numpy = "^2.2.1"
-matplotlib = "^3.10.0"
-scipy = "^1.15.1"
+numpy = "^2.0.2"
+matplotlib = "^3.9.0"
+scipy = "^1.13.1"
 tqdm = "^4.67.1"
 distinctipy = "^1.3.4"
-pyg4ometry = "^1.3.2"
+pyg4ometry = "1.3.2"
+
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.3.4"
@@ -41,12 +42,12 @@ mkdocs-material = "^9.5.49"
 mkdocstrings = {extras = ["python"], version = "^0.27.0"}
 
 [build-system]
-requires = ["poetry-core>=2.0.1"]
+requires = ["poetry-core>=2.1.1"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]
 line-length = 120
-target-version = ['py312']
+target-version = ['py39']
 preview = true
 
 [tool.mypy]
@@ -69,7 +70,7 @@ filterwarnings = [
 ]
 
 [tool.ruff]
-target-version = "py312"
+target-version = "py39"
 line-length = 120
 fix = true
 lint.select = [
@@ -116,7 +117,9 @@ lint.ignore = [
     # Avoid specifying long messages outside the exception class
     "TRY003",
     # B017 Do not assert blind exception: `Exception`
-    "B017"
+    "B017",
+    # Use `X | Y` for type annotations
+    "UP007"
 ]
 
 [tool.coverage.report]