Merge branch 'main' into developer

CMakeLists.txt

@@ -104,6 +104,7 @@ if(AARE_FETCH_LMFIT)
         )
     endif()
     
+
     #Disable what we don't need from lmfit
     set(BUILD_TESTING OFF CACHE BOOL "")
     set(LMFIT_CPPTEST OFF CACHE BOOL "")

conda-recipe/meta.yaml

@@ -5,6 +5,7 @@ package:
 
 
 
+
 source:
   path: ..
 

include/aare/ClusterFile.hpp

@@ -10,6 +10,7 @@
 
 namespace aare {
 
+
 //TODO! Legacy enums, migrate to enum class
 typedef enum {
     cBottomLeft = 0,
@@ -90,6 +91,8 @@ class ClusterFile {
      */
     ClusterVector<int32_t> read_clusters(size_t n_clusters);
 
+    ClusterVector<int32_t> read_clusters(size_t n_clusters, ROI roi);
+
     /**
      * @brief Read a single frame from the file and return the clusters. The
      * cluster vector will have the frame number set.
@@ -146,5 +149,4 @@ Eta2 calculate_eta2(Cluster3x3 &cl);
 Eta2 calculate_eta2(Cluster2x2 &cl);
 
 
-
 } // namespace aare

pyproject.toml

@@ -8,6 +8,7 @@ version = "2025.4.1"
 
 
 
+
 [tool.scikit-build]
 cmake.verbose = true
 

python/src/cluster_file.hpp

@@ -31,6 +31,11 @@ void define_cluster_file_io_bindings(py::module &m) {
                 auto v = new ClusterVector<int32_t>(self.read_clusters(n_clusters));
                 return v;
              },py::return_value_policy::take_ownership)
+        .def("read_clusters",
+                [](ClusterFile &self, size_t n_clusters, ROI roi) {
+                   auto v = new ClusterVector<int32_t>(self.read_clusters(n_clusters, roi));
+                   return v;
+                },py::return_value_policy::take_ownership)
         .def("read_frame",
              [](ClusterFile &self) {
                 auto v = new ClusterVector<int32_t>(self.read_frame());

src/ClusterFile.cpp

@@ -147,7 +147,6 @@ ClusterVector<int32_t> ClusterFile::read_clusters_without_cut(size_t n_clusters)
 }
 
 
-
 ClusterVector<int32_t> ClusterFile::read_clusters_with_cut(size_t n_clusters) {
     ClusterVector<int32_t> clusters(3,3);
     clusters.reserve(n_clusters);