Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move back to pre-UL version (102X) and fix bugs #68

Open
wants to merge 2 commits into
base: pre-Ultra-Legacy_RunII_dev
Choose a base branch
from
Open

Move back to pre-UL version (102X) and fix bugs #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6551cf
Move back to pre-UL version (102X) and fix bugs
youyingli Mar 8, 2020
f8f4024
Add Puppi MET correction
youyingli Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions interface/JetNtuplizer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class JetNtuplizer : public NtuplizerBase

const std::string _jetname;
const std::string _jettype;
const std::string _jetidversion;
const std::string _jecversion;
const edm::EDGetToken _rhotoken;
const edm::EDGetToken _vtxtoken;
Expand All @@ -59,6 +60,12 @@ class JetNtuplizer : public NtuplizerBase
std::string UserFloatName() const;
std::string UserFloatPrefix() const;


/*******************************************************************************
* Jet useful function
*******************************************************************************/
bool GetJetID( const pat::Jet& jet, std::string version, std::string level ) const;

/*******************************************************************************
* Fat jet related functions
*******************************************************************************/
Expand Down
15 changes: 12 additions & 3 deletions interface/format.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,9 @@ class JetInfoBranches
Float_t NEF [MAX_JETS];
Float_t NHF [MAX_JETS];
Float_t MUF [MAX_JETS];
Bool_t JetIDLOOSE [MAX_JETS];
Bool_t JetIDTIGHT [MAX_JETS];
Bool_t JetIDTIGHTLEPVETO [MAX_JETS];
Float_t PtCorrRaw [MAX_JETS];
Float_t PtCorrL2 [MAX_JETS];
Float_t PtCorrL3 [MAX_JETS];
Expand Down Expand Up @@ -586,6 +589,9 @@ class JetInfoBranches
root->Branch( ( name+".NEF" ).c_str(), NEF, ( name+".NEF["+name+".Size]/F" ).c_str() );
root->Branch( ( name+".NHF" ).c_str(), NHF, ( name+".NHF["+name+".Size]/F" ).c_str() );
root->Branch( ( name+".MUF" ).c_str(), MUF, ( name+".MUF["+name+".Size]/F" ).c_str() );
root->Branch( ( name+".JetIDLOOSE" ).c_str(), JetIDLOOSE, ( name+".JetIDLOOSE["+name+".Size]/O" ).c_str() );
root->Branch( ( name+".JetIDTIGHT" ).c_str(), JetIDTIGHT, ( name+".JetIDTIGHT["+name+".Size]/O" ).c_str() );
root->Branch( ( name+".JetIDTIGHTLEPVETO" ).c_str(), JetIDTIGHTLEPVETO, ( name+".JetIDTIGHTLEPVETO["+name+".Size]/O" ).c_str() );
root->Branch( ( name+".PtCorrRaw" ).c_str(), PtCorrRaw, ( name+".PtCorrRaw["+name+".Size]/F" ).c_str() );
root->Branch( ( name+".PtCorrL2" ).c_str(), PtCorrL2, ( name+".PtCorrL2["+name+".Size]/F" ).c_str() );
root->Branch( ( name+".PtCorrL3" ).c_str(), PtCorrL3, ( name+".PtCorrL3["+name+".Size]/F" ).c_str() );
Expand Down Expand Up @@ -696,6 +702,9 @@ class JetInfoBranches
root->SetBranchAddress( ( name+".NEF" ).c_str(), NEF );
root->SetBranchAddress( ( name+".NHF" ).c_str(), NHF );
root->SetBranchAddress( ( name+".MUF" ).c_str(), MUF );
root->SetBranchAddress( ( name+".JetIDLOOSE" ).c_str(), JetIDLOOSE );
root->SetBranchAddress( ( name+".JetIDTIGHT" ).c_str(), JetIDTIGHT );
root->SetBranchAddress( ( name+".JetIDTIGHTLEPVETO" ).c_str(), JetIDTIGHTLEPVETO );
root->SetBranchAddress( ( name+".PtCorrRaw" ).c_str(), PtCorrRaw );
root->SetBranchAddress( ( name+".PtCorrL2" ).c_str(), PtCorrL2 );
root->SetBranchAddress( ( name+".PtCorrL3" ).c_str(), PtCorrL3 );
Expand Down Expand Up @@ -917,7 +926,7 @@ class LepInfoBranches
Float_t ElTrackNormalizedChi2 [MAX_LEPTONS];
Int_t ElNTrackLayersWMeasurement [MAX_LEPTONS];
Int_t ElTrackNHits [MAX_LEPTONS];
Int_t NumberOfExpectedInnerHits [MAX_LEPTONS];
Int_t NumberOfExpectedMissingInnerHits [MAX_LEPTONS];
Int_t ElClassification [MAX_LEPTONS];
Float_t ElFBrem [MAX_LEPTONS];
Int_t ElNumberOfBrems [MAX_LEPTONS];
Expand Down Expand Up @@ -1087,7 +1096,7 @@ class LepInfoBranches
root->Branch( ( name+".ElTrackNormalizedChi2" ).c_str(), ElTrackNormalizedChi2, ( name+".ElTrackNormalizedChi2["+name+".Size]/F" ).c_str() );
root->Branch( ( name+".ElNTrackLayersWMeasurement" ).c_str(), ElNTrackLayersWMeasurement, ( name+".ElNTrackLayersWMeasurement["+name+".Size]/I" ).c_str() );
root->Branch( ( name+".ElTrackNHits" ).c_str(), ElTrackNHits, ( name+".ElTrackNHits["+name+".Size]/I" ).c_str() );
root->Branch( ( name+".NumberOfExpectedInnerHits" ).c_str(), NumberOfExpectedInnerHits, ( name+".NumberOfExpectedInnerHits["+name+".Size]/I" ).c_str() );
root->Branch( ( name+".NumberOfExpectedMissingInnerHits" ).c_str(),NumberOfExpectedMissingInnerHits,( name+".NumberOfExpectedMissingInnerHits["+name+".Size]/I" ).c_str() );
root->Branch( ( name+".ElClassification" ).c_str(), ElClassification, ( name+".ElClassification["+name+".Size]/I" ).c_str() );
root->Branch( ( name+".ElFBrem" ).c_str(), ElFBrem, ( name+".ElFBrem["+name+".Size]/F" ).c_str() );
root->Branch( ( name+".ElNumberOfBrems" ).c_str(), ElNumberOfBrems, ( name+".ElNumberOfBrems["+name+".Size]/I" ).c_str() );
Expand Down Expand Up @@ -1257,7 +1266,7 @@ class LepInfoBranches
root->SetBranchAddress( ( name+".ElTrackNormalizedChi2" ).c_str(), ElTrackNormalizedChi2 );
root->SetBranchAddress( ( name+".ElNTrackLayersWMeasurement" ).c_str(), ElNTrackLayersWMeasurement );
root->SetBranchAddress( ( name+".ElTrackNHits" ).c_str(), ElTrackNHits );
root->SetBranchAddress( ( name+".NumberOfExpectedInnerHits" ).c_str(), NumberOfExpectedInnerHits );
root->SetBranchAddress( ( name+".NumberOfExpectedMissingInnerHits" ).c_str(),NumberOfExpectedMissingInnerHits );
root->SetBranchAddress( ( name+".ElClassification" ).c_str(), ElClassification );
root->SetBranchAddress( ( name+".ElFBrem" ).c_str(), ElFBrem );
root->SetBranchAddress( ( name+".ElNumberOfBrems" ).c_str(), ElNumberOfBrems );
Expand Down
77 changes: 52 additions & 25 deletions production/bprimeKit_cfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,34 +71,58 @@
# For settings, see the bprimeKit/python/jettoolbox_settings.py
#-------------------------------------------------------------------------------
print '\nBeginning jet toolbox setup.....\n'
from bpkFrameWork.bprimeKit.jettoolbox_settings import *
jettoolbox_settings( process, not mysetting.isData )
from bpkFrameWork.bprimeKit.jetmet_settings import *
jet_settings( process, not mysetting.isData )
print '\nFinished jet toolbox setup.....\n'

