oops

src/hats/catalog/association_catalog/association_catalog.py

@@ -6,7 +6,10 @@
 
 from hats.catalog.association_catalog.partition_join_info import PartitionJoinInfo
 from hats.catalog.dataset.table_properties import TableProperties
-from hats.catalog.healpix_dataset.healpix_dataset import HealpixDataset, PixelInputTypes
+from hats.catalog.healpix_dataset.healpix_dataset import HealpixDataset
+from hats.catalog.partition_info import PartitionInfo
+from hats.pixel_math import HealpixPixel
+from hats.pixel_tree.pixel_tree import PixelTree
 
 
 class AssociationCatalog(HealpixDataset):
@@ -20,7 +23,7 @@ class AssociationCatalog(HealpixDataset):
     def __init__(
         self,
         catalog_info: TableProperties,
-        pixels: PixelInputTypes,
+        pixels: PartitionInfo | PixelTree | list[HealpixPixel],
         join_pixels: list | pd.DataFrame | PartitionJoinInfo,
         catalog_path=None,
         moc: MOC | None = None,

src/hats/pixel_math/__init__.py

@@ -1,7 +1,7 @@
 """Utilities for performing fun math on healpix pixels"""
 
 from .healpix_pixel import HealpixPixel
-from .healpix_pixel_convertor import HealpixInputTypes, get_healpix_pixel
+from .healpix_pixel_convertor import get_healpix_pixel
 from .partition_stats import empty_histogram, generate_alignment, generate_histogram
 from .pixel_margins import get_margin
 from .spatial_index import compute_spatial_index, spatial_index_to_healpix

src/hats/pixel_tree/pixel_tree.py

@@ -5,7 +5,7 @@
 import numpy as np
 from mocpy import MOC
 
-from hats.pixel_math import HealpixInputTypes, HealpixPixel
+from hats.pixel_math import HealpixPixel
 from hats.pixel_math.healpix_pixel_convertor import get_healpix_tuple
 from hats.pixel_math.healpix_pixel_function import get_pixels_from_intervals
 
@@ -47,7 +47,7 @@ def __len__(self):
         """
         return len(self.tree)
 
-    def contains(self, pixel: HealpixInputTypes) -> bool:
+    def contains(self, pixel: HealpixPixel | tuple[int, int]) -> bool:
         """Check if tree contains a node at a given order and pixel
 
         Args:
@@ -96,7 +96,9 @@ def to_depth29_ranges(self) -> np.ndarray:
         return self.tree << (2 * (29 - self.tree_order))
 
     @classmethod
-    def from_healpix(cls, healpix_pixels: Sequence[HealpixInputTypes], tree_order=None) -> PixelTree:
+    def from_healpix(
+        cls, healpix_pixels: Sequence[HealpixPixel | tuple[int, int]], tree_order=None
+    ) -> PixelTree:
         """Build a tree from a list of constituent healpix pixels
 
         Args: