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

GED EGM RECO as default + customizeOldEGReco #1834

Merged
merged 12 commits into from
Dec 20, 2013
Merged

GED EGM RECO as default + customizeOldEGReco #1834

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9c93cb6
E-gamma GED RECO as default
lgray Dec 12, 2013
3f5e731
updated interesting rechit code and sequences for GED electrons/photo…
bendavid Dec 16, 2013
bf343b2
finished customizeOldEGReco
lgray Dec 16, 2013
cc5a841
fix ecal local validation after ged switch
bendavid Dec 17, 2013
a5de525
point DQM modules at the correct collections
lgray Dec 18, 2013
d0e5a70
add oldpfPhotonPostProcessing back
lgray Dec 18, 2013
35e0dac
go completely back to old PF selection for photons
lgray Dec 19, 2013
dace0e1
Giving implementation to customize_DQM
yiiyama Dec 19, 2013
a73ab7f
remove ESPrefers, use global tag
lgray Dec 19, 2013
3fa8111
bring more DQM plots back online.
lgray Dec 19, 2013
730fb54
PhotonAnalyzer now works, but on the old photons.
lgray Dec 19, 2013
cb734b6
adding the condition that if gedElectronMode is false, use the PF mva…
sdevissc Dec 19, 2013
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
2 changes: 1 addition & 1 deletion Calibration/EcalAlCaRecoProducers/python/ALCARECOEcalCalIsolElectron_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# you should not need to uncomment those, because I've already
# produced them in the ALCARECO step
#trackerDrivenOnlyElectrons = cms.EDFilter("GsfElectronRefSelector",
# src = cms.InputTag( 'gsfElectrons' ),
# src = cms.InputTag( 'gedGsfElectrons' ),
# cut = cms.string( "(ecalDrivenSeed==0)" )
# )

Expand Down
2 changes: 1 addition & 1 deletion Calibration/EcalAlCaRecoProducers/python/alCaIsolatedElectrons_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

