From 1c3374a5955c1be8cdd858df31e5b6b33d9efdc0 Mon Sep 17 00:00:00 2001
From: Zachary Louis Marshall <zach.marshall@cern.ch>
Date: Tue, 17 Jan 2017 08:08:54 +0100
Subject: [PATCH] Removing electron-jet ghost matching; rel21 jet calib only in
2.6 (QuickAna-00-01-30)
* Removing electron-jet ghost matching
* rel21 only in 2.6, not in 2.5
* Tagging: QuickAna-00-01-30
2017-01-15 Zach Marshall <ZLMarshall@lbl.gov>
* Fixing jet config typo
* Tagging: QuickAna-00-01-29
2017-01-13 Zach Marshall <ZLMarshall@lbl.gov>
* Ghost jet-electron matching only for 2.4.X series
* Updating to R21 config for JES
* Updating JES recommendations
2016-12-22 Zach Marshall <ZLMarshall@lbl.gov>
* Adding electron ghost association for new MET recommendations
* Updating jet calibrations to Moriond17 recommendations. Not changing
uncertainties until strongly reduced set is available.
2016-12-13 Zach Marshall <ZLMarshall@lbl.gov>
* Switching the order of the jet calibration systematics and JVT calculation
...
(Long ChangeLog diff - truncated)
---
.../TopPhys/QuickAna/Root/JetTool.cxx | 24 ++++++++++++-------
.../TopPhys/QuickAna/Root/TriggerTool.cxx | 2 ++
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx
index b32c96a0a33..0fc0f5171ef 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/JetTool.cxx
@@ -43,13 +43,19 @@ namespace
const char* btagAlgDefault = "MV2c20";
const std::string bTagCalibFile =
"xAODBTaggingEfficiency/13TeV/2016-Winter-13TeV-MC15-CDI-March10_v1.root";
- const char *jesFile = "JES_2015dataset_recommendation_Feb2016.config";
+ const char *jesFile = "JES_data2016_data2015_Recommendation_Dec2016.config";
const std::string uncertConfigFile = "JES_2015/Moriond2016/JES2015_SR_Scenario1.config";
+#elif ROOTCORE_RELEASE_SERIES <= 25
+ const char* btagAlgDefault = "MV2c10";
+ const std::string bTagCalibFile =
+ "xAODBTaggingEfficiency/13TeV/2016-20_7-13TeV-MC15-CDI-2016-11-25_v1.root";
+ const char *jesFile = "JES_data2016_data2015_Recommendation_Dec2016.config";
+ const std::string uncertConfigFile = "JES_2015/ICHEP2016/JES2015_SR_Scenario1.config";
#else
const char* btagAlgDefault = "MV2c10";
const std::string bTagCalibFile =
- "xAODBTaggingEfficiency/13TeV/2016-20_7-13TeV-MC15-CDI-July12_v1.root";
- const char *jesFile = "JES_MC15cRecommendation_May2016.config";
+ "xAODBTaggingEfficiency/13TeV/2016-20_7-13TeV-MC15-CDI-2016-11-25_v1.root";
+ const char *jesFile = "JES_MC15cRecommendation_May2016_rel21.config";
const std::string uncertConfigFile = "JES_2015/ICHEP2016/JES2015_SR_Scenario1.config";
#endif
}
@@ -224,6 +230,12 @@ namespace ana
// jet calibration
QA_CHECK_CUT( cut_calibration_tool, m_calibration_tool->applyCorrection(jet) );
+ // jet energy scale uncertainties
+ QA_CHECK_CUT( cut_uncertainties_tool, m_uncertainties_tool->applyCorrection(jet) );
+
+ // jet resolution smearing
+ QA_CHECK_CUT( cut_smearing_tool, m_smearing_tool->applyCorrection(jet) );
+
// JVT Recalculation after calibration
float jvt = m_jvt_tool->updateJvt(jet);
// Update "Jvt" of the jet - required by the MET tool
@@ -256,12 +268,6 @@ namespace ana
jet.auxdecor<char>("IsBjet") = isbjet;
}
- // jet energy scale uncertainties
- QA_CHECK_CUT( cut_uncertainties_tool, m_uncertainties_tool->applyCorrection(jet) );
-
- // jet resolution smearing
- QA_CHECK_CUT( cut_smearing_tool, m_smearing_tool->applyCorrection(jet) );
-
// We only clean, by default, jets that might've passed our JVT selection.
// This is too hard-coded, ugly.
bool is_clean = ( jet.pt() < 20.*GeV || (jet.pt()<60.*GeV && !jvt_pass) ||
diff --git a/PhysicsAnalysis/TopPhys/QuickAna/Root/TriggerTool.cxx b/PhysicsAnalysis/TopPhys/QuickAna/Root/TriggerTool.cxx
index adac970443c..4b1a5e80432 100644
--- a/PhysicsAnalysis/TopPhys/QuickAna/Root/TriggerTool.cxx
+++ b/PhysicsAnalysis/TopPhys/QuickAna/Root/TriggerTool.cxx
@@ -104,12 +104,14 @@ namespace ana
ATH_CHECK (m_mu_trig_sf2015.setProperty("MuonQuality", m_muon_wp));
ATH_CHECK (m_mu_trig_sf2015.setProperty("Isolation", m_muon_iso_wp));
ATH_CHECK (m_mu_trig_sf2015.setProperty("Year", "2015"));
+ ATH_CHECK (m_mu_trig_sf2015.setProperty("AllowZeroSF", true));
ATH_CHECK (m_mu_trig_sf2015.initialize());
registerTool(&*m_mu_trig_sf2015);
ATH_CHECK (ASG_MAKE_ANA_TOOL (m_mu_trig_sf2016, CP::MuonTriggerScaleFactors));
ATH_CHECK (m_mu_trig_sf2016.setProperty("MuonQuality", m_muon_wp));
ATH_CHECK (m_mu_trig_sf2016.setProperty("Isolation", m_muon_iso_wp));
+ ATH_CHECK (m_mu_trig_sf2016.setProperty("AllowZeroSF", true));
ATH_CHECK (m_mu_trig_sf2016.initialize());
registerTool(&*m_mu_trig_sf2016);
--
GitLab