Merge branch 'main' into feature/cuda_clusterfinder

src/Fit.cpp

@@ -4,11 +4,11 @@
 #include "aare/Models.hpp"
 #include "aare/utils/par.hpp"
 #include "aare/utils/task.hpp"
+#include <array>
 #include <lmcurve2.h>
 #include <lmfit.hpp>
 #include <thread>
 #include <type_traits>
-#include <array>
 
 namespace aare {
 
@@ -97,8 +97,6 @@ NDArray<double, 3> fit_gaus(NDView<double, 1> x, NDView<double, 3> y,
     return result;
 }
 
-
-
 void fit_gaus(NDView<double, 1> x, NDView<double, 1> y, NDView<double, 1> y_err,
               NDView<double, 1> par_out, NDView<double, 1> par_err_out,
               double &chi2) {
@@ -278,7 +276,6 @@ NDArray<double, 3> fit_pol1(NDView<double, 1> x, NDView<double, 3> y,
 
 // ~~ S-CURVES ~~
 
-
 // - No error
 NDArray<double, 1> fit_scurve(NDView<double, 1> x, NDView<double, 1> y) {
     NDArray<double, 1> result = model::RisingScurve::estimate_par(x, y);
@@ -371,8 +368,6 @@ void fit_scurve(NDView<double, 1> x, NDView<double, 3> y,
 
 // SCURVE2 ---
 
-
-
 // - No error
 NDArray<double, 1> fit_scurve2(NDView<double, 1> x, NDView<double, 1> y) {
     NDArray<double, 1> result = model::FallingScurve::estimate_par(x, y);
@@ -463,5 +458,4 @@ void fit_scurve2(NDView<double, 1> x, NDView<double, 3> y,
     RunInParallel(process, tasks);
 }
 
-
 } // namespace aare

src/RawMasterFile.cpp

@@ -199,8 +199,7 @@ std::optional<ROI> RawMasterFile::roi() const {
     }
 
     if (m_rois->empty()) {
-        throw std::runtime_error(LOCATION +
-                                 "Zero ROIs in metadata.");
+        throw std::runtime_error(LOCATION + "Zero ROIs in metadata.");
     }
 
     if (m_rois.value().size() > 1) {