Skip to content

Commit

Permalink
drop type specs where original parameter exist
Browse files Browse the repository at this point in the history
  • Loading branch information
jeongeun committed Aug 25, 2020
1 parent 8516175 commit ce21f59
Show file tree
Hide file tree
Showing 36 changed files with 521 additions and 501 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

from RecoEgamma.EgammaElectronProducers.electronPFIsolationDeposits_cff import *

elEDIsoDepositCharged=elPFIsoDepositCharged.clone()
elEDIsoDepositCharged.src="ecalDrivenGsfElectrons"

elEDIsoDepositChargedAll=elPFIsoDepositChargedAll.clone()
elEDIsoDepositChargedAll.src="ecalDrivenGsfElectrons"

elEDIsoDepositGamma=elPFIsoDepositGamma.clone()
elEDIsoDepositGamma.src="ecalDrivenGsfElectrons"

elEDIsoDepositNeutral=elPFIsoDepositNeutral.clone()
elEDIsoDepositNeutral.src="ecalDrivenGsfElectrons"

elEDIsoDepositPU=elPFIsoDepositPU.clone()
elEDIsoDepositPU.src="ecalDrivenGsfElectrons"

elEDIsoDepositCharged=elPFIsoDepositCharged.clone(
src="ecalDrivenGsfElectrons"
)
elEDIsoDepositChargedAll=elPFIsoDepositChargedAll.clone(
src="ecalDrivenGsfElectrons"
)
elEDIsoDepositGamma=elPFIsoDepositGamma.clone(
src="ecalDrivenGsfElectrons"
)
elEDIsoDepositNeutral=elPFIsoDepositNeutral.clone(
src="ecalDrivenGsfElectrons"
)
elEDIsoDepositPU=elPFIsoDepositPU.clone(
src="ecalDrivenGsfElectrons"
)
electronEDIsolationDepositsTask = cms.Task(
elEDIsoDepositCharged,
elEDIsoDepositChargedAll,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,21 +72,21 @@
)

elPFIsoValueCharged04 = elPFIsoValueCharged03.clone()
elPFIsoValueCharged04.deposits[0].deltaR = cms.double(0.4)
elPFIsoValueCharged04.deposits[0].deltaR = 0.4


elPFIsoValueChargedAll04 = elPFIsoValueChargedAll03.clone()
elPFIsoValueChargedAll04.deposits[0].deltaR = cms.double(0.4)
elPFIsoValueChargedAll04.deposits[0].deltaR = 0.4

elPFIsoValueGamma04 = elPFIsoValueGamma03.clone()
elPFIsoValueGamma04.deposits[0].deltaR = cms.double(0.4)
elPFIsoValueGamma04.deposits[0].deltaR = 0.4


elPFIsoValueNeutral04 = elPFIsoValueNeutral03.clone()
elPFIsoValueNeutral04.deposits[0].deltaR = cms.double(0.4)
elPFIsoValueNeutral04.deposits[0].deltaR = 0.4

elPFIsoValuePU04 = elPFIsoValuePU03.clone()
elPFIsoValuePU04.deposits[0].deltaR = cms.double(0.4)
elPFIsoValuePU04.deposits[0].deltaR = 0.4



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ def thresholds( wp ) :

