From 9c58410fe3b44ac046ae382bfcacc50208dd48b8 Mon Sep 17 00:00:00 2001
From: Peter Onyisi <ponyisi@utexas.edu>
Date: Sun, 1 Dec 2019 06:43:44 +0100
Subject: [PATCH] Small fixes for properties
---
.../src/JetTagMonitorAlgorithm.cxx | 27 +++++++++----------
.../src/JetTagMonitorAlgorithm.h | 2 --
.../tauMonitoring/src/tauMonitorAlgorithm.cxx | 7 -----
.../tauMonitoring/tauMonitorAlgorithm.h | 2 +-
4 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.cxx b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.cxx
index 3c18bc9293d..5c92349656c 100755
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.cxx
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.cxx
@@ -40,7 +40,6 @@ JetTagMonitorAlgorithm::JetTagMonitorAlgorithm( const std::string& name, ISvcLoc
, m_jetContainerKey("AntiKt4EMTopoJets")
, m_muonContainerKey("Muons")
, m_electronContainerKey("Electrons")
- , m_trigDecTool("Trig::TrigDecisionTool/TrigDecisionTool")
//add here other containers
{
@@ -91,7 +90,6 @@ StatusCode JetTagMonitorAlgorithm::initialize() {
ATH_CHECK(m_electronContainerKey.initialize());
ATH_CHECK(m_vertContainerKey.initialize());
- ATH_CHECK(m_EventInfoKey.initialize());
ATH_CHECK(m_trackContainerKey.initialize());
return AthMonitorAlgorithm::initialize();
@@ -235,20 +233,21 @@ StatusCode JetTagMonitorAlgorithm::fillHistograms( const EventContext& ctx ) con
//removed october
bool useTriggerDecisionTool = true; //how to implement in r22 python script?
+ const auto& trigDecTool = getTrigDecisionTool();
- if (useTriggerDecisionTool && m_trigDecTool != 0) { // only apply trigger selection if bool is true (false for express stream) and trigDecTool is ok
+ if (useTriggerDecisionTool && trigDecTool != 0) { // only apply trigger selection if bool is true (false for express stream) and trigDecTool is ok
//ERROR for tool without explicit name
//NEED TO:
//find a way to put trigger name on python script (not hardcoded, by variable)
//find a way to put wildcards * for 20-99 GeV electron and muon triggers
- ATH_MSG_DEBUG("TrigDecTool: " << m_trigDecTool);
- ATH_MSG_DEBUG("m_trigDecTool->isPassed(" << m_ElectronTrigger_201X << "): " << m_trigDecTool->isPassed(m_ElectronTrigger_201X));
- ATH_MSG_DEBUG("m_trigDecTool->isPassed(" << m_MuonTrigger_201X << "): " << m_trigDecTool->isPassed(m_MuonTrigger_201X));
- ATH_MSG_DEBUG("m_trigDecTool->isPassed(" << m_JetTrigger_201X << "): " << m_trigDecTool->isPassed(m_JetTrigger_201X));
+ ATH_MSG_DEBUG("TrigDecTool: " << trigDecTool);
+ ATH_MSG_DEBUG("trigDecTool->isPassed(" << m_ElectronTrigger_201X << "): " << trigDecTool->isPassed(m_ElectronTrigger_201X));
+ ATH_MSG_DEBUG("trigDecTool->isPassed(" << m_MuonTrigger_201X << "): " << trigDecTool->isPassed(m_MuonTrigger_201X));
+ ATH_MSG_DEBUG("trigDecTool->isPassed(" << m_JetTrigger_201X << "): " << trigDecTool->isPassed(m_JetTrigger_201X));
- // auto chainGroup = m_trigDecTool->getChainGroup(".*");
+ // auto chainGroup = trigDecTool->getChainGroup(".*");
// for (auto & trig : chainGroup->getListOfTriggers()) {
// ATH_MSG_DEBUG("Found trigger " << trig);
// }
@@ -258,30 +257,30 @@ StatusCode JetTagMonitorAlgorithm::fillHistograms( const EventContext& ctx ) con
fill(tool,Trigger_CutFlow);
// 201X menu triggers
- if (m_trigDecTool->isPassed(m_ElectronTrigger_201X)) {
+ if (trigDecTool->isPassed(m_ElectronTrigger_201X)) {
Trigger_CutFlow = 1;
fill(tool,Trigger_CutFlow);
}
- if (m_trigDecTool->isPassed(m_MuonTrigger_201X)) {
+ if (trigDecTool->isPassed(m_MuonTrigger_201X)) {
Trigger_CutFlow = 2;
fill(tool,Trigger_CutFlow);
}
- if (m_trigDecTool->isPassed(m_ElectronTrigger_201X) || m_trigDecTool->isPassed(m_MuonTrigger_201X)){
+ if (trigDecTool->isPassed(m_ElectronTrigger_201X) || trigDecTool->isPassed(m_MuonTrigger_201X)){
Trigger_CutFlow = 3;
fill(tool,Trigger_CutFlow);
}
- if (m_trigDecTool->isPassed(m_ElectronTrigger_201X) && m_trigDecTool->isPassed(m_MuonTrigger_201X)){
+ if (trigDecTool->isPassed(m_ElectronTrigger_201X) && trigDecTool->isPassed(m_MuonTrigger_201X)){
Trigger_CutFlow = 4;
fill(tool,Trigger_CutFlow);
}
- if (m_trigDecTool->isPassed(m_JetTrigger_201X)){
+ if (trigDecTool->isPassed(m_JetTrigger_201X)){
Trigger_CutFlow = 5;
fill(tool,Trigger_CutFlow);
}
//IMPORTANT
// Require e/mu trigger to have unbiased sample of jets (and larger fraction of b-jets since many of these are ttbar events)
- if (!m_trigDecTool->isPassed(m_ElectronTrigger_201X) && !m_trigDecTool->isPassed(m_MuonTrigger_201X)) // 201X menu triggers
+ if (!trigDecTool->isPassed(m_ElectronTrigger_201X) && !trigDecTool->isPassed(m_MuonTrigger_201X)) // 201X menu triggers
return StatusCode::SUCCESS;
}
diff --git a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.h b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.h
index 22c13332cc4..083fa4298f1 100755
--- a/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.h
+++ b/PhysicsAnalysis/JetTagging/JetTagMonitoring/src/JetTagMonitorAlgorithm.h
@@ -39,7 +39,6 @@ class JetTagMonitorAlgorithm : public AthMonitorAlgorithm {
virtual StatusCode fillHistograms( const EventContext& ctx ) const override;
private:
- SG::ReadHandleKey<xAOD::EventInfo> m_EventInfoKey{this,"EventInfoKey","EventInfo","RHK for xAOD::EventInfo"};
SG::ReadHandleKey<xAOD::VertexContainer> m_vertContainerKey{this,"VerticesKey","PrimaryVertices","RHK for primary veritces"};
SG::ReadHandleKey<xAOD::TrackParticleContainer> m_trackContainerKey{this,"TracksKey","InDetTrackParticles","RHK for ID tracks"};
@@ -102,7 +101,6 @@ class JetTagMonitorAlgorithm : public AthMonitorAlgorithm {
double getMVweight(const xAOD::Jet *jet) const;
Jet_t getTaggabilityLabel(const xAOD::Jet *jet) const;
- ToolHandle< Trig::TrigDecisionTool > m_trigDecTool;
std::string m_ElectronTrigger_201X;
std::string m_MuonTrigger_201X;
std::string m_JetTrigger_201X;
diff --git a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
index 878a11339fe..97ec5e64de8 100644
--- a/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
+++ b/Reconstruction/tauMonitoring/src/tauMonitorAlgorithm.cxx
@@ -8,13 +8,6 @@ tauMonitorAlgorithm::tauMonitorAlgorithm( const std::string& name, ISvcLocator*
:AthMonitorAlgorithm(name,pSvcLocator)
,m_doRandom(true)
{
- declareProperty("TauRecContainer", m_TauContainerKey="TauJets");
-
- declareProperty("etaMin", m_etaMin=-1.);
- declareProperty("etaMax", m_etaMax=2.6);
-
- declareProperty("kinGroupName", m_kinGroupName="tauMonKinGroupBA");
-
}
diff --git a/Reconstruction/tauMonitoring/tauMonitoring/tauMonitorAlgorithm.h b/Reconstruction/tauMonitoring/tauMonitoring/tauMonitorAlgorithm.h
index d86d07159ee..43d82a586df 100644
--- a/Reconstruction/tauMonitoring/tauMonitoring/tauMonitorAlgorithm.h
+++ b/Reconstruction/tauMonitoring/tauMonitoring/tauMonitorAlgorithm.h
@@ -28,7 +28,7 @@ private:
std::map<std::string,int> m_cGroups1;
std::map<std::string,std::map<std::string,int>> m_cGroups2;
- SG::ReadHandleKey<xAOD::TauJetContainer> m_TauContainerKey;
+ SG::ReadHandleKey<xAOD::TauJetContainer> m_TauContainerKey {this, "TauRecContainer", "TauJets"};
Gaudi::Property<float> m_etaMin {this, "etaMin", -1.};
Gaudi::Property<float> m_etaMax {this, "etaMax", 3.0};
--
GitLab