Resyncing dev and main branches

README.md

@@ -50,8 +50,10 @@ from spyral import (
     FribParameters,
     DetectorParameters,
     ClusterParameters,
-    OverlapJoinParameters,
+    HdbscanParameters,
     TripclustParameters,
+    OverlapJoinParameters,
+    ContinuityJoinParameters,
     SolverParameters,
     EstimateParameters,
     DEFAULT_MAP,
@@ -105,12 +107,12 @@ det_params = DetectorParameters(
 
 cluster_params = ClusterParameters(
     min_cloud_size=50,
-    hdbscan_parameters = None,
-    # hdbscan_parameters = HdbscanParameters(
-    #     min_points=3,
-    #     min_size_scale_factor=0.03,
-    #     min_size_lower_cutoff=10,
-    #     cluster_selection_epsilon=10.0),
+    # hdbscan_parameters = None,
+    hdbscan_parameters = HdbscanParameters(
+        min_points=3,
+        min_size_scale_factor=0.03,
+        min_size_lower_cutoff=10,
+        cluster_selection_epsilon=10.0),
     # overlap_join=OverlapJoinParameters(
     #     min_cluster_size_join=15,
     #     circle_overlap_ratio=0.25,
@@ -122,25 +124,25 @@ cluster_params = ClusterParameters(
     overlap_join=None,
     outlier_scale_factor=0.1,
     direction_threshold=0.5,
-    # tripclust_parameters=None,
-    tripclust_parameters=TripclustParameters(
-        r=6,
-        rdnn=True,
-        k=12,
-        n=3,
-        a=0.03,
-        s=0.3,
-        sdnn=True,
-        t=0.0,
-        tauto=True,
-        dmax=0.0,
-        dmax_dnn=False,
-        ordered=True,
-        link=0,
-        m=50,
-        postprocess=False,
-        min_depth=25,
-    ),
+    tripclust_parameters=None,
+    # tripclust_parameters=TripclustParameters(
+    #     r=6,
+    #     rdnn=True,
+    #     k=12,
+    #     n=3,
+    #     a=0.03,
+    #     s=0.3,
+    #     sdnn=True,
+    #     t=0.0,
+    #     tauto=True,
+    #     dmax=0.0,
+    #     dmax_dnn=False,
+    #     ordered=True,
+    #     link=0,
+    #     m=50,
+    #     postprocess=False,
+    #     min_depth=25,
+    # ),
 )
 
 estimate_params = EstimateParameters(

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "attpc_spyral"
-version = "1.1.1"
+version = "1.1.2"
 description = "AT-TPC analysis pipeline"
 authors = [
     {name = "gwm17", email = "gordonmccann215@gmail.com"},

src/spyral/__init__.py

@@ -20,6 +20,7 @@
     ClusterParameters,
     OverlapJoinParameters,
     ContinuityJoinParameters,
+    HdbscanParameters,
     TripclustParameters,
     EstimateParameters,
     SolverParameters,
@@ -53,6 +54,7 @@
     "ClusterParameters",
     "OverlapJoinParameters",
     "ContinuityJoinParameters",
+    "HdbscanParameters",
     "TripclustParameters",
     "EstimateParameters",
     "SolverParameters",

src/spyral/core/clusterize.py

@@ -238,7 +238,7 @@ def join_clusters_overlap_step(
             continue
 
         new_cluster = LabeledCloud(
-            g, PointCloud(event_number, np.zeros((0, 8))), np.empty(0)
+            g, Direction.NONE, PointCloud(event_number, np.zeros((0, 8))), np.empty(0)
         )
         for idx in groups_index[g]:
             new_cluster.point_cloud.data = np.concatenate(

src/spyral/core/estimator.py

@@ -268,7 +268,7 @@ def estimate_physics_pass(
     polar = math.atan(fit.slope)  # type: ignore
     # We have a self consistency case here. Polar should match chosen Direction
     if (polar > 0.0 and direction == Direction.BACKWARD) or (polar < 0.0 and direction == Direction.FORWARD):
-        print("Direction={direction} and polar={polar} not consistent!")
+    #    print("Direction={direction} and polar={polar} not consistent!")
         return None # Our direction guess was bad, we need to try again with the other direction
     elif direction is Direction.BACKWARD:
         polar += math.pi
@@ -333,5 +333,5 @@ def estimate_physics_pass(
             sqrt_dEdx=np.sqrt(np.fabs(dEdx)),
             dE=charge_deposited,
             arclength=arclength,
-            direction=direction,
+            direction=direction.value,
         )