Binding 5x5, 7x7 and 9x9 clusters in python (#188)

- New binding code with macros to bind all cluster templates
- Simplified factory function on the python side
- 5x5, 7x7 and 9x9 bindings in python

python/aare/ClusterFinder.py

@@ -1,22 +1,47 @@
 
-from ._aare import ClusterFinder_Cluster3x3i, ClusterFinder_Cluster2x2i, ClusterFinderMT_Cluster3x3i, ClusterFinderMT_Cluster2x2i, ClusterCollector_Cluster3x3i, ClusterCollector_Cluster2x2i
+# from ._aare import ClusterFinder_Cluster3x3i, ClusterFinder_Cluster2x2i, ClusterFinderMT_Cluster3x3i, ClusterFinderMT_Cluster2x2i, ClusterCollector_Cluster3x3i, ClusterCollector_Cluster2x2i
 
 
-from ._aare import ClusterFileSink_Cluster3x3i, ClusterFileSink_Cluster2x2i
+# from ._aare import ClusterFileSink_Cluster3x3i, ClusterFileSink_Cluster2x2i
+
+from . import _aare
 import numpy as np
 
+_supported_cluster_sizes = [(2,2), (3,3), (5,5), (7,7), (9,9),]
+
+# def _get_class()
+
+def _type_to_char(dtype):
+    if dtype == np.int32:
+        return 'i'
+    elif dtype == np.float32:
+        return 'f'
+    elif dtype == np.float64:
+        return 'd'
+    else:
+        raise ValueError(f"Unsupported dtype: {dtype}. Only np.int32, np.float32, and np.float64 are supported.")
+
+def _get_class(name, cluster_size, dtype):
+    """
+    Helper function to get the class based on the name, cluster size, and dtype.
+    """
+    try:
+        class_name = f"{name}_Cluster{cluster_size[0]}x{cluster_size[1]}{_type_to_char(dtype)}"
+        cls = getattr(_aare, class_name)
+    except AttributeError:
+        raise ValueError(f"Unsupported combination of type and cluster size: {dtype}/{cluster_size} when requesting {class_name}")
+    return cls
+
+
+
 def ClusterFinder(image_size, cluster_size, n_sigma=5, dtype = np.int32, capacity = 1024):
     """
     Factory function to create a ClusterFinder object. Provides a cleaner syntax for 
     the templated ClusterFinder in C++.
     """
-    if dtype == np.int32 and cluster_size == (3,3):
-        return ClusterFinder_Cluster3x3i(image_size, n_sigma = n_sigma, capacity=capacity)
-    elif dtype == np.int32 and cluster_size == (2,2): 
-        return ClusterFinder_Cluster2x2i(image_size, n_sigma = n_sigma, capacity=capacity)
-    else:
-        #TODO! add the other formats
-        raise ValueError(f"Unsupported dtype: {dtype}. Only np.int32 is supported.")
+    cls = _get_class("ClusterFinder", cluster_size, dtype)
+    return cls(image_size, n_sigma=n_sigma, capacity=capacity)
+
 
 
 def ClusterFinderMT(image_size, cluster_size = (3,3), dtype=np.int32, n_sigma=5, capacity = 1024, n_threads = 3): 
@@ -25,15 +50,9 @@ def ClusterFinderMT(image_size, cluster_size = (3,3), dtype=np.int32, n_sigma=5,
     the templated ClusterFinderMT in C++.
     """
 
-    if dtype == np.int32 and cluster_size == (3,3):
-        return ClusterFinderMT_Cluster3x3i(image_size, n_sigma = n_sigma,
-                    capacity = capacity, n_threads = n_threads)
-    elif dtype == np.int32 and cluster_size == (2,2):
-        return ClusterFinderMT_Cluster2x2i(image_size, n_sigma = n_sigma,
-                    capacity = capacity, n_threads = n_threads)
-    else:
-        #TODO! add the other formats
-        raise ValueError(f"Unsupported dtype: {dtype}. Only np.int32 is supported.")
+    cls = _get_class("ClusterFinderMT", cluster_size, dtype)
+    return cls(image_size, n_sigma=n_sigma, capacity=capacity, n_threads=n_threads)
+
 
 
 def ClusterCollector(clusterfindermt, cluster_size = (3,3), dtype=np.int32): 
@@ -42,14 +61,8 @@ def ClusterCollector(clusterfindermt, cluster_size = (3,3), dtype=np.int32):
     the templated ClusterCollector in C++.
     """
 
-    if dtype == np.int32 and cluster_size == (3,3): 
-        return ClusterCollector_Cluster3x3i(clusterfindermt)
-    elif dtype == np.int32 and cluster_size == (2,2):
-        return ClusterCollector_Cluster2x2i(clusterfindermt)
-     
-    else: 
-        #TODO! add the other formats
-        raise ValueError(f"Unsupported dtype: {dtype}. Only np.int32 is supported.")
+    cls = _get_class("ClusterCollector", cluster_size, dtype)
+    return cls(clusterfindermt)
 
 def ClusterFileSink(clusterfindermt, cluster_file, dtype=np.int32): 
     """ 
@@ -57,11 +70,15 @@ def ClusterFileSink(clusterfindermt, cluster_file, dtype=np.int32):
     the templated ClusterCollector in C++.
     """
 
-    if dtype == np.int32 and clusterfindermt.cluster_size == (3,3): 
-        return ClusterFileSink_Cluster3x3i(clusterfindermt, cluster_file)
-    elif dtype == np.int32 and clusterfindermt.cluster_size == (2,2):
-        return ClusterFileSink_Cluster2x2i(clusterfindermt, cluster_file)
-     
-    else: 
-        #TODO! add the other formats
-        raise ValueError(f"Unsupported dtype: {dtype}. Only np.int32 is supported.")
+    cls = _get_class("ClusterFileSink", clusterfindermt.cluster_size, dtype)
+    return cls(clusterfindermt, cluster_file)
+
+
+def ClusterFile(fname, cluster_size=(3,3), dtype=np.int32):
+    """
+    Factory function to create a ClusterFile object. Provides a cleaner syntax for
+    the templated ClusterFile in C++.
+    """
+
+    cls = _get_class("ClusterFile", cluster_size, dtype)
+    return cls(fname)