diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategoryMT.py b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategoryMT.py index 36c5697f38361c15115c72504f4fec55df4870a9..fea0c10a7865bcb21a1049adcf8e5672c534e9c3 100644 --- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategoryMT.py +++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/python/TrigEgammaMonitCategoryMT.py @@ -32,7 +32,6 @@ monitoring_electron = [ ] monitoringTP_electron = [ - 'HLT_e60_lhmedium_gsf_L1EM22VHI', 'HLT_e60_lhmedium_L1EM22VHI', 'HLT_e60_lhmedium_L1eEM26M', 'HLT_e26_lhtight_ivarloose_L1EM22VHI', @@ -45,8 +44,6 @@ monitoringTP_electron = [ 'HLT_e26_lhtight_L1eEM26L', 'HLT_e26_lhtight_L1eEM26T', 'HLT_e26_lhtight_ivarmedium_L1EM22VHI', - 'HLT_e26_lhtight_gsf_L1EM22VHI', - 'HLT_e26_lhtight_gsf_ivarloose_L1EM22VHI', 'HLT_e26_lhtight_ivarloose_L1eEM26', 'HLT_e26_lhtight_ivarloose_L1eEM26M', 'HLT_e26_lhtight_ivarloose_L1eEM26T', @@ -75,13 +72,11 @@ validation_photon = [ validation_electron = [ 'HLT_e5_etcut_L1EM3', 'HLT_e5_lhtight_noringer_L1EM3', - 'HLT_e5_lhtight_gsf_L1EM3' ] validationTP_electron = [ 'HLT_e12_lhvloose_L1EM10VH', 'HLT_e17_lhvloose_L1EM15VHI', - 'HLT_e17_lhvloose_gsf_L1EM15VHI', 'HLT_e26_lhloose_L1EM15VH', 'HLT_e26_lhmedium_L1EM15VH', 'HLT_e26_lhtight_L1EM15VH', diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx index ffaddd7c1edad91de30a018b6374145640810471..18a18b34a8858aaa8df8cb8d3f71e7b3aa272ad1 100644 --- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx +++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorAnalysisAlgorithm.cxx @@ -427,8 +427,8 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillDistributions( const std::vector< s } // HLT Electron { - std::string key = match()->key("Electrons"); - if(info.gsf) key = match()->key("Electrons_GSF"); + std::string key = match()->key("Electrons_GSF"); + if(info.nogsf) key = match()->key("Electrons"); if(info.lrt) key = match()->key("Electrons_LRT"); std::vector el_vec; @@ -963,8 +963,8 @@ void TrigEgammaMonitorAnalysisAlgorithm::fillHLTElectronResolution(const std::st // Check for zero before filling ATH_MSG_DEBUG("Fill Resolution"); - std::string key = match()->key("Electrons"); - if(info.gsf) key = match()->key("Electrons_GSF"); + std::string key = match()->key("Electrons_GSF"); + if(info.nogsf) key = match()->key("Electrons"); if(info.lrt) key = match()->key("Electrons_LRT"); for ( const auto & pairObj : pairObjs ){ diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx index 5b49f08f8807b4e1069c56c1bb3a7982e5c565bd..f68dec67e012a4ef31f4c2a780759ee4528ec9df 100644 --- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx +++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.cxx @@ -226,9 +226,9 @@ asg::AcceptData TrigEgammaMonitorBaseAlgorithm::setAccept( const TrigCompositeUt if( info.etcut || info.idperf){// etcut or idperf passedEF = true; // since we dont run the preciseElectron step }else{ - std::string key = match()->key("Electrons"); + std::string key = match()->key("Electrons_GSF"); if(info.lrt) key = match()->key("Electrons_LRT"); - if(info.gsf) key = match()->key("Electrons_GSF"); + if(info.nogsf) key = match()->key("Electrons"); passedEF = match()->ancestorPassed(dec, trigger, key, condition); } @@ -598,7 +598,7 @@ void TrigEgammaMonitorBaseAlgorithm::setTrigInfo(const std::string& trigger){ // extra HLT information bool idperf; // Performance chain bool etcut; // Et cut only chain - bool gsf; // GSF chain + bool nogsf; // chain without gsf reconstruction bool lrt; // LRT chain std::string isolation; bool isolated; @@ -622,7 +622,7 @@ void TrigEgammaMonitorBaseAlgorithm::setTrigInfo(const std::string& trigger){ std::vector isoNames = {"ivarloose","ivarmedium","ivartight","icaloloose","icalomedium","icalotight"}; - bool gsf = false; + bool nogsf = false; bool lrt = false; bool etcut = false; bool idperf = false; @@ -662,7 +662,7 @@ void TrigEgammaMonitorBaseAlgorithm::setTrigInfo(const std::string& trigger){ // extra information - gsf = boost::contains(trigger,"gsf"); + nogsf = boost::contains(trigger,"nogsf"); lrt = boost::contains(trigger,"lrt"); for(auto& iso : isoNames){ @@ -688,14 +688,14 @@ void TrigEgammaMonitorBaseAlgorithm::setTrigInfo(const std::string& trigger){ ATH_MSG_INFO( "signature : " << signature); ATH_MSG_INFO( "etcut : " << (etcut?"Yes":"No")); ATH_MSG_INFO( "idperf : " << (idperf?"Yes":"No")); - ATH_MSG_INFO( "gsf : " << (gsf?"Yes":"No")); + ATH_MSG_INFO( "nogsf : " << (nogsf?"Yes":"No")); ATH_MSG_INFO( "lrt : " << (lrt?"Yes":"No")); ATH_MSG_INFO( "Isolation : " << isolation); ATH_MSG_INFO( "Isolated : " << (isolated?"Yes":"No")); ATH_MSG_INFO( "L1Seed : " << l1seed << " (Is Legacy? " << (l1legacy?"Yes":"No") << ")"); ATH_MSG_INFO("========================================================"); - TrigInfo info{l1legacy,l1seed,trigger,signature,threshold,pidname,idperf,etcut,gsf,lrt,isolation, isolated}; + TrigInfo info{l1legacy,l1seed,trigger,signature,threshold,pidname,idperf,etcut,nogsf,lrt,isolation, isolated}; m_trigInfo[trigger] = info; } diff --git a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h index 22d00a3e27e148c544d344d60baa9b41f62c5945..3a609820d129f4e5f0da1d5984792ba0a20decc5 100644 --- a/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h +++ b/Trigger/TrigMonitoring/TrigEgammaMonitoring/src/TrigEgammaMonitorBaseAlgorithm.h @@ -52,7 +52,7 @@ typedef struct _triginfo // extra HLT information bool idperf; // Performance chain bool etcut; // Et cut only chain - bool gsf; // GSF chain + bool nogsf; // GSF chain bool lrt; // LRT chain std::string isolation;