# Modifiers for FastSim
from Configuration.Eras.Modifier_fastSim_cff import fastSim
lowPtGsfElectronSeedsTmp = lowPtGsfElectronSeeds.clone(tracks = cms.InputTag("generalTracksBeforeMixing"))
lowPtGsfElectronSeedsTmp = lowPtGsfElectronSeeds.clone(tracks = "generalTracksBeforeMixing")
import FastSimulation.Tracking.ElectronSeedTrackRefFix_cfi
_fastSim_lowPtGsfElectronSeeds = FastSimulation.Tracking.ElectronSeedTrackRefFix_cfi.fixedTrackerDrivenElectronSeeds.clone()
_fastSim_lowPtGsfElectronSeeds.seedCollection = cms.InputTag("lowPtGsfElectronSeedsTmp","")
_fastSim_lowPtGsfElectronSeeds.idCollection = cms.VInputTag("lowPtGsfElectronSeedsTmp","lowPtGsfElectronSeedsTmp:HCAL")
_fastSim_lowPtGsfElectronSeeds.PreIdLabel = cms.vstring("","HCAL")
_fastSim_lowPtGsfElectronSeeds.PreGsfLabel = cms.string("")
_fastSim_lowPtGsfElectronSeeds = FastSimulation.Tracking.ElectronSeedTrackRefFix_cfi.fixedTrackerDrivenElectronSeeds.clone(
seedCollection = "lowPtGsfElectronSeedsTmp:",
idCollection = ["lowPtGsfElectronSeedsTmp","lowPtGsfElectronSeedsTmp:HCAL"],
PreIdLabel = ["","HCAL"],
PreGsfLabel = ""
)
fastSim.toReplaceWith(lowPtGsfElectronSeeds,_fastSim_lowPtGsfElectronSeeds)

# Modifiers for BParking
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,56 @@

# PFRecTracks from generalTracks
from RecoParticleFlow.PFTracking.pfTrack_cfi import *
lowPtGsfElePfTracks = pfTrack.clone()
lowPtGsfElePfTracks.TkColList = ['generalTracks']
lowPtGsfElePfTracks.GsfTracksInEvents = False
lowPtGsfElePfTracks.GsfTrackModuleLabel = ''

lowPtGsfElePfTracks = pfTrack.clone(
TkColList = ['generalTracks'],
GsfTracksInEvents = False,
GsfTrackModuleLabel = ''
)
fastSim.toModify(lowPtGsfElePfTracks,TkColList = ['generalTracksBeforeMixing'])

# Low pT ElectronSeeds
from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronSeeds_cfi import *

# Electron track candidates
from TrackingTools.GsfTracking.CkfElectronCandidateMaker_cff import *
lowPtGsfEleTrajectoryFilter = TrajectoryFilterForElectrons.clone()
lowPtGsfEleTrajectoryFilter.minPt = 0.
lowPtGsfEleTrajectoryFilter.minimumNumberOfHits = 3
lowPtGsfEleTrajectoryBuilder = TrajectoryBuilderForElectrons.clone()
lowPtGsfEleTrajectoryBuilder.trajectoryFilter.refToPSet_ = 'lowPtGsfEleTrajectoryFilter'
lowPtGsfEleCkfTrackCandidates = electronCkfTrackCandidates.clone()
lowPtGsfEleCkfTrackCandidates.TrajectoryBuilderPSet.refToPSet_ = 'lowPtGsfEleTrajectoryBuilder'
lowPtGsfEleCkfTrackCandidates.src = 'lowPtGsfElectronSeeds'

lowPtGsfEleTrajectoryFilter = TrajectoryFilterForElectrons.clone(
minPt = 0.,
minimumNumberOfHits = 3
)
lowPtGsfEleTrajectoryBuilder = TrajectoryBuilderForElectrons.clone(
trajectoryFilter = dict(refToPSet_ = 'lowPtGsfEleTrajectoryFilter')
)
lowPtGsfEleCkfTrackCandidates = electronCkfTrackCandidates.clone(
TrajectoryBuilderPSet = dict(refToPSet_ = 'lowPtGsfEleTrajectoryBuilder'),
src = 'lowPtGsfElectronSeeds'
)
import FastSimulation.Tracking.electronCkfTrackCandidates_cff
fastLowPtGsfTkfTrackCandidates = FastSimulation.Tracking.electronCkfTrackCandidates_cff.electronCkfTrackCandidates.clone(src = cms.InputTag("lowPtGsfElectronSeeds"))
fastLowPtGsfTkfTrackCandidates = FastSimulation.Tracking.electronCkfTrackCandidates_cff.electronCkfTrackCandidates.clone(src = "lowPtGsfElectronSeeds")

