diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx index 8058dfb41be6d2b3480cbd930e047130c746c1c1..df664aa3e5f44113d7ba458abbc7235298ac551b 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx +++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/Root/TopJetMETCPTools.cxx @@ -531,7 +531,7 @@ ICPJetUncertaintiesTool* JetMETCPTools::setupJetUncertaintiesTool(const std::string& name, const std::string& jet_def, const std::string& mc_type, - const bool& isMC, + bool isMC, const std::string& config_file, std::vector<std::string>* variables, const std::string& analysis_file, diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h index bfec8ed5d09235a16b67c2597f06e4dc161c5fc5..b751efcb275267a75fe591a01d02577e471b0e88 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h +++ b/PhysicsAnalysis/TopPhys/xAOD/TopCPTools/TopCPTools/TopJetMETCPTools.h @@ -105,7 +105,7 @@ class JetMETCPTools final : public asg::AsgTool { setupJetUncertaintiesTool(const std::string& name, const std::string& jet_def, const std::string& mc_type, - const bool& isMC, + bool isMC, const std::string& config_file, std::vector<std::string>* variables, const std::string& analysis_file = "", diff --git a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h index a0317d1b46fd92c7c32e320d8a6c8c658d156d37..f3bcdd42b13e65fa843a4d5963cff63901afd2b1 100644 --- a/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h +++ b/PhysicsAnalysis/TopPhys/xAOD/TopSystematicObjectMaker/TopSystematicObjectMaker/JetObjectCollectionMaker.h @@ -86,14 +86,12 @@ namespace top{ protected: // specify Systematic - virtual void specifiedSystematics( const std::set<std::string>& specifiedSystematics , const ToolHandle<ICPJetUncertaintiesTool>& tool , std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map , const std::string& modName , bool isLargeR = false); - // virtual void specifiedSystematics( const std::set<std::string>& specifiedSystematics , const ToolHandle<IJERSmearingTool>& tool , std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map ); + virtual void specifiedSystematics( const std::set<std::string>& specifiedSystematics , const ToolHandle<ICPJetUncertaintiesTool>& tool , std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map , const std::string& modName , bool isLargeR = false); StatusCode execute( const bool isLargeR, bool executeNominal ); StatusCode calibrate( const bool isLargeR ); virtual StatusCode applySystematic( ToolHandle<ICPJetUncertaintiesTool>& tool, const std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map , bool isLargeR = false); - // virtual StatusCode applySystematic( ToolHandle<IJERSmearingTool>& tool, const std::unordered_map<CP::SystematicSet,CP::SystematicSet>& map ); StatusCode printout( const bool isLargeR ); @@ -136,7 +134,6 @@ namespace top{ ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesToolLargeR_medium; ToolHandle<ICPJetUncertaintiesTool> m_jetUncertaintiesToolLargeR_weak; - // ToolHandle<IJERSmearingTool> m_jetJERSmearingTool; ToolHandle<IJetUpdateJvt> m_jetUpdateJvtTool; ToolHandle<IJetModifier> m_fjvtTool; @@ -153,7 +150,7 @@ namespace top{ systMap m_systMap_LargeR_strong; systMap m_systMap_LargeR_medium; systMap m_systMap_LargeR_weak; - // systMap m_systMap_JER; + typedef std::unordered_map<CP::SystematicSet,CP::SystematicSet>::const_iterator Itr; StatusCode decorateBJets(xAOD::Jet& jet);