Skip to content

Commit

Permalink
Merge pull request #32794 from jeongeun/recoegm112X
Browse files Browse the repository at this point in the history 
drop type specifications in RecoEgamma
  • Loading branch information
@cmsbuild
cmsbuild authored Feb 4, 2021
2 parents 056c049 + 75ab2f6 commit d97d364
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 84 deletions.
2 changes: 1 addition & 1 deletion RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronCores_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
from RecoEgamma.EgammaElectronProducers.lowPtGsfElectronCores_cfi import lowPtGsfElectronCores

from Configuration.Eras.Modifier_fastSim_cff import fastSim
fastSim.toModify(lowPtGsfElectronCores,ctfTracks = cms.InputTag("generalTracksBeforeMixing"))
fastSim.toModify(lowPtGsfElectronCores,ctfTracks = "generalTracksBeforeMixing")
6 changes: 4 additions & 2 deletions RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,7 @@ def thresholds( wp ) :

# Modifiers for BParking
from Configuration.Eras.Modifier_bParking_cff import bParking
bParking.toModify(lowPtGsfElectronSeeds, ModelThresholds = thresholds("VL") )
bParking.toModify(lowPtGsfElectronSeeds, MinPtThreshold = 0.5)
bParking.toModify(lowPtGsfElectronSeeds,
ModelThresholds = thresholds("VL"),
MinPtThreshold = 0.5
)
4 changes: 2 additions & 2 deletions RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
trackType = cms.string('candidate'),
ExtractorPSet = cms.PSet( EleIsoHcalFromTowersExtractorBlock )
)
eleIsoDepositHcalDepth1FromTowers.ExtractorPSet.hcalDepth = cms.int32(1)
eleIsoDepositHcalDepth1FromTowers.ExtractorPSet.hcalDepth = 1

eleIsoDepositHcalDepth2FromTowers = cms.EDProducer("CandIsoDepositProducer",
src = cms.InputTag("gedGsfElectrons"),
MultipleDepositsFlag = cms.bool(False),
trackType = cms.string('candidate'),
ExtractorPSet = cms.PSet( EleIsoHcalFromTowersExtractorBlock )
)
eleIsoDepositHcalDepth2FromTowers.ExtractorPSet.hcalDepth = cms.int32(2)
eleIsoDepositHcalDepth2FromTowers.ExtractorPSet.hcalDepth = 2
4 changes: 2 additions & 2 deletions RecoEgamma/EgammaIsolationAlgos/python/gamIsoDepositHcalFromTowers_cff.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
trackType = cms.string('candidate'),
ExtractorPSet = cms.PSet( GamIsoHcalFromTowersExtractorBlock )
)
gamIsoDepositHcalDepth1FromTowers.ExtractorPSet.hcalDepth = cms.int32(1)
gamIsoDepositHcalDepth1FromTowers.ExtractorPSet.hcalDepth = 1

gamIsoDepositHcalDepth2FromTowers = cms.EDProducer("CandIsoDepositProducer",
src = cms.InputTag("photons"),
MultipleDepositsFlag = cms.bool(False),
trackType = cms.string('candidate'),
ExtractorPSet = cms.PSet( GamIsoHcalFromTowersExtractorBlock )
)
gamIsoDepositHcalDepth2FromTowers.ExtractorPSet.hcalDepth = cms.int32(2)
gamIsoDepositHcalDepth2FromTowers.ExtractorPSet.hcalDepth = 2

2 changes: 1 addition & 1 deletion RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,6 @@
)

from Configuration.Eras.Modifier_phase2_hgcal_cff import phase2_hgcal
phase2_hgcal.toModify( allConversions, bypassPreselGsf = cms.bool(False) )
phase2_hgcal.toModify( allConversions, bypassPreselGsf = False )
from Configuration.Eras.Modifier_fastSim_cff import fastSim
fastSim.toModify(allConversions, src = 'gsfGeneralConversionTrackMerger')
10 changes: 5 additions & 5 deletions RecoEgamma/EgammaPhotonProducers/python/cosmicConversionSequence_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import FWCore.ParameterSet.Config as cms