# GsfTracks
from TrackingTools.GsfTracking.GsfElectronGsfFit_cff import *
lowPtGsfEleFittingSmoother = GsfElectronFittingSmoother.clone()
lowPtGsfEleFittingSmoother.ComponentName = 'lowPtGsfEleFittingSmoother'
lowPtGsfEleFittingSmoother.MinNumberOfHits = 2
lowPtGsfEleFittingSmoother = GsfElectronFittingSmoother.clone(
ComponentName = 'lowPtGsfEleFittingSmoother',
MinNumberOfHits = 2
)
from TrackingTools.GsfTracking.GsfElectronGsfFit_cff import *
lowPtGsfEleGsfTracks = electronGsfTracks.clone()
lowPtGsfEleGsfTracks.Fitter = 'lowPtGsfEleFittingSmoother'
lowPtGsfEleGsfTracks.src = 'lowPtGsfEleCkfTrackCandidates'

fastSim.toModify(lowPtGsfEleGsfTracks,src = cms.InputTag("fastLowPtGsfTkfTrackCandidates"))
lowPtGsfEleGsfTracks = electronGsfTracks.clone(
Fitter = 'lowPtGsfEleFittingSmoother',
src = 'lowPtGsfEleCkfTrackCandidates'
)
fastSim.toModify(lowPtGsfEleGsfTracks,src = "fastLowPtGsfTkfTrackCandidates")

# GSFTrack to track association
from RecoEgamma.EgammaElectronProducers.lowPtGsfToTrackLinks_cfi import lowPtGsfToTrackLinks

# GsfPFRecTracks
from RecoParticleFlow.PFTracking.pfTrackElec_cfi import *
lowPtGsfElePfGsfTracks = pfTrackElec.clone()
lowPtGsfElePfGsfTracks.GsfTrackModuleLabel = 'lowPtGsfEleGsfTracks'
lowPtGsfElePfGsfTracks.PFRecTrackLabel = 'lowPtGsfElePfTracks'
lowPtGsfElePfGsfTracks.applyGsfTrackCleaning = False
lowPtGsfElePfGsfTracks.useFifthStepForTrackerDrivenGsf = True

lowPtGsfElePfGsfTracks = pfTrackElec.clone(
GsfTrackModuleLabel = 'lowPtGsfEleGsfTracks',
PFRecTrackLabel = 'lowPtGsfElePfTracks',
applyGsfTrackCleaning = False,
useFifthStepForTrackerDrivenGsf = True
)
# SuperCluster generator and matching to GSF tracks
# Below relies on the following default configurations:
# RecoParticleFlow/PFClusterProducer/python/particleFlowClusterECALUncorrected_cfi.py
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

from RecoEgamma.EgammaElectronProducers.ecalDrivenElectronSeeds_cff import *
uncleanedOnlyElectronSeeds = ecalDrivenElectronSeeds.clone(
barrelSuperClusters = cms.InputTag("uncleanedOnlyCorrectedHybridSuperClusters"),
endcapSuperClusters = cms.InputTag("uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower")
barrelSuperClusters = "uncleanedOnlyCorrectedHybridSuperClusters",
endcapSuperClusters = "uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower"
)

from TrackingTools.GsfTracking.CkfElectronCandidateMaker_cff import *
uncleanedOnlyElectronCkfTrackCandidates = electronCkfTrackCandidates.clone(
src = cms.InputTag("uncleanedOnlyElectronSeeds")
src = "uncleanedOnlyElectronSeeds"
)

from TrackingTools.GsfTracking.GsfElectronGsfFit_cff import *
Expand All @@ -30,24 +30,24 @@

