Skip to content

Commit

Permalink
remove LSF and deep_W tagging info from trees
Browse files Browse the repository at this point in the history
  • Loading branch information
@brentstone
brentstone committed Apr 16, 2020
1 parent 0ae154b commit b566c5f
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 50 deletions.
8 changes: 4 additions & 4 deletions TreeFillers/interface/FatJetFiller.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::vector<pat::Jet> > token_jets;
edm::EDGetTokenT<reco::GenJetCollection> token_genJets;
edm::EDGetTokenT<edm::ValueMap<float>> token_mva;
// edm::EDGetTokenT<edm::ValueMap<float>> token_mva;
float minJetPT = 0;

edm::Handle<std::vector<pat::Jet> > han_jets;
edm::Handle<reco::GenJetCollection> han_genJets;
edm::Handle<edm::ValueMap<float>> han_mva;
// edm::Handle<edm::ValueMap<float>> han_mva;

edm::ESHandle<JetCorrectorParametersCollection> jetCorParameters;
std::unique_ptr<JetCorrectionUncertainty> jetCorUnc;
Expand Down
12 changes: 6 additions & 6 deletions TreeFillers/python/fatJetFiller_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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'),
)
81 changes: 41 additions & 40 deletions TreeFillers/src/FatJetFiller.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ FatJetFiller::FatJetFiller(const edm::ParameterSet& fullParamSet, const std::str

fillGenJets =cfg.getParameter<bool>("fillGenJets");
addBTaggingInfo=cfg.getParameter<bool>("addBTaggingInfo");
addWTaggingInfo=cfg.getParameter<bool>("addWTaggingInfo");
addLSFInfo =cfg.getParameter<bool>("addLSFInfo");
// addWTaggingInfo=cfg.getParameter<bool>("addWTaggingInfo");
// addLSFInfo =cfg.getParameter<bool>("addLSFInfo");
token_jets =cc.consumes<std::vector<pat::Jet> >(cfg.getParameter<edm::InputTag>("jets"));
minJetPT = cfg.getParameter<double>("minJetPT");
if(!isRealData && fillGenJets)
Expand Down Expand Up @@ -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<edm::ValueMap<float>>(
cfg.getParameter<edm::InputTag>("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<edm::ValueMap<float>>(
// cfg.getParameter<edm::InputTag>("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);
Expand Down Expand Up @@ -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<JetCorrectionsRecord>().get(jetType.c_str(),jetCorParameters);
Expand Down Expand Up @@ -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){
Expand Down

0 comments on commit b566c5f

Please sign in to comment.