from RecoEgamma.EgammaPhotonProducers.conversionSequence_cff import *
conversions.scHybridBarrelProducer = cms.InputTag("cosmicSuperClusters","CosmicBarrelSuperClusters")
conversions.scIslandEndcapProducer = cms.InputTag("cosmicSuperClusters","CosmicEndcapSuperClusters")
conversions.bcBarrelCollection = cms.InputTag("cosmicBasicClusters","CosmicBarrelBasicClusters")
conversions.bcEndcapCollection = cms.InputTag("cosmicBasicClusters","CosmicEndcapBasicClusters")
conversions.recoverOneTrackCase = cms.bool(False)
conversions.scHybridBarrelProducer = "cosmicSuperClusters:CosmicBarrelSuperClusters"
conversions.scIslandEndcapProducer = "cosmicSuperClusters:CosmicEndcapSuperClusters"
conversions.bcBarrelCollection = "cosmicBasicClusters:CosmicBarrelBasicClusters"
conversions.bcEndcapCollection = "cosmicBasicClusters:CosmicEndcapBasicClusters"
conversions.recoverOneTrackCase = False

cosmicConversionTask = cms.Task(conversionTask)
cosmicConversionSequence = cms.Sequence(cosmicConversionTask)
9 changes: 5 additions & 4 deletions RecoEgamma/EgammaPhotonProducers/python/cosmicConversionTrackSequence_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import FWCore.ParameterSet.Config as cms

# Conversion Track candidate producer

from RecoEgamma.EgammaPhotonProducers.conversionTrackCandidates_cff import *
conversionTrackCandidates.scHybridBarrelProducer = cms.InputTag("cosmicSuperClusters","CosmicBarrelSuperClusters")
conversionTrackCandidates.scIslandEndcapProducer = cms.InputTag("cosmicSuperClusters","CosmicEndcapSuperClusters")
conversionTrackCandidates.bcBarrelCollection = cms.InputTag("cosmicBasicClusters","CosmicBarrelBasicClusters")
conversionTrackCandidates.bcEndcapCollection = cms.InputTag("cosmicBasicClusters","CosmicEndcapBasicClusters")
conversionTrackCandidates.scHybridBarrelProducer = "cosmicSuperClusters:CosmicBarrelSuperClusters"
conversionTrackCandidates.scIslandEndcapProducer = "cosmicSuperClusters:CosmicEndcapSuperClusters"
conversionTrackCandidates.bcBarrelCollection = "cosmicBasicClusters:CosmicBarrelBasicClusters"
conversionTrackCandidates.bcEndcapCollection = "cosmicBasicClusters:CosmicEndcapBasicClusters"

# Conversion Track producer ( final fit )
from RecoEgamma.EgammaPhotonProducers.ckfOutInTracksFromConversions_cfi import *
Expand Down
12 changes: 6 additions & 6 deletions RecoEgamma/EgammaPhotonProducers/python/cosmicPhotonSequence_cff.py
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import FWCore.ParameterSet.Config as cms

from RecoEgamma.EgammaPhotonProducers.photonSequence_cff import *
photonCore.scHybridBarrelProducer = cms.InputTag("cosmicSuperClusters","CosmicBarrelSuperClusters")
photonCore.scIslandEndcapProducer = cms.InputTag("cosmicSuperClusters","CosmicEndcapSuperClusters")
photonCore.minSCEt = cms.double(0.0)
photonCore.scHybridBarrelProducer = "cosmicSuperClusters:CosmicBarrelSuperClusters"
photonCore.scIslandEndcapProducer = "cosmicSuperClusters:CosmicEndcapSuperClusters"
photonCore.minSCEt = 0.0


photons.usePrimaryVertex = cms.bool(False)
photons.minSCEtBarrel = cms.double(0.0)
photons.minSCEtEndcap = cms.double(0.0)
photons.usePrimaryVertex = False
photons.minSCEtBarrel = 0.0
photons.minSCEtEndcap = 0.0

cosmicPhotonTask = cms.Task(photonCore,photons)
cosmicPhotonSequence = cms.Sequence(cosmicPhotonTask)
74 changes: 25 additions & 49 deletions RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,64 +51,40 @@

from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toModify(reducedEgamma,
preshowerEcalHits = cms.InputTag(""),
preshowerEcalHits = "",
)