print '\nBeginning met setup.....\n'
met_settings( process, mysetting.isData, mysetting.Year == '2017' )
print '\n\nFinished met setup.....\n'
#-------------------------------------------------------------------------------
# Settings for Egamma Identification and Energy Correction bug fixing
#-------------------------------------------------------------------------------
# ref : https://twiki.cern.ch/twiki/bin/view/CMS/EgammaMiniAODV2#2017_MiniAOD_V2
#from RecoEgamma.EgammaTools.EgammaPostRecoTools import setupEgammaPostRecoSeq
#setupEgammaPostRecoSeq(
# process,
# runVID = True,
# runEnergyCorrections = True if mysetting.Year == '2017' else False,
# era = '2017-Nov17ReReco' if mysetting.Year == '2017' else '2016-Legacy'
# )
# ref : https://twiki.cern.ch/twiki/bin/view/CMS/EgammaPostRecoRecipes#106X
from EgammaUser.EgammaPostRecoTools.EgammaPostRecoTools import setupEgammaPostRecoSeq

Era = ''
if mysetting.Year == '2016':
Era = '2016-Legacy'
elif mysetting.Year == '2017':
Era = '2017-Nov17ReReco'
elif mysetting.Year == '2018':
Era = '2018-Prompt'

fall17V2PhoIDModules = [
'RecoEgamma.PhotonIdentification.Identification.mvaPhotonID_Fall17_94X_V2_cff',
'RecoEgamma.PhotonIdentification.Identification.cutBasedPhotonID_Fall17_94X_V2_cff'
]
fall17V2EleIDModules = [
'RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Fall17_94X_V2_cff',
'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_Fall17_noIso_V2_cff',
'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_Fall17_iso_V2_cff',
'RecoEgamma.ElectronIdentification.Identification.heepElectronID_HEEPV70_cff'
]

