diff --git a/multilep/plugins/multilep.cc b/multilep/plugins/multilep.cc old mode 100644 new mode 100755 index a8745669..ea662691 --- a/multilep/plugins/multilep.cc +++ b/multilep/plugins/multilep.cc @@ -54,9 +54,9 @@ multilep::multilep(const edm::ParameterSet& iConfig): prescalesToken = consumes(iConfig.getParameter("prescales")); } leptonAnalyzer = new LeptonAnalyzer(iConfig, this); - photonAnalyzer = new PhotonAnalyzer(iConfig, this); + photonAnalyzer = new PhotonAnalyzer(iConfig, this); jetAnalyzer = new JetAnalyzer(iConfig, this); - genAnalyzer = new GenAnalyzer(iConfig, this); + genAnalyzer = new GenAnalyzer(iConfig, this); lheAnalyzer = new LheAnalyzer(iConfig, this); susyMassAnalyzer= new SUSYMassAnalyzer(iConfig, this, lheAnalyzer); @@ -130,14 +130,14 @@ void multilep::beginRun(const edm::Run& iRun, edm::EventSetup const& iSetup){ void multilep::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup){ edm::Handle> mets; iEvent.getByToken(metToken, mets); edm::Handle> vertices; iEvent.getByToken(vtxToken, vertices); - if(!isData) lheAnalyzer->analyze(iEvent); // needs to be run before selection to get correct uncertainties on MC xsection - if(isSUSY) susyMassAnalyzer->analyze(iEvent); // needs to be run after LheAnalyzer, but before all other models + if(!isData) lheAnalyzer->analyze(iEvent); // needs to be run before selection to get correct uncertainties on MC xsection + if(isSUSY) susyMassAnalyzer->analyze(iEvent); // needs to be run after LheAnalyzer, but before all other models if(!vertices->size()) return; // don't consider 0 vertex events - if(!isData) genAnalyzer->analyze(iEvent); // needs to be run before photonAnalyzer for matching purposes + if(!isData) genAnalyzer->analyze(iEvent); // needs to be run before photonAnalyzer for matching purposes // also needs to run before leptonAnalyzer to save gen-matching info... - if(!leptonAnalyzer->analyze(iEvent, iSetup, *(vertices->begin()))) + if(!leptonAnalyzer->analyze(iEvent, iSetup, *(vertices->begin()))) return; // returns false if doesn't pass skim condition, so skip event in such case if(!photonAnalyzer->analyze(iEvent)) return;