from RecoEgamma.EgammaPhotonProducers.conversionTrackCandidates_cfi import *
uncleanedOnlyConversionTrackCandidates = conversionTrackCandidates.clone(
scHybridBarrelProducer = cms.InputTag("uncleanedOnlyCorrectedHybridSuperClusters"),
bcBarrelCollection = cms.InputTag("hybridSuperClusters","uncleanOnlyHybridSuperClusters"),
scIslandEndcapProducer = cms.InputTag("uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower"),
bcEndcapCollection = cms.InputTag("multi5x5SuperClusters","uncleanOnlyMulti5x5EndcapBasicClusters")
scHybridBarrelProducer = "uncleanedOnlyCorrectedHybridSuperClusters",
bcBarrelCollection = "hybridSuperClusters:uncleanOnlyHybridSuperClusters",
scIslandEndcapProducer = "uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower",
bcEndcapCollection = "multi5x5SuperClusters:uncleanOnlyMulti5x5EndcapBasicClusters"
)

from RecoEgamma.EgammaPhotonProducers.ckfOutInTracksFromConversions_cfi import *
uncleanedOnlyCkfOutInTracksFromConversions = ckfOutInTracksFromConversions.clone(
src = cms.InputTag("uncleanedOnlyConversionTrackCandidates","outInTracksFromConversions"),
producer = cms.string('uncleanedOnlyConversionTrackCandidates'),
ComponentName = cms.string('uncleanedOnlyCkfOutInTracksFromConversions')
src = "uncleanedOnlyConversionTrackCandidates:outInTracksFromConversions",
producer = 'uncleanedOnlyConversionTrackCandidates',
ComponentName = 'uncleanedOnlyCkfOutInTracksFromConversions'
)

from RecoEgamma.EgammaPhotonProducers.ckfInOutTracksFromConversions_cfi import *
uncleanedOnlyCkfInOutTracksFromConversions = ckfInOutTracksFromConversions.clone(
src = cms.InputTag("uncleanedOnlyConversionTrackCandidates","inOutTracksFromConversions"),
producer = cms.string('uncleanedOnlyConversionTrackCandidates'),
ComponentName = cms.string('uncleanedOnlyCkfInOutTracksFromConversions')
src = "uncleanedOnlyConversionTrackCandidates:inOutTracksFromConversions",
producer = 'uncleanedOnlyConversionTrackCandidates',
ComponentName = 'uncleanedOnlyCkfInOutTracksFromConversions'
)

uncleanedOnlyCkfTracksFromConversionsTask = cms.Task(uncleanedOnlyConversionTrackCandidates,uncleanedOnlyCkfOutInTracksFromConversions,uncleanedOnlyCkfInOutTracksFromConversions)
Expand All @@ -58,50 +58,50 @@

from RecoEgamma.EgammaPhotonProducers.conversionTrackSequence_cff import *
uncleanedOnlyInOutConversionTrackProducer = inOutConversionTrackProducer.clone(
TrackProducer = cms.string('uncleanedOnlyCkfInOutTracksFromConversions')
TrackProducer = 'uncleanedOnlyCkfInOutTracksFromConversions'
)

from RecoEgamma.EgammaPhotonProducers.conversionTrackSequence_cff import *
uncleanedOnlyOutInConversionTrackProducer = outInConversionTrackProducer.clone(
TrackProducer = cms.string('uncleanedOnlyCkfOutInTracksFromConversions')
TrackProducer = 'uncleanedOnlyCkfOutInTracksFromConversions'
)

from RecoEgamma.EgammaPhotonProducers.conversionTrackSequence_cff import *
uncleanedOnlyGsfConversionTrackProducer = gsfConversionTrackProducer.clone(
TrackProducer = cms.string('uncleanedOnlyElectronGsfTracks')
TrackProducer = 'uncleanedOnlyElectronGsfTracks'
)

uncleanedOnlyConversionTrackProducersTask = cms.Task(uncleanedOnlyGeneralConversionTrackProducer,uncleanedOnlyInOutConversionTrackProducer,uncleanedOnlyOutInConversionTrackProducer,uncleanedOnlyGsfConversionTrackProducer)
uncleanedOnlyConversionTrackProducers = cms.Sequence(uncleanedOnlyConversionTrackProducersTask)