setupEgammaPostRecoSeq(
process,
runVID = True,
eleIDModules = fall17V2EleIDModules,
phoIDModules = fall17V2PhoIDModules,
runEnergyCorrections = True,
era = Era
)

#-------------------------------------------------------------------------------
# Settings for MET bug fixing
# Level 1 ECAL prefiring
#-------------------------------------------------------------------------------
# ref : https://twiki.cern.ch/twiki/bin/viewauth/CMS/MissingETUncertaintyPrescription#Instructions_for_9_4_X_X_9_for_2
#from PhysicsTools.PatUtils.tools.runMETCorrectionsAndUncertainties import runMetCorAndUncFromMiniAOD
#runMetCorAndUncFromMiniAOD (
# process,
# isData = mysetting.isData,
# fixEE2017 = True,
# fixEE2017Params = {'userawPt': True, 'ptThreshold':50.0, 'minEtaThreshold':2.65, 'maxEtaThreshold': 3.139},
# postfix = "ModifiedMET"
# )
# ref : https://twiki.cern.ch/twiki/bin/viewauth/CMS/L1ECALPrefiringWeightRecipe
from PhysicsTools.PatUtils.l1ECALPrefiringWeightProducer_cfi import l1ECALPrefiringWeightProducer
process.prefiringweight = l1ECALPrefiringWeightProducer.clone(
DataEra = cms.string('2017BtoF' if mysetting.Year == '2017' else '2016BtoH'),
UseJetEMPt = cms.bool(False),
PrefiringRateSystematicUncty = cms.double(0.2),
SkipWarnings = False
)

#-------------------------------------------------------------------------------
# Extra MET filter for 2017 and 2018
Expand Down Expand Up @@ -142,14 +166,17 @@
# process.SimpleMemoryCheck = cms.Service('SimpleMemoryCheck',ignoreTotal = cms.untracked.int32(1) )

process.externalSequence = cms.Sequence()
#if ( mysetting.Year == '2017' ):
# process.externalSequence *= process.fullPatMetSequenceModifiedMET
if ( mysetting.Year == '2017' or mysetting.Year == '2018' ):
if mysetting.Year == '2016' or mysetting.Year == '2017':
if not mysetting.isData:
process.externalSequence *= process.prefiringweight

if mysetting.Year == '2017' or mysetting.Year == '2018':
process.externalSequence *= process.ecalBadCalibReducedMINIAODFilter

