Extend possible ways of Cuts construction: AddCut(s) (#139)

* extend possible ways of Cuts construction: AddCut(s), variadic in constructor...

* bugfix of variadic in Cuts constructor

* comment not working (yet) constructor

* apply clang-format

Author: lubynets

infra/Cuts.cpp

@@ -77,4 +77,15 @@ bool Cuts::Apply(const BranchChannel& ob) const {
   return true;
 }
 
+void Cuts::AddCut(const SimpleCut& cut) {
+  cuts_.emplace_back(cut);
+  branch_names_.insert(cut.GetBranches().begin(), cut.GetBranches().end());
+}
+
+void Cuts::AddCuts(const std::vector<SimpleCut>& cuts) {
+  for (auto& cut : cuts) {
+    AddCut(cut);
+  }
+}
+
 }// namespace AnalysisTree

infra/Cuts.hpp

@@ -48,6 +48,28 @@ class Cuts {
     }
   }
 
+  void AddCut(const SimpleCut& cut);
+
+  void AddCuts(const std::vector<SimpleCut>& cuts);
+
+  //  // Base case for variadic recursion (handles when there's just one argument left)
+  //  template<typename T>
+  //  void AddCuts(const T& t) {
+  //    AddCuts(t);  // Call the appropriate overload for a single argument (like std::vector<SimpleCut>)
+  //  }
+  //
+  //  // Recursive case for variadic template (multiple arguments)
+  //  template<typename T, typename... Args>
+  //  void AddCuts(const T& t, const Args&... args) {
+  //    AddCuts(t);
+  //    AddCuts(args...);
+  //  }
+  //
+  //  template<typename... Args> // TODO this constructor hangs. Needs debugging
+  //  Cuts(std::string name, Args... args) : name_(std::move(name)) {
+  //    AddCuts(args...);
+  //  }
+
   /**
    * @brief Evaluates all SimpleCuts
    * @tparam T type of data-object associated with TTree

infra/HelperFunctions.hpp

@@ -18,13 +18,13 @@ inline std::string ToStringWithPrecision(const T a_value, const int n) {
 
 inline std::vector<AnalysisTree::SimpleCut> CreateSliceCuts(const std::vector<float>& ranges, const std::string& cutNamePrefix, const std::string& branchFieldName) {
   std::vector<AnalysisTree::SimpleCut> sliceCuts;
-  for(int iRange=0; iRange<ranges.size()-1; iRange++) {
-    const std::string cutName = cutNamePrefix + ToStringWithPrecision(ranges.at(iRange), 2) + "_" + ToStringWithPrecision(ranges.at(iRange+1), 2);
-    sliceCuts.emplace_back(AnalysisTree::RangeCut(branchFieldName, ranges.at(iRange), ranges.at(iRange+1), cutName));
+  for (int iRange = 0; iRange < ranges.size() - 1; iRange++) {
+    const std::string cutName = cutNamePrefix + ToStringWithPrecision(ranges.at(iRange), 2) + "_" + ToStringWithPrecision(ranges.at(iRange + 1), 2);
+    sliceCuts.emplace_back(AnalysisTree::RangeCut(branchFieldName, ranges.at(iRange), ranges.at(iRange + 1), cutName));
   }
 
   return sliceCuts;
 }
 
-}
-#endif // ANALYSISTREE_INFRA_HELPER_FUNCTIONS_HPP
+}// namespace HelperFunctions
+#endif// ANALYSISTREE_INFRA_HELPER_FUNCTIONS_HPP

infra/SimpleCut.hpp

@@ -43,6 +43,14 @@ class SimpleCut {
     FillBranchNames();
   }
 
+  SimpleCut(const std::vector<Variable>& vars, std::function<bool(std::vector<double>&)> lambda, std::string title = "") : title_(std::move(title)),
+                                                                                                                           lambda_(std::move(lambda)) {
+    for (auto& var : vars) {
+      vars_.emplace_back(var);
+    }
+    FillBranchNames();
+  }
+
   /**
   * Constructor for range cut: min <= field <= max
   * @param variable_name name of the variable in format "branch.field"

infra/TaskManager.cpp

@@ -22,6 +22,7 @@ TaskManager* TaskManager::GetInstance() {
 
 void TaskManager::Init(const std::vector<std::string>& filelists, const std::vector<std::string>& in_trees) {
   assert(!is_init_);
+  std::cout << "TaskManager::Init()\n";
   is_init_ = true;
   read_in_tree_ = true;
   chain_ = new Chain(filelists, in_trees);
@@ -51,6 +52,7 @@ void TaskManager::InitTasks() {
 
 void TaskManager::Init() {
   assert(!is_init_);
+  std::cout << "TaskManager::Init()\n";
   is_init_ = true;
   fill_out_tree_ = true;