extend possible ways of Cuts construction: AddCut(s), variadic in con…

…structor...
lubynets · Feb 10, 2025 · e0bc82c · e0bc82c
1 parent 33be63b
commit e0bc82c
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/infra/Cuts.cpp b/infra/Cuts.cpp
@@ -77,4 +77,27 @@ 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);
+  }
+}
+
+template<typename... Args>
+Cuts::Cuts(std::string name, Args... args) : name_(std::move(name)) {
+//  AddCuts(std::forward<Args>(args)...);
+  AddCuts(args...);
+}
+
+template<typename T, typename... Args>
+void Cuts::AddCuts(const T& t, const Args&... args) {
+  AddCuts(t);
+  AddCuts(args...);
+}
+
 }// namespace AnalysisTree
diff --git a/infra/Cuts.hpp b/infra/Cuts.hpp
@@ -48,6 +48,16 @@ class Cuts {
     }
   }
 
+  template<typename... Args>
+  explicit Cuts(std::string name, Args... args);
+
+  void AddCut(const SimpleCut& cut);
+
+  void AddCuts(const std::vector<SimpleCut>& cuts);
+
+  template<typename T, typename... Args>
+  void AddCuts(const T& t, const Args&... args);
+
   /**
    * @brief Evaluates all SimpleCuts
    * @tparam T type of data-object associated with TTree

diff --git a/infra/SimpleCut.hpp b/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"