process.Path = cms.Path(
# process.egammaPostRecoSeq*
process.externalSequence*
process.egammaPostRecoSeq*
process.JetToolBoxSequence*
process.MetSequence*
process.externalSequence*
process.bprimeKit
)
50 changes: 28 additions & 22 deletions python/Ntuplizer16_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
evtgenbase = cms.PSet(
rhosrc = rhosrc,
rhonofastjetsrc = rhonofastjetsrc,
metsrc = cms.InputTag('slimmedMETs'),
metsrc = cms.InputTag('slimmedMETsUpdated'),
puppimetsrc = cms.InputTag('slimmedMETsPuppi'),
#puppimetsrc = cms.InputTag('slimmedMETsPuppiUpdated'),
pusrc = cms.InputTag('slimmedAddPileupInfo'),
beamspotsrc = beamspotsrc,
prefwgtsrc = cms.InputTag('prefiringweight:nonPrefiringProb'),
Expand Down Expand Up @@ -136,39 +137,44 @@
# Jet settings
#-------------------------------------------------------------------------------
jetcommon = cms.PSet(
jetname=cms.string('JetInfo'),
jettype=cms.string(''),
muonsrc=cms.InputTag('slimmedMuons'),
vtxsrc=vtxsrc,
rhosrc=rhosrc,
jetsrc=cms.InputTag(''),
subjetsrc=cms.InputTag(''),
jecversion=cms.string(''),
jetname = cms.string('JetInfo'),
jettype = cms.string(''),
jetidversion = cms.string(''),
muonsrc = cms.InputTag('slimmedMuons'),
vtxsrc = vtxsrc,
rhosrc = rhosrc,
jetsrc = cms.InputTag(''),
subjetsrc = cms.InputTag(''),
jecversion = cms.string(''),
)

#-------------------------------------------------------------------------
# AK4 Jet common settings
#-------------------------------------------------------------------------
ak4jetbase = jetcommon.clone()
ak4jetbase.jettype = cms.string('AK4PFchs')
ak4jetbase.jetsrc = cms.InputTag('slimmedJets')
ak4jetbase.jettype = cms.string('AK4PFchs')
ak4jetbase.jetsrc = cms.InputTag('selectedPatJetsAK4PFCHS')
ak4jetbase.jetidversion = cms.string('WINTER16')

ak4jetpuppi = jetcommon.clone()
ak4jetpuppi.jetname = cms.string('JetInfoPuppi')
ak4jetpuppi.jettype = cms.string('AK4PFPuppi')
ak4jetpuppi.jetsrc = cms.InputTag('slimmedJetsPuppi')
ak4jetpuppi.jetname = cms.string('JetInfoPuppi')
ak4jetpuppi.jettype = cms.string('AK4PFPuppi')
ak4jetpuppi.jetsrc = cms.InputTag('selectedPatJetsAK4PFPuppi')
ak4jetpuppi.jetidversion = cms.string('WINTER16')

#-------------------------------------------------------------------------
# AK8/CA8 jet common settings
#-------------------------------------------------------------------------
ak8jetpuppi = jetcommon.clone()
ak8jetpuppi.jetname = cms.string('JetAK8Puppi')
ak8jetpuppi.jettype = cms.string('AK8PFPuppi')
ak8jetpuppi.jetsrc = cms.InputTag('slimmedJetsAK8')
ak8jetpuppi.subjetsrc = cms.InputTag('slimmedJetsAK8PFPuppiSoftDropPacked', 'SubJets', 'RECO')
ak8jetpuppi.jetname = cms.string('JetAK8Puppi')
ak8jetpuppi.jettype = cms.string('AK8PFPuppi')
ak8jetpuppi.jetsrc = cms.InputTag('selectedPatJetsAK8PFPuppi')
ak8jetpuppi.subjetsrc = cms.InputTag('slimmedJetsAK8PFPuppiSoftDropPacked', 'SubJets', 'RECO')
ak8jetpuppi.jetidversion = cms.string('WINTER16')

ca8jetpuppi = jetcommon.clone()
ca8jetpuppi.jetname = cms.string('JetCA8Puppi')
ca8jetpuppi.jettype = cms.string('AK8PFPuppi')
ca8jetpuppi.jetsrc = cms.InputTag('slimmedJetsAK8')
ca8jetpuppi.subjetsrc = cms.InputTag('patJetsCMSTopTagPuppiPacked')
ca8jetpuppi.jetname = cms.string('JetCA8Puppi')
ca8jetpuppi.jettype = cms.string('AK8PFPuppi')
ca8jetpuppi.jetsrc = cms.InputTag('selectedPatJetsAK8PFPuppi')
ca8jetpuppi.subjetsrc = cms.InputTag('patJetsCMSTopTagPuppiPacked')
ca8jetpuppi.jetidversion = cms.string('WINTER16')
50 changes: 28 additions & 22 deletions python/Ntuplizer17_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@
evtgenbase = cms.PSet(
rhosrc = rhosrc,
rhonofastjetsrc = rhonofastjetsrc,
metsrc = cms.InputTag('slimmedMETs'),
metsrc = cms.InputTag('slimmedMETsUpdated'),
puppimetsrc = cms.InputTag('slimmedMETsPuppi'),
#puppimetsrc = cms.InputTag('slimmedMETsPuppiUpdated'),
pusrc = cms.InputTag('slimmedAddPileupInfo'),
beamspotsrc = beamspotsrc,
prefwgtsrc = cms.InputTag('prefiringweight:nonPrefiringProb'),
Expand Down Expand Up @@ -133,39 +134,44 @@
# Jet settings
#-------------------------------------------------------------------------------
jetcommon = cms.PSet(
jetname=cms.string('JetInfo'),
jettype=cms.string(''),
muonsrc=cms.InputTag('slimmedMuons'),
vtxsrc=vtxsrc,
rhosrc=rhosrc,
jetsrc=cms.InputTag(''),
subjetsrc=cms.InputTag(''),
jecversion=cms.string(''),
jetname = cms.string('JetInfo'),
jettype = cms.string(''),
jetidversion = cms.string(''),
muonsrc = cms.InputTag('slimmedMuons'),
vtxsrc = vtxsrc,
rhosrc = rhosrc,
jetsrc = cms.InputTag(''),
subjetsrc = cms.InputTag(''),
jecversion = cms.string(''),
)

#-------------------------------------------------------------------------
# AK4 Jet common settings
#-------------------------------------------------------------------------
ak4jetbase = jetcommon.clone()
ak4jetbase.jettype = cms.string('AK4PFchs')
ak4jetbase.jetsrc = cms.InputTag('slimmedJets')
ak4jetbase.jettype = cms.string('AK4PFchs')
ak4jetbase.jetsrc = cms.InputTag('selectedPatJetsAK4PFCHS')
ak4jetbase.jetidversion = cms.string('WINTER17')

ak4jetpuppi = jetcommon.clone()
ak4jetpuppi.jetname = cms.string('JetInfoPuppi')
ak4jetpuppi.jettype = cms.string('AK4PFPuppi')
ak4jetpuppi.jetsrc = cms.InputTag('slimmedJetsPuppi')
ak4jetpuppi.jetname = cms.string('JetInfoPuppi')
ak4jetpuppi.jettype = cms.string('AK4PFPuppi')
ak4jetpuppi.jetsrc = cms.InputTag('selectedPatJetsAK4PFPuppi')
ak4jetpuppi.jetidversion = cms.string('WINTER17PUPPI')

#-------------------------------------------------------------------------
# AK8/CA8 jet common settings
#-------------------------------------------------------------------------
ak8jetpuppi = jetcommon.clone()
ak8jetpuppi.jetname = cms.string('JetAK8Puppi')
ak8jetpuppi.jettype = cms.string('AK8PFPuppi')
ak8jetpuppi.jetsrc = cms.InputTag('slimmedJetsAK8')
ak8jetpuppi.subjetsrc = cms.InputTag('slimmedJetsAK8PFPuppiSoftDropPacked', 'SubJets', 'RECO')
ak8jetpuppi.jetname = cms.string('JetAK8Puppi')
ak8jetpuppi.jettype = cms.string('AK8PFPuppi')
ak8jetpuppi.jetsrc = cms.InputTag('selectedPatJetsAK8PFPuppi')
ak8jetpuppi.subjetsrc = cms.InputTag('slimmedJetsAK8PFPuppiSoftDropPacked', 'SubJets', 'RECO')
ak8jetpuppi.jetidversion = cms.string('WINTER17PUPPI')

ca8jetpuppi = jetcommon.clone()
ca8jetpuppi.jetname = cms.string('JetCA8Puppi')
ca8jetpuppi.jettype = cms.string('AK8PFPuppi')
ca8jetpuppi.jetsrc = cms.InputTag('slimmedJetsAK8')
ca8jetpuppi.subjetsrc = cms.InputTag('patJetsCMSTopTagPuppiPacked')
ca8jetpuppi.jetname = cms.string('JetCA8Puppi')
ca8jetpuppi.jettype = cms.string('AK8PFPuppi')
ca8jetpuppi.jetsrc = cms.InputTag('selectedPatJetsAK8PFPuppi')
ca8jetpuppi.subjetsrc = cms.InputTag('patJetsCMSTopTagPuppiPacked')
ca8jetpuppi.jetidversion = cms.string('WINTER17PUPPI')
Loading