diff --git a/YggdrasilTreeMaker/plugins/YggdrasilTreeMaker.cc b/YggdrasilTreeMaker/plugins/YggdrasilTreeMaker.cc index 6a9bccb..526d3a5 100644 --- a/YggdrasilTreeMaker/plugins/YggdrasilTreeMaker.cc +++ b/YggdrasilTreeMaker/plugins/YggdrasilTreeMaker.cc @@ -845,7 +845,7 @@ YggdrasilTreeMaker::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe std::vector rawJets = miniAODhelper.GetUncorrectedJets( pfJets_ID ); // std::vector jetsNoMu = miniAODhelper.RemoveOverlaps(selectedMuons_loose, rawJets_ID); // std::vector jetsNoEle = miniAODhelper.RemoveOverlaps(selectedElectrons_loose, jetsNoMu); - std::vector correctedJets_noSys = miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup); + std::vector correctedJets_noSys = miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, genjetCollection ); std::vector selectedJets_noSys_unsorted = miniAODhelper.GetSelectedJets(correctedJets_noSys, 20., 5.0, jetID::none, '-' ); std::vector selectedJets_tag_noSys_unsorted = miniAODhelper.GetSelectedJets( correctedJets_noSys, 30., 2.4, jetID::none, 'M' ); @@ -1265,7 +1265,7 @@ YggdrasilTreeMaker::analyze(const edm::Event& iEvent, const edm::EventSetup& iSe /// //////// - std::vector correctedJets = ( !(iSys>=5 && iSys<=8) ) ? correctedJets_noSys : miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, iSysType); + std::vector correctedJets = ( !(iSys>=5 && iSys<=8) ) ? correctedJets_noSys : miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, genjetCollection , iSysType); std::vector selectedJets_unsorted = ( !(iSys>=5 && iSys<=8) ) ? selectedJets_noSys_unsorted : miniAODhelper.GetSelectedJets(correctedJets, 20., 5.0 , jetID::none, '-' ); @@ -1353,7 +1353,7 @@ n_fatjets++; // pat::MET correctedMET = pfmet->front();//miniAODhelper.GetCorrectedMET( pfmets.at(0), pfJets_forMET, iSysType ); std::vector oldJetsForMET = miniAODhelper.GetSelectedJets(*pfjets, 0., 999, jetID::jetMETcorrection, '-' ); std::vector oldJetsForMET_uncorr = miniAODhelper.GetUncorrectedJets(oldJetsForMET); - std::vector newJetsForMET = miniAODhelper.GetCorrectedJets(oldJetsForMET_uncorr, iEvent, iSetup, iSysType); + std::vector newJetsForMET = miniAODhelper.GetCorrectedJets(oldJetsForMET_uncorr, iEvent, iSetup, genjetCollection, iSysType); std::vector newMETs = miniAODhelper.CorrectMET(oldJetsForMET, newJetsForMET, *pfmet); pat::MET correctedMET = newMETs.at(0); @@ -1620,9 +1620,9 @@ n_fatjets++; const bool doJES = true; const bool doJER = false; - std::vector jet_JESNOMI = miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, sysType::NA , doJES, doJER ); - std::vector jet_JESUP = miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, sysType::JESup , doJES, doJER ); - std::vector jet_JESDOWN = miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, sysType::JESdown, doJES, doJER ); + std::vector jet_JESNOMI = miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, genjetCollection , sysType::NA , doJES, doJER ); + std::vector jet_JESUP = miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, genjetCollection , sysType::JESup , doJES, doJER ); + std::vector jet_JESDOWN = miniAODhelper.GetCorrectedJets(rawJets, iEvent, iSetup, genjetCollection , sysType::JESdown, doJES, doJER ); if( nJet_ge_one ){ const double eta1 = selection.jets().at(0)->Eta();