Integration of new uncertainty scheme for Tau ID/ES of MC/Embedding

analysis_configurations/unittest/producers/scalefactors.py

@@ -130,7 +130,7 @@
 ############################
 Tau_1_VsJetTauID_SF = ExtendedVectorProducer(
     name="Tau_1_VsJetTauID_SF",
-    call="""physicsobject::tau::scalefactor::Id_vsJet_tt(
+    call="""physicsobject::tau::scalefactor::Id_vsJet(
         {df}, 
         correctionManager, 
         {output},
@@ -215,7 +215,7 @@
 )
 Tau_2_VsJetTauID_tt_SF = ExtendedVectorProducer(
     name="Tau_2_VsJetTauID_tt_SF",
-    call="""physicsobject::tau::scalefactor::Id_vsJet_tt(
+    call="""physicsobject::tau::scalefactor::Id_vsJet(
         {df}, 
         correctionManager, 
         {output},

include/taus.hxx

@@ -69,6 +69,40 @@ ROOT::RDF::RNode PtCorrectionMC_genuineTau(
     const std::string &correction_name, const std::string &id_algorithm,
     const std::string &variation_dm0, const std::string &variation_dm1,
     const std::string &variation_dm10, const std::string &variation_dm11);
+ROOT::RDF::RNode PtCorrectionMC_genuineTau(
+    ROOT::RDF::RNode df,
+    correctionManager::CorrectionManager &correction_manager,
+    const std::string &outputname, const std::string &pt,
+    const std::string &eta, const std::string &decay_mode,
+    const std::string &gen_match, const std::string &es_file,
+    const std::string &correction_name, const std::string &id_algorithm,
+    const std::string &variation_dm0_pt20to40, const std::string &variation_dm0_pt40toInf,
+    const std::string &variation_dm1_pt20to40, const std::string &variation_dm1_pt40toInf,
+    const std::string &variation_dm10_pt20to40, const std::string &variation_dm10_pt40toInf,
+    const std::string &variation_dm11_pt20to40, const std::string &variation_dm11_pt40toInf);
+ROOT::RDF::RNode PtCorrectionMC_genuineTau(
+    ROOT::RDF::RNode df,
+    correctionManager::CorrectionManager &correction_manager,
+    const std::string &outputname, const std::string &pt,
+    const std::string &eta, const std::string &decay_mode,
+    const std::string &gen_match, const std::string &es_file,
+    const std::string &correction_name, const std::string &id_algorithm,
+    const std::string &wp, const std::string &vsele_wp,
+    const std::string &variation_dm0, const std::string &variation_dm1,
+    const std::string &variation_dm10, const std::string &variation_dm11);
+
+ROOT::RDF::RNode PtCorrectionMC_genuineTau(
+    ROOT::RDF::RNode df,
+    correctionManager::CorrectionManager &correction_manager,
+    const std::string &outputname, const std::string &pt,
+    const std::string &eta, const std::string &decay_mode,
+    const std::string &gen_match, const std::string &es_file,
+    const std::string &correction_name, const std::string &id_algorithm,
+    const std::string &wp, const std::string &vsele_wp,
+    const std::string &variation_dm0_pt20to40, const std::string &variation_dm0_pt40toInf,
+    const std::string &variation_dm1_pt20to40, const std::string &variation_dm1_pt40toInf,
+    const std::string &variation_dm10_pt20to40, const std::string &variation_dm10_pt40toInf,
+    const std::string &variation_dm11_pt20to40, const std::string &variation_dm11_pt40toInf);
 
 namespace quantity {
 ROOT::RDF::RNode IDFlag_v9(ROOT::RDF::RNode df, const std::string &outputname,
@@ -97,7 +131,7 @@ Id_vsJet_lt(ROOT::RDF::RNode df,
             const std::string &sf_vsjet_tau40to500,
             const std::string &sf_vsjet_tau500to1000,
             const std::string &sf_vsjet_tau1000toinf);
-ROOT::RDF::RNode Id_vsJet_tt(
+ROOT::RDF::RNode Id_vsJet(
     ROOT::RDF::RNode df,
     correctionManager::CorrectionManager &correction_manager,
     const std::string &outputname, 
@@ -106,20 +140,33 @@ ROOT::RDF::RNode Id_vsJet_tt(
     const std::string &sf_file, const std::string &sf_name,
     const std::string &wp, const std::string &vsele_wp,
     const std::string &sf_dependence,
-    const std::string &sf_vsjet_tauDM0,
-    const std::string &sf_vsjet_tauDM1, 
-    const std::string &sf_vsjet_tauDM10,
-    const std::string &sf_vsjet_tauDM11);
-ROOT::RDF::RNode
-Id_vsEle(ROOT::RDF::RNode df,
-         correctionManager::CorrectionManager &correction_manager,
-         const std::string &outputname,
-         const std::string &eta,
-         const std::string &gen_match, 
-         const std::string &sf_file, const std::string &sf_name,
-         const std::string &wp, 
-         const std::string &sf_vsele_barrel,
-         const std::string &sf_vsele_endcap);
+    const std::string &variation_dm0,
+    const std::string &variation_dm1, 
+    const std::string &variation_dm10,
+    const std::string &variation_dm11);
+ROOT::RDF::RNode Id_vsJet(
+    ROOT::RDF::RNode df,
+    correctionManager::CorrectionManager &correction_manager,
+    const std::string &outputname, 
+    const std::string &pt, const std::string &decay_mode,
+    const std::string &gen_match, 
+    const std::string &sf_file, const std::string &sf_name,
+    const std::string &wp, const std::string &vsele_wp,
+    const std::string &sf_dependence,
+    const std::string &variation_dm0_pt20to40, const std::string &variation_dm0_pt40toInf,
+    const std::string &variation_dm1_pt20to40, const std::string &variation_dm1_pt40toInf,
+    const std::string &variation_dm10_pt20to40, const std::string &variation_dm10_pt40toInf,
+    const std::string &variation_dm11_pt20to40, const std::string &variation_dm11_pt40toInf);
+ROOT::RDF::RNode Id_vsEle(
+    ROOT::RDF::RNode df,
+    correctionManager::CorrectionManager &correction_manager,
+    const std::string &outputname,
+    const std::string &eta,
+    const std::string &gen_match, 
+    const std::string &sf_file, const std::string &sf_name,
+    const std::string &wp, 
+    const std::string &sf_vsele_barrel,
+    const std::string &sf_vsele_endcap);
 ROOT::RDF::RNode
 Id_vsEle(ROOT::RDF::RNode df,
     correctionManager::CorrectionManager &correction_manager,
@@ -167,4 +214,4 @@ Trigger(ROOT::RDF::RNode df,
 } // end namespace scalefactor
 } // end namespace tau
 } // end namespace physicsobject
-#endif /* GUARD_TAUS_H */
+#endif /* GUARD_TAUS_H */

src/embedding.cxx

@@ -448,7 +448,7 @@ namespace scalefactor {
  * should be calculated
  * @param wp working point of the vsJet ID
  * @param vsele_wp working point of the vsEle ID
- * @param sf_dependence variable dependence of the scale factor, opions are "pt" or "dm"
+ * @param sf_dependence variable dependence of the scale factor, options are "pt" or "dm"
  * @param variation_pt20to25 name of the scale factor variation for \f$20 \leq p_T <25\f$ GeV, "nom" for nominal
  * and "up"/"down" the up/down variation
  * @param variation_pt25to30 name of the scale factor variation for \f$25 \leq p_T <30\f$ GeV, "nom" for nominal
@@ -462,8 +462,8 @@ namespace scalefactor {
  *
  * @return a new dataframe containing the new column
  *
- * @note The only differnce to the `physicsobject::tau::scalefactor::Id_vsJet_lt` function,
- * which is used for simulated samples, is the \f$p_T\f$ binning of the variations.
+ * @warning This function is depricated (used for legacy H(tt) analysis). It is
+ * recommended to use `physicsobject::tau::scalefactor::Id_vsJet` instead.
  */
 ROOT::RDF::RNode
 Id_vsJet_lt(ROOT::RDF::RNode df,