Skip to content

Commit

Permalink
Merge pull request #12 from lsoffi/v2018.03.05_94X_prelim
Browse files Browse the repository at this point in the history 
New ID variables added to the tree content
  • Loading branch information
@michelif
michelif committed Mar 7, 2018
2 parents bb1b83f + e17f068 commit e43cb30
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 20 deletions.
4 changes: 3 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,6 @@ For developpers
git remote add username-push git@github.com:username/EgammaAnalysis-TnPTreeProducer.git

3. push commits to fork and then standard pull request process
git push username-push branchname
git push username-push branchname

4. submit jobs
6 changes: 4 additions & 2 deletions python/TnPTreeProducer_cfg.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@
# options['TnPHLTTagFilters'] = cms.vstring("hltEle27erWPTightGsfTrackIsoFilter") #FOR 2016
# options['HLTFILTERTOMEASURE'] = cms.vstring("hltEle27erWPTightGsfTrackIsoFilter") #FOR 2016
options['TnPPATHS'] = cms.vstring("HLT_Ele32_WPTight_Gsf_L1DoubleEG_v*")
options['TnPHLTTagFilters'] = cms.vstring("hltEle32L1DoubleEGWPTightGsfTrackIsoFilter")
options['TnPHLTTagFilters'] = cms.vstring("hltEle32L1DoubleEGWPTightGsfTrackIsoFilter","hltEGL1SingleEGOrFilter")
options['TnPHLTProbeFilters'] = cms.vstring()
options['HLTFILTERTOMEASURE'] = cms.vstring("hltEle32L1DoubleEGWPTightGsfTrackIsoFilter")
options['GLOBALTAG'] = 'auto:run2_mc'
else:
options['OUTPUT_FILE_NAME'] = "TnPTree_data.root"
options['TnPPATHS'] = cms.vstring("HLT_Ele32_WPTight_Gsf_L1DoubleEG_v*")
options['TnPHLTTagFilters'] = cms.vstring("hltEle32L1DoubleEGWPTightGsfTrackIsoFilter")
options['TnPHLTTagFilters'] = cms.vstring("hltEle32L1DoubleEGWPTightGsfTrackIsoFilter","hltEGL1SingleEGOrFilter")
options['TnPHLTProbeFilters'] = cms.vstring()
options['HLTFILTERTOMEASURE'] = cms.vstring("hltEle32L1DoubleEGWPTightGsfTrackIsoFilter")
options['GLOBALTAG'] = 'auto:run2_data'
Expand Down Expand Up @@ -258,8 +258,10 @@
passingLoose94X = cms.InputTag("probeEleCutBasedLoose94X" ),
passingMedium94X = cms.InputTag("probeEleCutBasedMedium94X"),
passingTight94X = cms.InputTag("probeEleCutBasedTight94X" ),
passingMVA94XwpLnoiso = cms.InputTag("probeEleMVA94XwpLnoiso" ),
passingMVA94Xwp90noiso = cms.InputTag("probeEleMVA94Xwp90noiso" ),
passingMVA94Xwp80noiso = cms.InputTag("probeEleMVA94Xwp80noiso" ),
passingMVA94XwpLiso = cms.InputTag("probeEleMVA94XwpLiso" ),
passingMVA94Xwp90iso = cms.InputTag("probeEleMVA94Xwp90iso" ),
passingMVA94Xwp80iso = cms.InputTag("probeEleMVA94Xwp80iso" ),
)
Expand Down
15 changes: 9 additions & 6 deletions python/egmElectronIDModules_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ def setIDs(process, options):
my_id_modules = [
'RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Summer16_80X_V1_cff',
'RecoEgamma.ElectronIdentification.Identification.heepElectronID_HEEPV60_cff',
'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_Spring15_25ns_nonTrig_V1_cff',
'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_Spring16_GeneralPurpose_V1_cff',
'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_Spring16_GeneralPurpose_V1_cff',
'RecoEgamma.ElectronIdentification.Identification.cutBasedElectronID_Fall17_94X_V1_cff',
'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_Fall17_noIso_V1_cff',
'RecoEgamma.ElectronIdentification.Identification.mvaElectronID_Fall17_iso_V1_cff',
Expand All @@ -41,7 +40,7 @@ def setIDs(process, options):
process.probeEleCutBasedVeto = cms.EDProducer(eleProducer,
input = cms.InputTag("goodElectrons"),
cut = cms.string(options['ELECTRON_CUTS']),
selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Spring15-25ns-V1-standalone-veto"),
selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Summer16-80X-V1-veto"),
id_cut = cms.bool(True)
)

Expand Down Expand Up @@ -76,9 +75,9 @@ def setIDs(process, options):
process.probeEleCutBasedLoose = process.probeEleCutBasedVeto.clone()
process.probeEleCutBasedMedium = process.probeEleCutBasedVeto.clone()
process.probeEleCutBasedTight = process.probeEleCutBasedVeto.clone()
process.probeEleCutBasedLoose.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Spring15-25ns-V1-standalone-loose")
process.probeEleCutBasedMedium.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Spring15-25ns-V1-standalone-medium")
process.probeEleCutBasedTight.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Spring15-25ns-V1-standalone-tight")
process.probeEleCutBasedLoose.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Summer16-80X-V1-loose" )
process.probeEleCutBasedMedium.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Summer16-80X-V1-medium")
process.probeEleCutBasedTight.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Summer16-80X-V1-tight" )

process.probeEleCutBasedVeto80X = process.probeEleCutBasedVeto.clone()
process.probeEleCutBasedLoose80X = process.probeEleCutBasedVeto.clone()
Expand All @@ -98,16 +97,20 @@ def setIDs(process, options):
process.probeEleCutBasedLoose94X = process.probeEleCutBasedVeto.clone()
process.probeEleCutBasedMedium94X = process.probeEleCutBasedVeto.clone()
process.probeEleCutBasedTight94X = process.probeEleCutBasedVeto.clone()
process.probeEleMVA94XwpLnoiso = process.probeEleCutBasedVeto.clone()
process.probeEleMVA94Xwp90noiso = process.probeEleCutBasedVeto.clone()
process.probeEleMVA94Xwp80noiso = process.probeEleCutBasedVeto.clone()
process.probeEleMVA94XwpLiso = process.probeEleCutBasedVeto.clone()
process.probeEleMVA94Xwp90iso = process.probeEleCutBasedVeto.clone()
process.probeEleMVA94Xwp80iso = process.probeEleCutBasedVeto.clone()
process.probeEleCutBasedVeto94X.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Fall17-94X-V1-veto" )
process.probeEleCutBasedLoose94X.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Fall17-94X-V1-loose" )
process.probeEleCutBasedMedium94X.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Fall17-94X-V1-medium")
process.probeEleCutBasedTight94X.selection = cms.InputTag("egmGsfElectronIDs:cutBasedElectronID-Fall17-94X-V1-tight" )
process.probeEleMVA94XwpLnoiso.selection = cms.InputTag("egmGsfElectronIDs:mvaEleID-Fall17-noIso-V1-wpLoose" )
process.probeEleMVA94Xwp90noiso.selection = cms.InputTag("egmGsfElectronIDs:mvaEleID-Fall17-noIso-V1-wp90" )
process.probeEleMVA94Xwp80noiso.selection = cms.InputTag("egmGsfElectronIDs:mvaEleID-Fall17-noIso-V1-wp80" )
process.probeEleMVA94XwpLiso.selection = cms.InputTag("egmGsfElectronIDs:mvaEleID-Fall17-iso-V1-wpLoose" )
process.probeEleMVA94Xwp90iso.selection = cms.InputTag("egmGsfElectronIDs:mvaEleID-Fall17-iso-V1-wp90" )
process.probeEleMVA94Xwp80iso.selection = cms.InputTag("egmGsfElectronIDs:mvaEleID-Fall17-iso-V1-wp80" )

Expand Down
6 changes: 3 additions & 3 deletions python/egmPhotonIDModules_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ def setIDs(process, options):
process.probePhoCutBasedLoose94X = process.probePhoCutBasedLoose.clone()
process.probePhoCutBasedMedium94X = process.probePhoCutBasedLoose.clone()
process.probePhoCutBasedTight94X = process.probePhoCutBasedLoose.clone()
process.probePhoCutBasedLoose94X.selection = cms.InputTag("egmPhotonIDs:cutBasedPhotonID-Fall17-94X-loose" )
process.probePhoCutBasedMedium94X.selection = cms.InputTag("egmPhotonIDs:cutBasedPhotonID-Fall17-94X-medium" )
process.probePhoCutBasedTight94X.selection = cms.InputTag("egmPhotonIDs:cutBasedPhotonID-Fall17-94X-tight" )
process.probePhoCutBasedLoose94X.selection = cms.InputTag("egmPhotonIDs:cutBasedPhotonID-Fall17-94X-V1-loose" )
process.probePhoCutBasedMedium94X.selection = cms.InputTag("egmPhotonIDs:cutBasedPhotonID-Fall17-94X-V1-medium" )
process.probePhoCutBasedTight94X.selection = cms.InputTag("egmPhotonIDs:cutBasedPhotonID-Fall17-94X-V1-tight" )


process.probePhoMVA = process.probePhoCutBasedLoose.clone()
Expand Down
27 changes: 19 additions & 8 deletions python/egmTreesContent_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
el_sc_phi = cms.string("superCluster.phi"),
el_sc_abseta = cms.string("abs(-log(tan(superCluster.position.theta/2)))"),
el_seed_e = cms.string("superCluster.seed.energy"),
el_ecalEnergy = cms.string("ecalEnergy()"),
# el_xseed_e = cms.string("superCluster.seed.seed.energy"),

#id based
Expand All @@ -60,15 +61,19 @@
el_e5x5 = cms.string("showerShape().e5x5"),
el_r9 = cms.string("showerShape().r9"),
el_sieie = cms.string("showerShape().sigmaIetaIeta"),

el_hoe = cms.string("hcalOverEcalBc"),
el_eoverp = cms.string("(superCluster().rawEnergy+superCluster().preshowerEnergy)/gsfTrack().pMode()"),

el_hoe = cms.string("hadronicOverEm()"),
el_hoe_bc = cms.string("hcalOverEcalBc"),
el_eoverp_wES = cms.string("(superCluster().rawEnergy+superCluster().preshowerEnergy)/gsfTrack().pMode()"),
el_1overEminus1overP = cms.string("abs(1-eSuperClusterOverP())/ecalEnergy()"),

# mva id
el_nonTrigMVA = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring15NonTrig25nsV1Values"),

el_nonTrigMVA80X = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring16GeneralPurposeV1Values"),
el_hzzMVA80X = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring16HZZV1Values"),
el_trigMVA = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring15Trig25nsV1Values"),
el_noIsoMVA94X = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Fall17NoIsoV1Values"),
el_IsoMVA94X = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Fall17IsoV1Values"),


#isolation
el_chIso = cms.string("pfIsolationVariables().sumChargedHadronPt"),
Expand Down Expand Up @@ -125,8 +130,9 @@
ph_chWorIso = cms.InputTag("photonIDValueMapProducer:phoWorstChargedIsolation"),

#pho mva
ph_mva = cms.InputTag("photonMVAValueMapProducer:PhotonMVAEstimatorRun2Spring15NonTrig25nsV2p1Values"),

ph_mva80X = cms.InputTag("photonMVAValueMapProducer:PhotonMVAEstimatorRun2Spring16NonTrigV1Values"),
ph_mva94X = cms.InputTag("photonMVAValueMapProducer:PhotonMVAEstimatorRunIIFall17v1p1Values"),
)


