Merge branch 'main' into validation_error

KIT-CMS · Apr 12, 2024 · 63125c5 · 63125c5
2 parents a146aca + 75911f5
commit 63125c5
Show file tree

Hide file tree

Showing 10 changed files with 358 additions and 3 deletions.
diff --git a/data/embedding/embeddingselection_2016postVFPUL.json.gz b/data/embedding/embeddingselection_2016postVFPUL.json.gz
diff --git a/data/embedding/embeddingselection_2016preVFPUL.json.gz b/data/embedding/embeddingselection_2016preVFPUL.json.gz
diff --git a/data/embedding/embeddingselection_2017UL.json.gz b/data/embedding/embeddingselection_2017UL.json.gz
diff --git a/data/embedding/embeddingselection_2018UL.json.gz b/data/embedding/embeddingselection_2018UL.json.gz
diff --git a/data/embedding/muon_2016postVFPUL.json.gz b/data/embedding/muon_2016postVFPUL.json.gz
diff --git a/data/embedding/muon_2016preVFPUL.json.gz b/data/embedding/muon_2016preVFPUL.json.gz
diff --git a/data/embedding/muon_2017UL.json.gz b/data/embedding/muon_2017UL.json.gz
diff --git a/data/embedding/muon_2018UL.json.gz b/data/embedding/muon_2018UL.json.gz
diff --git a/include/pairselection.hxx b/include/pairselection.hxx
@@ -48,7 +48,9 @@ auto PairSelectionAlgo(const float &mindeltaR);
 namespace leptonic {
 auto ElMuPairSelectionAlgo(const float &mindeltaR);
 auto PairSelectionAlgo(const float &mindeltaR);
+auto PairSelectionAlgoOSPreferred(const float &mindeltaR);
 auto ZBosonPairSelectionAlgo(const float &mindeltaR);
+auto ZBosonPairSelectionAlgoOSPreferred(const float &mindeltaR);
 } // namespace leptonic
 namespace mutau {
 
@@ -90,10 +92,19 @@ ROOT::RDF::RNode PairSelection(ROOT::RDF::RNode df,
                                const std::string &pairname,
                                const float &mindeltaR);
 
+ROOT::RDF::RNode PairSelectionOSPreferred(ROOT::RDF::RNode df,
+                        const std::vector<std::string> &input_vector,
+                        const std::string &pairname, const float &mindeltaR);
+
 ROOT::RDF::RNode
 ZBosonPairSelection(ROOT::RDF::RNode df,
                     const std::vector<std::string> &input_vector,
                     const std::string &pairname, const float &mindeltaR);
+
+ROOT::RDF::RNode ZBosonPairSelectionOSPreferred(
+           ROOT::RDF::RNode df, const std::vector<std::string> &input_vector,
+           const std::string &pairname, const float &mindeltaR);
+
 } // end namespace mumu
 namespace elel {
 
@@ -108,4 +119,4 @@ ZBosonPairSelection(ROOT::RDF::RNode df,
                     const std::string &pairname, const float &mindeltaR);
 } // end namespace elel
 } // namespace ditau_pairselection
-#endif /* GUARD_PAIRSELECTION_H */
+#endif /* GUARD_PAIRSELECTION_H */
diff --git a/src/pairselection.cxx b/src/pairselection.cxx