from RecoEgamma.EgammaPhotonProducers.conversionTrackSequence_cff import *
uncleanedOnlyInOutOutInConversionTrackMerger = inOutOutInConversionTrackMerger.clone(
TrackProducer2 = cms.InputTag('uncleanedOnlyOutInConversionTrackProducer'),
TrackProducer1 = cms.InputTag('uncleanedOnlyInOutConversionTrackProducer')
TrackProducer2 = 'uncleanedOnlyOutInConversionTrackProducer',
TrackProducer1 = 'uncleanedOnlyInOutConversionTrackProducer'
)

from RecoEgamma.EgammaPhotonProducers.conversionTrackSequence_cff import *
uncleanedOnlyGeneralInOutOutInConversionTrackMerger = generalInOutOutInConversionTrackMerger.clone(
TrackProducer2 = cms.InputTag('uncleanedOnlyGeneralConversionTrackProducer'),
TrackProducer1 = cms.InputTag('uncleanedOnlyInOutOutInConversionTrackMerger')
TrackProducer2 = 'uncleanedOnlyGeneralConversionTrackProducer',
TrackProducer1 = 'uncleanedOnlyInOutOutInConversionTrackMerger'
)

from RecoEgamma.EgammaPhotonProducers.conversionTrackSequence_cff import *
uncleanedOnlyGsfGeneralInOutOutInConversionTrackMerger = gsfGeneralInOutOutInConversionTrackMerger.clone(
TrackProducer2 = cms.InputTag('uncleanedOnlyGsfConversionTrackProducer'),
TrackProducer1 = cms.InputTag('uncleanedOnlyGeneralInOutOutInConversionTrackMerger')
TrackProducer2 = 'uncleanedOnlyGsfConversionTrackProducer',
TrackProducer1 = 'uncleanedOnlyGeneralInOutOutInConversionTrackMerger'
)

uncleanedOnlyConversionTrackMergersTask = cms.Task(uncleanedOnlyInOutOutInConversionTrackMerger,uncleanedOnlyGeneralInOutOutInConversionTrackMerger,uncleanedOnlyGsfGeneralInOutOutInConversionTrackMerger)
uncleanedOnlyConversionTrackMergers = cms.Sequence(uncleanedOnlyConversionTrackMergersTask)

from RecoEgamma.EgammaPhotonProducers.allConversions_cfi import *
uncleanedOnlyAllConversions = allConversions.clone(
scBarrelProducer = cms.InputTag("uncleanedOnlyCorrectedHybridSuperClusters"),
bcBarrelCollection = cms.InputTag("hybridSuperClusters","uncleanOnlyHybridSuperClusters"),
scEndcapProducer = cms.InputTag("uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower"),
bcEndcapCollection = cms.InputTag("multi5x5SuperClusters","uncleanOnlyMulti5x5EndcapBasicClusters"),
src = cms.InputTag("uncleanedOnlyGsfGeneralInOutOutInConversionTrackMerger")
scBarrelProducer = "uncleanedOnlyCorrectedHybridSuperClusters",
bcBarrelCollection = "hybridSuperClusters:uncleanOnlyHybridSuperClusters",
scEndcapProducer = "uncleanedOnlyCorrectedMulti5x5SuperClustersWithPreshower",
bcEndcapCollection = "multi5x5SuperClusters:uncleanOnlyMulti5x5EndcapBasicClusters",
src = "uncleanedOnlyGsfGeneralInOutOutInConversionTrackMerger"
)

uncleanedOnlyConversionsTask = cms.Task(uncleanedOnlyCkfTracksFromConversionsTask,uncleanedOnlyConversionTrackProducersTask,uncleanedOnlyConversionTrackMergersTask,uncleanedOnlyAllConversions)
Expand All @@ -112,19 +112,19 @@

from RecoParticleFlow.PFTracking.pfTrack_cfi import *
uncleanedOnlyPfTrack = pfTrack.clone(
GsfTrackModuleLabel = cms.InputTag("uncleanedOnlyElectronGsfTracks")
GsfTrackModuleLabel = "uncleanedOnlyElectronGsfTracks"
)

