Use quivr's drop_duplicates

moeyensj · Oct 10, 2024 · 9958350 · 9958350
1 parent 9c66fd0
commit 9958350
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 59 deletions.
diff --git a/src/thor/clusters.py b/src/thor/clusters.py
@@ -49,7 +49,6 @@ def hash_obs_ids(obs_ids: List[str]) -> str:
 def drop_duplicate_clusters(
     clusters: "Clusters",
     cluster_members: "ClusterMembers",
-    num_cpus: int = 1,
 ) -> Tuple["Clusters", "ClusterMembers"]:
     """
     Drop clusters that have identical sets of observation IDs.

diff --git a/src/thor/orbit_determination/fitted_orbits.py b/src/thor/orbit_determination/fitted_orbits.py
@@ -8,8 +8,6 @@
 from adam_core.coordinates.residuals import Residuals
 from adam_core.orbits import Orbits
 
-from ..utils.quivr import drop_duplicates
-
 __all__ = [
     "FittedOrbits",
     "FittedOrbitMembers",
@@ -124,7 +122,7 @@ def drop_duplicate_orbits(
             "coordinates.vz",
         ]
 
-    filtered = drop_duplicates(orbits, subset=subset, keep=keep)
+    filtered = orbits.drop_duplicates(subset=subset, keep=keep)
     filtered_orbit_members = orbit_members.apply_mask(pc.is_in(orbit_members.orbit_id, filtered.orbit_id))
     return filtered, filtered_orbit_members
 

diff --git a/src/thor/utils/__init__.py b/src/thor/utils/__init__.py
@@ -2,4 +2,3 @@
 from .ades import *
 from .linkages import *
 from .logging import *
-from .quivr import *
diff --git a/src/thor/utils/quivr.py b/src/thor/utils/quivr.py