from Configuration.Eras.Modifier_run2_miniAOD_80XLegacy_cff import run2_miniAOD_80XLegacy
run2_miniAOD_80XLegacy.toModify(
reducedEgamma,
photonFloatValueMapSources = cms.VInputTag(
cms.InputTag("photonEcalPFClusterIsolationProducer"),
cms.InputTag("photonHcalPFClusterIsolationProducer"),
),
photonFloatValueMapOutput = cms.vstring(
"phoEcalPFClusIso",
"phoHcalPFClusIso",
),
ootPhotonFloatValueMapSources = cms.VInputTag(
cms.InputTag("ootPhotonEcalPFClusterIsolationProducer"),
),
ootPhotonFloatValueMapOutput = cms.vstring(
"ootPhoEcalPFClusIso",
),
gsfElectronFloatValueMapSources = cms.VInputTag(
cms.InputTag("electronEcalPFClusterIsolationProducer"),
cms.InputTag("electronHcalPFClusterIsolationProducer"),
),
gsfElectronFloatValueMapOutput = cms.vstring(
"eleEcalPFClusIso",
"eleHcalPFClusIso",
)
)
photonFloatValueMapSources = ["photonEcalPFClusterIsolationProducer",
"photonHcalPFClusterIsolationProducer"],
photonFloatValueMapOutput = ["phoEcalPFClusIso",
"phoHcalPFClusIso"],
ootPhotonFloatValueMapSources = ["ootPhotonEcalPFClusterIsolationProducer"],
ootPhotonFloatValueMapOutput = ["ootPhoEcalPFClusIso"],
gsfElectronFloatValueMapSources = ["electronEcalPFClusterIsolationProducer",
"electronHcalPFClusterIsolationProducer"],
gsfElectronFloatValueMapOutput = ["eleEcalPFClusIso",
"eleHcalPFClusIso"]
)

from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17
run2_miniAOD_94XFall17.toModify(
reducedEgamma,
photonFloatValueMapSources = cms.VInputTag(
cms.InputTag("photonEcalPFClusterIsolationProducer"),
cms.InputTag("photonHcalPFClusterIsolationProducer"),
),
photonFloatValueMapOutput = cms.vstring(
"phoEcalPFClusIso",
"phoHcalPFClusIso",
),
ootPhotonFloatValueMapSources = cms.VInputTag(
cms.InputTag("ootPhotonEcalPFClusterIsolationProducer"),
cms.InputTag("ootPhotonHcalPFClusterIsolationProducer"),
),
ootPhotonFloatValueMapOutput = cms.vstring(
"ootPhoEcalPFClusIso",
"ootPhoHcalPFClusIso",
),
gsfElectronFloatValueMapSources = cms.VInputTag(
cms.InputTag("electronEcalPFClusterIsolationProducer"),
cms.InputTag("electronHcalPFClusterIsolationProducer"),
),
gsfElectronFloatValueMapOutput = cms.vstring(
"eleEcalPFClusIso",
"eleHcalPFClusIso",
)
)
photonFloatValueMapSources = ["photonEcalPFClusterIsolationProducer",
"photonHcalPFClusterIsolationProducer"],
photonFloatValueMapOutput = ["phoEcalPFClusIso",
"phoHcalPFClusIso"],
ootPhotonFloatValueMapSources = ["ootPhotonEcalPFClusterIsolationProducer",
"ootPhotonHcalPFClusterIsolationProducer"],
ootPhotonFloatValueMapOutput = ["ootPhoEcalPFClusIso",
"ootPhoHcalPFClusIso"],
gsfElectronFloatValueMapSources = ["electronEcalPFClusterIsolationProducer",
"electronHcalPFClusterIsolationProducer"],
gsfElectronFloatValueMapOutput = ["eleEcalPFClusIso",
"eleHcalPFClusIso"],
)

from RecoEgamma.EgammaPhotonProducers.reducedEgamma_tools import calibrateReducedEgamma
from Configuration.Eras.Modifier_run2_miniAOD_94XFall17_cff import run2_miniAOD_94XFall17
Expand Down
23 changes: 11 additions & 12 deletions RecoEgamma/EgammaPhotonProducers/python/trajectoryFilterForConversions_cfi.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,15 @@

import TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff
TrajectoryFilterForConversions = TrackingTools.TrajectoryFiltering.TrajectoryFilter_cff.CkfBaseTrajectoryFilter_block.clone(
chargeSignificance = cms.double(-1.0),
minPt = cms.double(0.9),
minHitsMinPt = cms.int32(-1),
ComponentType = cms.string('CkfBaseTrajectoryFilter'),
maxLostHits = cms.int32(1),
maxNumberOfHits = cms.int32(-1),
maxConsecLostHits = cms.int32(1),
nSigmaMinPt = cms.double(5.0),
minimumNumberOfHits = cms.int32(3),
maxCCCLostHits = cms.int32(9999),
minGoodStripCharge = cms.PSet(refToPSet_ = cms.string('SiStripClusterChargeCutNone'))
chargeSignificance = -1.0,
minPt = 0.9,
minHitsMinPt = -1,
ComponentType = 'CkfBaseTrajectoryFilter',
maxLostHits = 1,
maxNumberOfHits = -1,
maxConsecLostHits = 1,
nSigmaMinPt = 5.0,
minimumNumberOfHits = 3,
maxCCCLostHits = 9999,
minGoodStripCharge = dict(refToPSet_ = 'SiStripClusterChargeCutNone')
)

0 comments on commit d97d364

Please sign in to comment.