Expand All @@ -150,8 +156,13 @@
# Ele_mHits = cms.InputTag("eleVarHelper:missinghits"),
Ele_dz = cms.InputTag("eleVarHelper:dz"),
Ele_dxy = cms.InputTag("eleVarHelper:dxy"),
Ele_nonTrigMVA = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring15NonTrig25nsV1Values"),
Ele_trigMVA = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring15Trig25nsV1Values"),
Ele_nonTrigMVA80X = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring16GeneralPurposeV1Values"),
Ele_hzzMVA80X = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Spring16HZZV1Values"),

Ele_trigMVA = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Fall17IsoV1Values"),

Ele_noIsoMVA94X = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Fall17NoIsoV1Values"),
Ele_IsoMVA94X = cms.InputTag("electronMVAValueMapProducer:ElectronMVAEstimatorRun2Fall17IsoV1Values"),

)

Expand Down
2 changes: 2 additions & 0 deletions python/egmTreesSetup_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,10 @@ def setSequences(process, options):
process.probeEleCutBasedLoose94X +
process.probeEleCutBasedMedium94X +
process.probeEleCutBasedTight94X +
process.probeEleMVA94XwpLnoiso +
process.probeEleMVA94Xwp90noiso +
process.probeEleMVA94Xwp80noiso +
process.probeEleMVA94XwpLiso +
process.probeEleMVA94Xwp90iso +
process.probeEleMVA94Xwp80iso +
process.probeEle
Expand Down

0 comments on commit e43cb30

Please sign in to comment.