diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronCores_cff.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronCores_cff.py index 4469cccba62d5..9f498a5dc73f4 100644 --- a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronCores_cff.py +++ b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronCores_cff.py @@ -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") diff --git a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py index 95f6a87da6091..25fb120484d2d 100644 --- a/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py +++ b/RecoEgamma/EgammaElectronProducers/python/lowPtGsfElectronSeeds_cfi.py @@ -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 +) diff --git a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py index 38eed5f98c889..1bd69a6d38ca9 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/eleIsoDepositHcalFromTowers_cff.py @@ -17,7 +17,7 @@ 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"), @@ -25,4 +25,4 @@ trackType = cms.string('candidate'), ExtractorPSet = cms.PSet( EleIsoHcalFromTowersExtractorBlock ) ) -eleIsoDepositHcalDepth2FromTowers.ExtractorPSet.hcalDepth = cms.int32(2) +eleIsoDepositHcalDepth2FromTowers.ExtractorPSet.hcalDepth = 2 diff --git a/RecoEgamma/EgammaIsolationAlgos/python/gamIsoDepositHcalFromTowers_cff.py b/RecoEgamma/EgammaIsolationAlgos/python/gamIsoDepositHcalFromTowers_cff.py index af38e48f397a6..e397a25adaf90 100644 --- a/RecoEgamma/EgammaIsolationAlgos/python/gamIsoDepositHcalFromTowers_cff.py +++ b/RecoEgamma/EgammaIsolationAlgos/python/gamIsoDepositHcalFromTowers_cff.py @@ -17,7 +17,7 @@ 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"), @@ -25,5 +25,5 @@ trackType = cms.string('candidate'), ExtractorPSet = cms.PSet( GamIsoHcalFromTowersExtractorBlock ) ) -gamIsoDepositHcalDepth2FromTowers.ExtractorPSet.hcalDepth = cms.int32(2) +gamIsoDepositHcalDepth2FromTowers.ExtractorPSet.hcalDepth = 2 diff --git a/RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py index 3da3570428e0f..4ae902ff34b9b 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/allConversions_cfi.py @@ -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') diff --git a/RecoEgamma/EgammaPhotonProducers/python/cosmicConversionSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/cosmicConversionSequence_cff.py index 3ea49a14f2de0..d918279261e5e 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/cosmicConversionSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/cosmicConversionSequence_cff.py @@ -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) diff --git a/RecoEgamma/EgammaPhotonProducers/python/cosmicConversionTrackSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/cosmicConversionTrackSequence_cff.py index 7f2e5e2de27d7..41a44bc1e480f 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/cosmicConversionTrackSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/cosmicConversionTrackSequence_cff.py @@ -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 * diff --git a/RecoEgamma/EgammaPhotonProducers/python/cosmicPhotonSequence_cff.py b/RecoEgamma/EgammaPhotonProducers/python/cosmicPhotonSequence_cff.py index 21209b1565e3e..c79369717066c 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/cosmicPhotonSequence_cff.py +++ b/RecoEgamma/EgammaPhotonProducers/python/cosmicPhotonSequence_cff.py @@ -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) diff --git a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py index 227054b476055..7c6964e437e9e 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/reducedEgamma_cfi.py @@ -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 diff --git a/RecoEgamma/EgammaPhotonProducers/python/trajectoryFilterForConversions_cfi.py b/RecoEgamma/EgammaPhotonProducers/python/trajectoryFilterForConversions_cfi.py index 64f32f206b735..504ab63fc44a2 100644 --- a/RecoEgamma/EgammaPhotonProducers/python/trajectoryFilterForConversions_cfi.py +++ b/RecoEgamma/EgammaPhotonProducers/python/trajectoryFilterForConversions_cfi.py @@ -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') ) -