from RecoParticleFlow.PFTracking.pfConversions_cfi import *
uncleanedOnlyPfConversions = pfConversions.clone(
conversionCollection = cms.InputTag("allConversions")
conversionCollection = "allConversions"
)

from RecoParticleFlow.PFTracking.pfTrackElec_cfi import *
uncleanedOnlyPfTrackElec = pfTrackElec.clone(
PFConversions = cms.InputTag("uncleanedOnlyPfConversions"),
GsfTrackModuleLabel = cms.InputTag("uncleanedOnlyElectronGsfTracks"),
PFRecTrackLabel = cms.InputTag("uncleanedOnlyPfTrack")
PFConversions = "uncleanedOnlyPfConversions",
GsfTrackModuleLabel = "uncleanedOnlyElectronGsfTracks",
PFRecTrackLabel = "uncleanedOnlyPfTrack"
)

uncleanedOnlyPfTrackingTask = cms.Task(uncleanedOnlyPfTrack,uncleanedOnlyPfConversions,uncleanedOnlyPfTrackElec)
Expand All @@ -137,15 +137,15 @@
from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCores_cfi import ecalDrivenGsfElectronCores
from RecoEgamma.EgammaElectronProducers.ecalDrivenGsfElectronCoresFromMultiCl_cff import ecalDrivenGsfElectronCoresFromMultiCl
uncleanedOnlyGsfElectronCores = ecalDrivenGsfElectronCores.clone(
gsfTracks = cms.InputTag("uncleanedOnlyElectronGsfTracks"),
gsfPfRecTracks = cms.InputTag("uncleanedOnlyPfTrackElec")
gsfTracks = "uncleanedOnlyElectronGsfTracks",
gsfPfRecTracks = "uncleanedOnlyPfTrackElec"
)

from RecoEgamma.EgammaElectronProducers.gsfElectrons_cfi import *
uncleanedOnlyGsfElectrons = ecalDrivenGsfElectrons.clone(
gsfPfRecTracksTag = cms.InputTag("uncleanedOnlyPfTrackElec"),
gsfElectronCoresTag = cms.InputTag("uncleanedOnlyGsfElectronCores"),
seedsTag = cms.InputTag("uncleanedOnlyElectronSeeds")
gsfPfRecTracksTag = "uncleanedOnlyPfTrackElec",
gsfElectronCoresTag = "uncleanedOnlyGsfElectronCores",
seedsTag = "uncleanedOnlyElectronSeeds"
)

uncleanedOnlyElectronsTask = cms.Task(uncleanedOnlyGsfElectronCores,uncleanedOnlyGsfElectrons)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@
isolationConeDefinitions = IsoConeDefinitions
)

egmPhotonIsolationMiniAODPUPPI = egmPhotonIsolationAODPUPPI.clone()
egmPhotonIsolationMiniAODPUPPI.srcForIsolationCone = cms.InputTag("packedPFCandidates")
egmPhotonIsolationMiniAODPUPPI.srcToIsolate = cms.InputTag("slimmedPhotons")
egmPhotonIsolationMiniAODPUPPI.puppiValueMap = cms.InputTag('')
egmPhotonIsolationMiniAODPUPPI = egmPhotonIsolationAODPUPPI.clone(
srcForIsolationCone = "packedPFCandidates",
srcToIsolate = "slimmedPhotons",
puppiValueMap = ''
)
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@

#V2, used by HEEP ID in 2016
trkIsol03CfgV2 = cms.PSet(
barrelCuts=_defaultCuts.clone(algosToReject = cms.vstring()),
endcapCuts=_defaultCuts.clone(algosToReject = cms.vstring(),maxDZ=0.5)
barrelCuts=_defaultCuts.clone(algosToReject = []),
endcapCuts=_defaultCuts.clone(algosToReject = [],maxDZ=0.5)
)
trkIsol04CfgV2 = cms.PSet(
barrelCuts=trkIsol03CfgV2.barrelCuts.clone(maxDR=0.4),
Expand Down
Loading

0 comments on commit ce21f59

Please sign in to comment.