alCaIsolatedElectrons = cms.EDProducer("AlCaECALRecHitReducer",
electronLabel = cms.InputTag("gsfElectrons"),
electronLabel = cms.InputTag("gedGsfElectrons"),
alcaEndcapHitCollection = cms.string('alcaEndcapHits'),
phiSize = cms.int32(11),
etaSize = cms.int32(5),
Expand Down
2 changes: 1 addition & 1 deletion Calibration/EcalAlCaRecoProducers/python/alcastreamElectronOutput_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
SelectEvents = cms.vstring('pathAlcastreamElectron')
),
outputCommands = cms.untracked.vstring('drop *',
'keep TrackCandidates_gsfElectrons_*_*',
'keep TrackCandidates_gedGsfElectrons_*_*',
'keep *_electronFilter_*_*',
'keep *_alCaIsolatedElectrons_*_*')
)
Expand Down
2 changes: 1 addition & 1 deletion Calibration/EcalAlCaRecoProducers/python/alcastreamElectron_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from Calibration.EcalAlCaRecoProducers.alCaIsolatedElectrons_cfi import *
electronFilter = cms.EDFilter("EtaPtMinGsfElectronFullCloneSelector",
filter = cms.bool(True),
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
etaMin = cms.double(-2.7),
etaMax = cms.double(2.7),
ptMin = cms.double(5.0)
Expand Down
2 changes: 1 addition & 1 deletion Calibration/EcalAlCaRecoProducers/python/electronFilter_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

electronFilter = cms.EDFilter("EtaPtMinGsfElectronFullCloneSelector",
filter = cms.bool(True),
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
etaMin = cms.double(-2.5),
etaMax = cms.double(2.5),
ptMin = cms.double(15.0)
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Skimming/python/PDWG_EXOHPTE_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#Define the Reco quality cut
exoticaRecoDiHPTEFilter = cms.EDFilter(
"PtMinGsfElectronCountFilter",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
ptMin = cms.double(30.0),
minNumber = cms.uint32(2)
)
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Skimming/python/PDWG_HWWSkim_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@


goodHwwElectrons = cms.EDFilter("GsfElectronRefSelector",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
cut = cms.string( "pt > 10 &&" +
" abs(deltaEtaSuperClusterTrackAtVtx) < 0.010 &&" +
" (( isEB && sigmaIetaIeta < 0.011) ||" +
Expand Down
2 changes: 1 addition & 1 deletion Configuration/Skimming/python/PDWG_HZZSkim_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
cut = cms.string(MUON_CUT)
)
goodHzzElectrons = cms.EDFilter("GsfElectronRefSelector",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
cut = cms.string(ELECTRON_CUT)
)

Expand Down
2 changes: 1 addition & 1 deletion Configuration/Skimming/python/pdwgLeptonRecoSkim_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

PdwgLeptonRecoSkim = cms.EDFilter('LeptonRecoSkim',
HltLabel = cms.InputTag("TriggerResults","","HLT"),
electronCollection = cms.InputTag("gsfElectrons"),
electronCollection = cms.InputTag("gedGsfElectrons"),
pfElectronCollection = cms.InputTag("particleFlow"),
muonCollection = cms.InputTag("muons"),
caloJetCollection = cms.InputTag("ak5CaloJetsL2L3"),
Expand Down
2 changes: 1 addition & 1 deletion DPGAnalysis/Skims/python/JetPDSkim_cfg.py
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion DPGAnalysis/Skims/python/WElectronSkim_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
ELECTRON_ET_CUT_MIN = 10.0
TAG_ELECTRON_ET_CUT_MIN = 20.0
W_ELECTRON_ET_CUT_MIN = 27.0
ELECTRON_COLL = "gsfElectrons"
ELECTRON_COLL = "gedGsfElectrons"
ELECTRON_CUTS = "(abs(superCluster.eta)<2.5) && (ecalEnergy*sin(superClusterPosition.theta)>" + str(ELECTRON_ET_CUT_MIN) + ")"

#met, mt cuts for W selection
Expand Down
2 changes: 1 addition & 1 deletion DPGAnalysis/Skims/python/WZinterestingEventFilter_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

WZInterestingEventSelector = cms.EDFilter(
"WZInterestingEventSelector",
electronCollection = cms.untracked.InputTag('gsfElectrons'),
electronCollection = cms.untracked.InputTag('gedGsfElectrons'),
pfMetCollection = cms.untracked.InputTag('pfMet'),
offlineBSCollection = cms.untracked.InputTag('offlineBeamSpot'),
ptCut = cms.double(20.),
Expand Down
2 changes: 1 addition & 1 deletion DPGAnalysis/Skims/python/commonCuts_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
muonLabel = cms.InputTag("muons"),
photonLabel = cms.InputTag("photons"),
jetLabel = cms.InputTag("iterativeCone5CaloJets"),
electronLabel = cms.InputTag("gsfElectrons"),
electronLabel = cms.InputTag("gedGsfElectrons"),
triggerResults_ = cms.InputTag("TriggerResults","","HLT"),
ObjectMap = cms.InputTag("hltL1GtObjectMap"),
GtDigis = cms.InputTag("gtDigis")
Expand Down
2 changes: 1 addition & 1 deletion DPGAnalysis/Skims/python/electronTagProbeFilters_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

# Make the input candidate collections
electronTagCands = cms.EDFilter("GsfElectronRefSelector",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
cut = cms.string('pt > 1.0 && abs(eta) < 2.1'),
filter = cms.bool(True)
)
Expand Down
16 changes: 8 additions & 8 deletions DPGAnalysis/Skims/python/singleElectronSkim_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,35 +18,35 @@
#Define the Reco quality cut

singleRecoElectronPt20Filter = cms.EDFilter("GsfElectronRefSelector",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
cut = cms.string('pt > 20.0 && abs(eta) < 2.5 ' ),
filter = cms.bool(True),
minN = cms.int32(1)
)

singleRecoElectronPt15Filter = cms.EDFilter("GsfElectronRefSelector",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
cut = cms.string('pt > 15.0 && abs(eta) < 2.5 ' ),
filter = cms.bool(True),
minN = cms.int32(1)
)

singleRecoElectronPt10Filter = cms.EDFilter("GsfElectronRefSelector",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
cut = cms.string('pt > 10.0 && abs(eta) < 2.5 ' ),
filter = cms.bool(True),
minN = cms.int32(1)
)

singleRecoElectronPt5Filter = cms.EDFilter("GsfElectronRefSelector",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
cut = cms.string('pt > 5.0 && abs(eta) < 2.5 ' ),
filter = cms.bool(True),
minN = cms.int32(1)
)

singleRecoElectronPt1Filter = cms.EDFilter("GsfElectronRefSelector",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
cut = cms.string('pt > 1.0 && abs(eta) < 2.5 ' ),
filter = cms.bool(True),
minN = cms.int32(1)
Expand All @@ -73,7 +73,7 @@
# )

#electronCounter = cms.EDFilter("CandViewCountFilter",
# src = cms.InputTag("gsfElectrons"),
# src = cms.InputTag("gedGsfElectrons"),
# minNumber = cms.uint32(1)
# )

Expand All @@ -91,8 +91,8 @@
#ecalDrivenElectronSeeds.SeedConfiguration.DeltaPhi1Low = cms.double(0.3)
#ecalDrivenElectronSeeds.SeedConfiguration.DeltaPhi1High = cms.double(0.3)
#ecalDrivenElectronSeeds.SeedConfiguration.DeltaPhi2 = cms.double(0.3)
#gsfElectrons.applyPreselection = cms.bool(False)
#gsfElectrons.applyAmbResolution = cms.bool(True)
#gedGsfElectrons.applyPreselection = cms.bool(False)
#gedGsfElectrons.applyAmbResolution = cms.bool(True)

#Define group sequence, using HLT/Reco quality cut.
#singleMuHLTQualitySeq = cms.Sequence()
Expand Down
4 changes: 2 additions & 2 deletions DQM/Physics/python/ExoticaDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
),

#Physics objects
electronCollection = cms.InputTag("gsfElectrons"),
electronCollection = cms.InputTag("gedGsfElectrons"),
pfelectronCollectionEI = cms.InputTag("pfIsolatedElectronsEI"),

muonCollection = cms.InputTag("muons"),
Expand All @@ -52,7 +52,7 @@
tauCollection = cms.InputTag("caloRecoTauProducer"),
#pftauCollection = cms.InputTag("pfTaus"),

photonCollection = cms.InputTag("photons"),
photonCollection = cms.InputTag("gedPhotons"),
#pfphotonCollection = cms.InputTag("pfIsolatedPhotons"),

caloJetCollection = cms.InputTag("ak5CaloJets"),
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/HiggsDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
muonTriggerPathToPass = cms.string("HLT_Mu9"),
triggerResultsCollection = cms.InputTag("TriggerResults", "", "HLT"),
muonCollection = cms.InputTag("muons"),
electronCollection = cms.InputTag("gsfElectrons"),
electronCollection = cms.InputTag("gedGsfElectrons"),
caloJetCollection = cms.InputTag("ak5CaloJets"),
caloMETCollection = cms.InputTag("corMetGlobalMuons"),
pfMETCollection = cms.InputTag("pfMet"),
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/ewkDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
triggerResultsCollection = cms.InputTag("TriggerResults", "", "HLT"),

muonCollection = cms.InputTag("muons"),
electronCollection = cms.InputTag("gsfElectrons"),
electronCollection = cms.InputTag("gedGsfElectrons"),
PFJetCollection = cms.InputTag("ak5PFJets"),
caloMETCollection = cms.InputTag("corMetGlobalMuons"),
vertexCollection = cms.InputTag("offlinePrimaryVertices"),
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/ewkElecDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Input collections ->
TrigTag = cms.untracked.InputTag("TriggerResults::HLT"),
# MuonTag = cms.untracked.InputTag("muons"),
ElecTag = cms.untracked.InputTag("gsfElectrons"),
ElecTag = cms.untracked.InputTag("gedGsfElectrons"),
METTag = cms.untracked.InputTag("pfMet"),
METIncludesMuons = cms.untracked.bool(False),
JetTag = cms.untracked.InputTag("ak5PFJets"),
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/ewkTauDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
triggerResultsSource = cms.InputTag("TriggerResults::HLT"),
vertexSource = cms.InputTag("offlinePrimaryVertices"),
beamSpotSource = cms.InputTag("offlineBeamSpot"),
electronSource = cms.InputTag("gsfElectrons"),
electronSource = cms.InputTag("gedGsfElectrons"),
tauJetSource = cms.InputTag("shrinkingConePFTauProducer"),
caloMEtSource = cms.InputTag("met"),
pfMEtSource = cms.InputTag("pfMet"),
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/qcdPhotonsDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
plotTheseTriggersToo = cms.vstring("HLT_Photon20","HLT_Photon25","HLT_Photon30","HLT_Photon50","HLT_DoublePhoton"),
# Collections
trigTag = cms.untracked.InputTag("TriggerResults::HLT"),
photonCollection = cms.InputTag("photons"),
photonCollection = cms.InputTag("gedPhotons"),
jetCollection = cms.InputTag("ak5PFJets"),
vertexCollection = cms.InputTag("offlinePrimaryVertices"),
# Cuts on the reco objects
Expand Down
6 changes: 3 additions & 3 deletions DQM/Physics/python/singleTopDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
## [mandatory]
sources = cms.PSet(
muons = cms.InputTag("muons"),
elecs = cms.InputTag("gsfElectrons"),
elecs = cms.InputTag("gedGsfElectrons"),
jets = cms.InputTag("ak5PFJetsCHS"),
mets = cms.VInputTag("met", "tcMet", "pfMet"),
pvs = cms.InputTag("offlinePrimaryVertices")
Expand Down Expand Up @@ -145,7 +145,7 @@
sources = cms.PSet(
muons = cms.InputTag("particleFlow"),
# muons = cms.InputTag("muons"),
elecs_gsf = cms.InputTag("gsfElectrons"),
elecs_gsf = cms.InputTag("gedGsfElectrons"),
elecs = cms.InputTag("particleFlow"),
jets = cms.InputTag("ak5PFJetsCHS"),
mets = cms.VInputTag("met", "tcMet", "pfMet"),
Expand Down Expand Up @@ -305,7 +305,7 @@
## [mandatory]
sources = cms.PSet(
muons = cms.InputTag("particleFlow"),
elecs_gsf = cms.InputTag("gsfElectrons"),
elecs_gsf = cms.InputTag("gedGsfElectrons"),
elecs = cms.InputTag("particleFlow"),
jets = cms.InputTag("ak5PFJetsCHS"),
mets = cms.VInputTag("met", "tcMet", "pfMet"),
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/susyDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
moduleName = cms.untracked.string('Physics/Susy'),

muonCollection = cms.InputTag('muons'),
electronCollection = cms.InputTag('gsfElectrons'),
electronCollection = cms.InputTag('gedGsfElectrons'),
jetCollection = cms.InputTag('ak5CaloJets'),
metCollection = cms.InputTag('met'),
vertexCollection = cms.InputTag('offlinePrimaryVertices'),
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/topDiLeptonDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
muon_eta_cut = cms.double( 2.4 ),
muon_iso_cut = cms.double( 0.2 ),
###
elecCollection = cms.InputTag('gsfElectrons'),
elecCollection = cms.InputTag('gedGsfElectrons'),
elec_pT_cut = cms.double( 5.0 ),
elec_eta_cut = cms.double( 2.4 ),
elec_iso_cut = cms.double( 0.2 ),
Expand Down
12 changes: 6 additions & 6 deletions DQM/Physics/python/topDiLeptonOfflineDQM_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
## [mandatory]
sources = cms.PSet(
muons = cms.InputTag("muons"),
elecs = cms.InputTag("gsfElectrons"),
elecs = cms.InputTag("gedGsfElectrons"),
jets = cms.InputTag("ak5PFJetsCHS"),
mets = cms.VInputTag("met", "tcMet", "pfMet")
),
Expand Down Expand Up @@ -166,7 +166,7 @@
## [mandatory]
sources = cms.PSet(
muons = cms.InputTag("muons"),
elecs = cms.InputTag("gsfElectrons"),
elecs = cms.InputTag("gedGsfElectrons"),
jets = cms.InputTag("ak5PFJetsCHS"),
mets = cms.VInputTag("met", "tcMet", "pfMet")
),
Expand Down Expand Up @@ -315,7 +315,7 @@
## [mandatory]
sources = cms.PSet(
muons = cms.InputTag("muons"),
elecs = cms.InputTag("gsfElectrons"),
elecs = cms.InputTag("gedGsfElectrons"),
jets = cms.InputTag("ak5PFJetsCHS"),
mets = cms.VInputTag("met", "tcMet", "pfMet")
),
Expand Down Expand Up @@ -427,7 +427,7 @@
#),
cms.PSet(
label = cms.string("elecs:step0"),
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
# electronId = cms.PSet(
# src = cms.InputTag("simpleEleId70cIso"),
# pattern = cms.int32(1)
Expand Down Expand Up @@ -468,7 +468,7 @@
## [mandatory]
sources = cms.PSet(
muons = cms.InputTag("muons"),
elecs = cms.InputTag("gsfElectrons"),
elecs = cms.InputTag("gedGsfElectrons"),
jets = cms.InputTag("ak5PFJetsCHS"),
mets = cms.VInputTag("met", "tcMet", "pfMet")
),
Expand Down Expand Up @@ -587,7 +587,7 @@
),
cms.PSet(
label = cms.string("elecs:step1"),
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
#electronId = cms.PSet(
# src = cms.InputTag("simpleEleId70cIso"),
# pattern = cms.int32(1)
Expand Down
2 changes: 1 addition & 1 deletion DQM/Physics/python/topElectronID_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## test for electronId
simpleEleId70cIso = cms.EDProducer(
"EleIdCutBasedExtProducer",
src = cms.InputTag("gsfElectrons"),
src = cms.InputTag("gedGsfElectrons"),
reducedBarrelRecHitCollection = cms.InputTag("reducedEcalRecHitsEB"),
reducedEndcapRecHitCollection = cms.InputTag("reducedEcalRecHitsEE"),
verticesCollection = cms.InputTag("offlineBeamSpot"),
Expand Down
Loading