From b566c5f856074a8f6f69f53ff3759b6c1e33a054 Mon Sep 17 00:00:00 2001 From: Brent Stone Date: Thu, 16 Apr 2020 16:47:51 -0600 Subject: [PATCH] remove LSF and deep_W tagging info from trees --- TreeFillers/interface/FatJetFiller.h | 8 +-- TreeFillers/python/fatJetFiller_cff.py | 12 ++-- TreeFillers/src/FatJetFiller.cc | 81 +++++++++++++------------- 3 files changed, 51 insertions(+), 50 deletions(-) diff --git a/TreeFillers/interface/FatJetFiller.h b/TreeFillers/interface/FatJetFiller.h index f499162..d6bbadf 100644 --- a/TreeFillers/interface/FatJetFiller.h +++ b/TreeFillers/interface/FatJetFiller.h @@ -92,20 +92,20 @@ class FatJetFiller : public BaseFiller { std::string subjetType = ""; bool isPuppi = false; bool addBTaggingInfo = false; - bool addWTaggingInfo = false; - bool addLSFInfo = false; +// bool addWTaggingInfo = false; +// bool addLSFInfo = false; std::string jetDef ; std::string subjetDef; edm::EDGetTokenT > token_jets; edm::EDGetTokenT token_genJets; - edm::EDGetTokenT> token_mva; +// edm::EDGetTokenT> token_mva; float minJetPT = 0; edm::Handle > han_jets; edm::Handle han_genJets; - edm::Handle> han_mva; +// edm::Handle> han_mva; edm::ESHandle jetCorParameters; std::unique_ptr jetCorUnc; diff --git a/TreeFillers/python/fatJetFiller_cff.py b/TreeFillers/python/fatJetFiller_cff.py index 4f74ab1..51a0cf0 100644 --- a/TreeFillers/python/fatJetFiller_cff.py +++ b/TreeFillers/python/fatJetFiller_cff.py @@ -12,9 +12,9 @@ jetType = cms.string('AK8PFPuppi'), subjetType = cms.string('AK4PFPuppi'), addBTaggingInfo = cms.bool(False), - addWTaggingInfo = cms.bool(True), - addLSFInfo = cms.bool(False), - mva = cms.InputTag('packedPatJetsAK8PFPuppiNoLepSoftDroplepInJetMVAValueMap'), +# addWTaggingInfo = cms.bool(True), +# addLSFInfo = cms.bool(False), +# mva = cms.InputTag('packedPatJetsAK8PFPuppiNoLepSoftDroplepInJetMVAValueMap'), ) ak8PuppiFatJetFiller = cms.PSet( ignore = cms.bool(False), @@ -28,7 +28,7 @@ jetType = cms.string('AK8PFPuppi'), subjetType = cms.string('AK4PFPuppi'), addBTaggingInfo = cms.bool(True), - addWTaggingInfo = cms.bool(False), - addLSFInfo = cms.bool(True), - mva = cms.InputTag('packedPatJetsAK8PFPuppiwLepSoftDroplepInJetMVAValueMap'), +# addWTaggingInfo = cms.bool(False), +# addLSFInfo = cms.bool(True), +# mva = cms.InputTag('packedPatJetsAK8PFPuppiwLepSoftDroplepInJetMVAValueMap'), ) diff --git a/TreeFillers/src/FatJetFiller.cc b/TreeFillers/src/FatJetFiller.cc index a871a5f..ffe0b94 100644 --- a/TreeFillers/src/FatJetFiller.cc +++ b/TreeFillers/src/FatJetFiller.cc @@ -22,8 +22,8 @@ FatJetFiller::FatJetFiller(const edm::ParameterSet& fullParamSet, const std::str fillGenJets =cfg.getParameter("fillGenJets"); addBTaggingInfo=cfg.getParameter("addBTaggingInfo"); - addWTaggingInfo=cfg.getParameter("addWTaggingInfo"); - addLSFInfo =cfg.getParameter("addLSFInfo"); +// addWTaggingInfo=cfg.getParameter("addWTaggingInfo"); +// addLSFInfo =cfg.getParameter("addLSFInfo"); token_jets =cc.consumes >(cfg.getParameter("jets")); minJetPT = cfg.getParameter("minJetPT"); if(!isRealData && fillGenJets) @@ -60,24 +60,25 @@ FatJetFiller::FatJetFiller(const edm::ParameterSet& fullParamSet, const std::str data.addVector(deep_MDHbb ,branchName,"jets_N","deep_MDHbb" ,10); data.addVector(deep_Hbb ,branchName,"jets_N","deep_Hbb" ,10); } - if(addWTaggingInfo){ - data.addVector(deep_W ,branchName,"jets_N","deep_W" ,10); - } - if(addLSFInfo){ - token_mva=cc.consumes>( - cfg.getParameter("mva")); - data.addVector(ecfN2 ,branchName,"jets_N","ecfN2" ,8); - data.addVector(ecfM2 ,branchName,"jets_N","ecfM2" ,8); - data.addVector(ecfD2 ,branchName,"jets_N","ecfD2" ,8); - data.addVector(ecfN3 ,branchName,"jets_N","ecfN3" ,8); - data.addVector(ecfU3 ,branchName,"jets_N","ecfU3" ,8); - data.addVector(ecfU2 ,branchName,"jets_N","ecfU2" ,8); - data.addVector(tau3 ,branchName,"jets_N","tau3" ,8); - data.addVector(tau4 ,branchName,"jets_N","tau4" ,8); - data.addVector(lsf3 ,branchName,"jets_N","lsf3" ,8); - data.addVector(dRLep ,branchName,"jets_N","dRLep" ,8); - data.addVector(lepInJetMVA,branchName,"jets_N","lepInJetMVA",8); - } +// if(addWTaggingInfo){ +// data.addVector(deep_W ,branchName,"jets_N","deep_W" ,10); +// } +// if(addLSFInfo){ +// token_mva=cc.consumes>( +// cfg.getParameter("mva")); +// data.addVector(ecfN2 ,branchName,"jets_N","ecfN2" ,8); +// data.addVector(ecfM2 ,branchName,"jets_N","ecfM2" ,8); +// data.addVector(ecfD2 ,branchName,"jets_N","ecfD2" ,8); +// data.addVector(ecfN3 ,branchName,"jets_N","ecfN3" ,8); +// data.addVector(ecfU3 ,branchName,"jets_N","ecfU3" ,8); +// data.addVector(ecfU2 ,branchName,"jets_N","ecfU2" ,8); +// data.addVector(tau3 ,branchName,"jets_N","tau3" ,8); +// data.addVector(tau4 ,branchName,"jets_N","tau4" ,8); +// data.addVector(lsf3 ,branchName,"jets_N","lsf3" ,8); +// data.addVector(dRLep ,branchName,"jets_N","dRLep" ,8); +// data.addVector(lepInJetMVA,branchName,"jets_N","lepInJetMVA",8); +// } + data.addVector(tau1 ,branchName,"jets_N","tau1" ,8); data.addVector(tau2 ,branchName,"jets_N","tau2" ,8); data.addVector(sdMass_z0p15 ,branchName,"jets_N","sdMass_z0p15" ,10); @@ -120,9 +121,9 @@ void FatJetFiller::load(const edm::Event& iEvent, const edm::EventSetup& iSetup) if(!isRealData && fillGenJets) iEvent.getByToken(token_genJets ,han_genJets ); - if(addLSFInfo){ - iEvent.getByToken(token_mva ,han_mva ); - } +// if(addLSFInfo){ +// iEvent.getByToken(token_mva ,han_mva ); +// } if(!isRealData){ iSetup.get().get(jetType.c_str(),jetCorParameters); @@ -179,29 +180,29 @@ void FatJetFiller::setValues(){ deep_Hbb ->push_back(jet.bDiscriminator( "pfDeepBoostedDiscriminatorsJetTags:HbbvsQCD")); } - if(addWTaggingInfo){ - deep_W ->push_back(jet.bDiscriminator( - "pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:WvsQCD")); - } +// if(addWTaggingInfo){ +// deep_W ->push_back(jet.bDiscriminator( +// "pfMassDecorrelatedDeepBoostedDiscriminatorsJetTags:WvsQCD")); +// } tau1->push_back(jet.userFloat("NjettinessAK8"+jetDef+":tau1")); tau2->push_back(jet.userFloat("NjettinessAK8"+jetDef+":tau2")); sdMass_z0p15->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropMassZ0p15")); sdMass_z0p05->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropMassZ0p05")); - if(addLSFInfo){ - ecfN2 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfN2b1")); - ecfM2 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfM2b1")); - ecfD2 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfD2b1")); - ecfN3 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfN3b1")); - ecfU3 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfU3b1")); - ecfU2 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfU2b1")); - tau3 ->push_back(jet.userFloat("NjettinessAK8"+jetDef+":tau3")); - tau4 ->push_back(jet.userFloat("NjettinessAK8"+jetDef+":tau4")); - lsf3 ->push_back(jet.userFloat("lsf3")); - dRLep ->push_back(jet.userFloat("dRLep")); - lepInJetMVA->push_back((*han_mva)[jetRef]); - } +// if(addLSFInfo){ +// ecfN2 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfN2b1")); +// ecfM2 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfM2b1")); +// ecfD2 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfD2b1")); +// ecfN3 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfN3b1")); +// ecfU3 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfU3b1")); +// ecfU2 ->push_back(jet.userFloat("ak8PFJets"+jetDef+"SoftDropecfValueMap:ecfU2b1")); +// tau3 ->push_back(jet.userFloat("NjettinessAK8"+jetDef+":tau3")); +// tau4 ->push_back(jet.userFloat("NjettinessAK8"+jetDef+":tau4")); +// lsf3 ->push_back(jet.userFloat("lsf3")); +// dRLep ->push_back(jet.userFloat("dRLep")); +// lepInJetMVA->push_back((*han_mva)[jetRef]); +// } if(!isRealData){