diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py b/Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py index 3de51f8f66d425ef125031c046ef1507620ce542..5b260c0091cf1cad42bfbf5195489b02934d9b15 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py +++ b/Trigger/TrigT1/TrigT1CaloMonitoring/python/JetEfficiencyMonitorAlgorithm.py @@ -6,9 +6,11 @@ def JetEfficiencyMonitoringConfig(flags): # get the component factory - used for getting the algorithms from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator - from AthenaConfiguration.Enums import Format - + from AthenaConfiguration.ComponentFactory import CompFactory result = ComponentAccumulator() + + + from AthenaConfiguration.Enums import Format ########################################################################### # Jet and particle flow config required for data POOL files except if is already an AOD if flags.Input.Format is Format.POOL and not flags.Input.isMC and not any(["AOD" in a for a in flags.Input.ProcessingTags]): @@ -32,8 +34,8 @@ def JetEfficiencyMonitoringConfig(flags): metCA.addEventAlgo(getMETMakerAlg('AntiKt4EMPFlow')) result.merge(metCA) ########################################################################### + # make the athena monitoring helper - from AthenaConfiguration.ComponentFactory import CompFactory from TrigT1CaloMonitoring.LVL1CaloMonitoringConfig import L1CaloMonitorCfgHelper helper = L1CaloMonitorCfgHelper(flags,CompFactory.JetEfficiencyMonitorAlgorithm,'JetEfficiencyMonAlg') groupName = 'JetEfficiencyMonitor' # the monitoring group name is also used for the package name @@ -189,7 +191,7 @@ def JetEfficiencyMonitoringConfig(flags): acc = helper.result() result.merge(acc) - print("flags.DQ.Environment = " +flags.DQ.Environment ) + print("flags.DQ.Environment = " + flags.DQ.Environment ) return result diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficiencyMonitorAlgorithm.cxx b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficiencyMonitorAlgorithm.cxx index 7b96a3badf856228372810b90a74c341f9cca185..07b41cdeb86b36fcd3f151c1cece3d1e16eb7fcf 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficiencyMonitorAlgorithm.cxx +++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficiencyMonitorAlgorithm.cxx @@ -39,7 +39,7 @@ StatusCode JetEfficiencyMonitorAlgorithm::initialize() { StatusCode JetEfficiencyMonitorAlgorithm::fillHistograms( const EventContext& ctx ) const { ATH_MSG_DEBUG("JetEfficiencyMonitorAlgorithm::fillHistograms"); std::vector<std::reference_wrapper<Monitored::IMonitoredVariable>> variables; - + // Retrieve Offline Jets from SG SG::ReadHandle<xAOD::JetContainer> jets(m_jetKey,ctx); if(!jets.isValid()){ @@ -65,6 +65,7 @@ StatusCode JetEfficiencyMonitorAlgorithm::fillHistograms( const EventContext& ct return StatusCode::SUCCESS; } + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// //DEFINITIONS and extracting variables from the python config file! diff --git a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficiencyMonitorAlgorithm.h b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficiencyMonitorAlgorithm.h index 25a1658efbf58248c895744421c64d8a3c3dba20..a1552e218c1bd7bfc5e4c8c0bdace2eb2c6d9fd9 100644 --- a/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficiencyMonitorAlgorithm.h +++ b/Trigger/TrigT1/TrigT1CaloMonitoring/src/JetEfficiencyMonitorAlgorithm.h @@ -6,16 +6,18 @@ #include "AthenaMonitoring/AthMonitorAlgorithm.h" #include "AthenaMonitoringKernel/Monitored.h" -#include "StoreGate/ReadHandleKey.h" + #include "AthenaKernel/Units.h" #include "FourMomUtils/P4Helpers.h" - +#include "StoreGate/ReadHandleKey.h" +#include "xAODJet/JetContainer.h" #include "xAODTrigger/gFexJetRoI.h" #include "xAODTrigger/gFexJetRoIContainer.h" #include "xAODTrigger/gFexGlobalRoI.h" #include "xAODTrigger/gFexGlobalRoIContainer.h" + // #include "TrigDecisionTool/TrigDecisionTool.h" //#include "TrigT1Interfaces/TrigT1CaloDefs.h" @@ -41,9 +43,8 @@ private: // container keys including steering parameter and description SG::ReadHandleKey<xAOD::JetContainer> m_jetKey{ this, "JetKey" , "AntiKt4EMPFlowJets", ""}; //offline jets - SG::ReadHandleKey<xAOD::JetContainer> m_LRjetKey{ this, "LRJetKey" , "AntiKt10UFOCSSKSoftDropBeta100Zcut10Jets", ""}; //offline LR jets + SG::ReadHandleKey<xAOD::JetContainer> m_LRjetKey{ this, "LRJetKey" , "HLT_AntiKt10EMPFlowJets_nojcalib_ftf", ""}; //offline LR jets SG::ReadHandleKey<xAOD::gFexJetRoIContainer> m_gFexSRJetContainerKey{ this, "mygFexSRJetRoIContainer" , "L1_gFexSRJetRoI" , ""}; //gfex SR jets SG::ReadHandleKey<xAOD::gFexJetRoIContainer> m_gFexLRJetContainerKey{ this, "mygFexLRJetRoIContainer" , "L1_gFexLRJetRoI" , ""}; //gfex LR jets - }; #endif \ No newline at end of file