diff --git a/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/TrigGlobalEfficiencyCorrection/TrigGlobalEfficiencyCorrectionTool.h b/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/TrigGlobalEfficiencyCorrection/TrigGlobalEfficiencyCorrectionTool.h index 8d45ddc7f3398f5e93cfa153f3392d8c44a033a4..1206e4c4d2948a09d40c7c2aac4650d5517fde05 100644 --- a/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/TrigGlobalEfficiencyCorrection/TrigGlobalEfficiencyCorrectionTool.h +++ b/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/TrigGlobalEfficiencyCorrection/TrigGlobalEfficiencyCorrectionTool.h @@ -68,7 +68,7 @@ private: }; struct TagDecorator { - SG::AuxElement::Decorator<char> decorator; + SG::AuxElement::ConstAccessor<char> decorator; std::size_t hash; bool suffixed; TagDecorator(const std::string& name, std::size_t hash, bool suffixed) : decorator(name), hash(hash), suffixed(suffixed) {} @@ -134,7 +134,7 @@ private: bool m_validTrigMatchTool; //! std::vector<TagDecorator> m_leptonTagDecorators; //! - SG::AuxElement::Decorator<unsigned int> m_runNumberDecorator; //! + SG::AuxElement::ConstAccessor<unsigned int> m_runNumberDecorator; //! std::unique_ptr<TrigGlobEffCorr::Calculator> m_calculator; //! template<typename Key> using flat_set = boost::container::flat_set<Key>; diff --git a/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/examples/TrigGlobEffCorrExample1.cxx b/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/examples/TrigGlobEffCorrExample1.cxx index 14a2d6663d6458a8d45efe8468c17bf83b5678c4..f8465ec45962727d5a81b814f14e5d4da78cee61 100644 --- a/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/examples/TrigGlobEffCorrExample1.cxx +++ b/Trigger/TrigAnalysis/TrigGlobalEfficiencyCorrection/examples/TrigGlobEffCorrExample1.cxx @@ -164,17 +164,17 @@ int main(int argc, char* argv[]) std::map<std::string, std::string> triggers; triggers["2015"] = "mu20_iloose_L1MU15_OR_mu50" - // "|| mu18_mu8noL1" temporary: disabled as mu8noL1 efficiencies are not available + "|| mu18_mu8noL1" "|| e24_lhmedium_L1EM20VH_OR_e60_lhmedium_OR_e120_lhloose" "|| 2e12_lhloose_L12EM10VH"; triggers["2016"] = "mu26_ivarmedium_OR_mu50" - // "|| mu22_mu8noL1" temporary: disabled as mu8noL1 efficiencies are not available + "|| mu22_mu8noL1" "|| e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0" "|| 2e17_lhvloose_nod0"; std::string only2e24 = "mu26_ivarmedium_OR_mu50" - // "|| mu22_mu8noL1" temporary: disabled as mu8noL1 efficiencies are not available + "|| mu22_mu8noL1" "|| e26_lhtight_nod0_ivarloose_OR_e60_lhmedium_nod0_OR_e140_lhloose_nod0" "|| 2e24_lhvloose_nod0"; std::string nominal = only2e24 + "|| 2e17_lhvloose_nod0_L12EM15VHI"; @@ -271,7 +271,7 @@ int main(int argc, char* argv[]) if(pt < 10e3f) continue; /// also count leptons above single-lepton trigger threshold if(pt >= (runNumber>290000? 27.3e3f : 21e3f)) ++nTrig1L; - // and count muons suitable for the hard leg of the dimuon trigger + /// and count muons suitable for the hard leg of the dimuon trigger if(pt >= (runNumber>290000? 23e3f : 19e3f)) ++nTrig2mu; myTriggeringMuons.push_back(muon); @@ -280,7 +280,7 @@ int main(int argc, char* argv[]) /// Events must contain enough leptons to trigger if(nTrig1L==0 /// single-lepton trigger && myTriggeringElectrons.size()<2 /// dielectron - /*&& (nTrig2mu==0 || myTriggeringMuons.size()<2)*/) /// dimuon + && (nTrig2mu==0 || myTriggeringMuons.size()<2)) /// dimuon { continue; }