Merge pull request #33048 from jeongeun/recoHIupdate

drop type specs and move parameters inside the modifier in RecoHI

RecoHI/Configuration/python/Reconstruction_HI_cff.py

@@ -9,9 +9,9 @@
 # Egamma
 from RecoHI.HiEgammaAlgos.HiEgamma_cff import *
 from RecoHI.HiEgammaAlgos.HiElectronSequence_cff import *
-ecalDrivenElectronSeeds.SCEtCut = cms.double(15.0)
-ecalDrivenGsfElectrons.preselection.minSCEtBarrel = cms.double(15.0)
-ecalDrivenGsfElectrons.preselection.minSCEtEndcaps = cms.double(15.0)
+ecalDrivenElectronSeeds.SCEtCut = 15.0
+ecalDrivenGsfElectrons.preselection.minSCEtBarrel = 15.0
+ecalDrivenGsfElectrons.preselection.minSCEtEndcaps = 15.0
 
 # Jet Reconstruction
 from RecoHI.HiJetAlgos.HiRecoJets_cff import *
@@ -106,4 +106,4 @@
 
 # Modify zero-suppression sequence here
 from RecoLocalTracker.SiStripZeroSuppression.SiStripZeroSuppression_cfi import *
-siStripZeroSuppression.storeCM = cms.bool(True)
+siStripZeroSuppression.storeCM = True

RecoHI/Configuration/python/Reconstruction_hiPF_cff.py

@@ -20,7 +20,8 @@
 gedPhotons.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
 photonIDValueMaps.vertices = "hiSelectedVertex"
 from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducer
-photonIsolationHIProducerGED = photonIsolationHIProducer.clone(photonProducer="gedPhotonsTmp")
+
+photonIsolationHIProducerGED = photonIsolationHIProducer.clone(photonProducer = "gedPhotonsTmp")
 
 #These are set for consistency w/ HiElectronSequence, but these cuts need to be studied
 gedGsfElectronsTmp.preselection.maxHOverEBarrelCone = 0.25

RecoHI/HiEgammaAlgos/python/HiElectronSequence_cff.py

@@ -3,39 +3,39 @@
 
 # creates the recoGsfTracks_electronGsfTracks__RECO = input GSF tracks
 from TrackingTools.GsfTracking.GsfElectronTracking_cff import *
-ecalDrivenElectronSeeds.initialSeedsVector = cms.VInputTag(cms.InputTag("hiPixelTrackSeeds"))
+ecalDrivenElectronSeeds.initialSeedsVector = ["hiPixelTrackSeeds"]
 electronCkfTrackCandidates.src = "ecalDrivenElectronSeeds"
 
-ecalDrivenElectronSeeds.maxHOverEBarrel = cms.double(0.25)
-ecalDrivenElectronSeeds.maxHOverEEndcaps = cms.double(0.25)
+ecalDrivenElectronSeeds.maxHOverEBarrel = 0.25
+ecalDrivenElectronSeeds.maxHOverEEndcaps = 0.25
 
 electronGsfTrackingHiTask = cms.Task(ecalDrivenElectronSeeds ,
                                      electronCkfTrackCandidates ,
                                      electronGsfTracks)
 
 from RecoEgamma.EgammaElectronProducers.gsfElectronSequence_cff import *
 
-ecalDrivenGsfElectrons.ctfTracksTag = cms.InputTag("hiGeneralTracks")
-ecalDrivenGsfElectronCores.ctfTracks = cms.InputTag("hiGeneralTracks")
-ecalDrivenGsfElectrons.vtxTag = cms.InputTag("hiSelectedVertex")
+ecalDrivenGsfElectrons.ctfTracksTag = "hiGeneralTracks"
+ecalDrivenGsfElectronCores.ctfTracks = "hiGeneralTracks"
+ecalDrivenGsfElectrons.vtxTag = "hiSelectedVertex"
 
-ecalDrivenGsfElectrons.preselection.maxHOverEBarrelCone = cms.double(0.25)
-ecalDrivenGsfElectrons.preselection.maxHOverEEndcapsCone = cms.double(0.25)
-ecalDrivenGsfElectrons.preselection.maxHOverEBarrelTower = cms.double(0.)
-ecalDrivenGsfElectrons.preselection.maxHOverEEndcapsTower = cms.double(0.)
-ecalDrivenGsfElectrons.fillConvVtxFitProb = cms.bool(False)
+ecalDrivenGsfElectrons.preselection.maxHOverEBarrelCone = 0.25
+ecalDrivenGsfElectrons.preselection.maxHOverEEndcapsCone = 0.25
+ecalDrivenGsfElectrons.preselection.maxHOverEBarrelTower = 0.
+ecalDrivenGsfElectrons.preselection.maxHOverEEndcapsTower = 0.
+ecalDrivenGsfElectrons.fillConvVtxFitProb = False
 
 
 from RecoParticleFlow.PFTracking.pfTrack_cfi import *
-pfTrack.UseQuality = cms.bool(True)
-pfTrack.TrackQuality = cms.string('highPurity')
-pfTrack.TkColList = cms.VInputTag("hiGeneralTracks")
-pfTrack.PrimaryVertexLabel = cms.InputTag("hiSelectedVertex")
-pfTrack.MuColl = cms.InputTag("hiMuons1stStep")
+pfTrack.UseQuality = True
+pfTrack.TrackQuality = 'highPurity'
+pfTrack.TkColList = ["hiGeneralTracks"]
+pfTrack.PrimaryVertexLabel = "hiSelectedVertex"
+pfTrack.MuColl = "hiMuons1stStep"
 
 from RecoParticleFlow.PFTracking.pfTrackElec_cfi import *
-pfTrackElec.applyGsfTrackCleaning = cms.bool(True)
-pfTrackElec.PrimaryVertexLabel = cms.InputTag("hiSelectedVertex")
+pfTrackElec.applyGsfTrackCleaning = True
+pfTrackElec.PrimaryVertexLabel = "hiSelectedVertex"
 
 hiElectronTask = cms.Task(electronGsfTrackingHiTask ,   
                           pfTrack ,

RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py

@@ -67,7 +67,7 @@
 
 # building: feed the new-named seeds
 hiRegitMuDetachedTripletStepTrajectoryFilterBase = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryFilterBase.clone(
-    minPt = 0.8 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = cms.int32(3),
+    minPt = 0.8 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = 3,
 )
 
 hiRegitMuDetachedTripletStepTrajectoryFilter = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryFilter.clone(
@@ -104,43 +104,44 @@
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
             name      = 'hiRegitMuDetachedTripletStepLoose',
             min_nhits = 8
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
             name          = 'hiRegitMuDetachedTripletStepTight',
             preFilterName = 'hiRegitMuDetachedTripletStepLoose',
             min_nhits     = 8,
             useMVA        = True,
             minMVA        = -0.2
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
             name          = 'hiRegitMuDetachedTripletStep',
             preFilterName = 'hiRegitMuDetachedTripletStepTight',
             min_nhits     = 8,
             useMVA        = True,
             minMVA        = -0.09
-            )
+        )
     ) #end of vpset
 )
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuDetachedTripletStepSelector, useAnyMVA = False)
-trackingPhase1.toModify(hiRegitMuDetachedTripletStepSelector, trackSelectors= cms.VPSet(
-        RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
-            name      = 'hiRegitMuDetachedTripletStepLoose',
-            min_nhits = 8
+trackingPhase1.toModify(hiRegitMuDetachedTripletStepSelector, 
+        useAnyMVA = False,
+        trackSelectors= cms.VPSet(
+            RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
+                name      = 'hiRegitMuDetachedTripletStepLoose',
+                min_nhits = 8
             ),
-        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
-            name          = 'hiRegitMuDetachedTripletStepTight',
-            preFilterName = 'hiRegitMuDetachedTripletStepLoose',
-            min_nhits     = 8,
-            useMVA        = False,
-            minMVA        = -0.2
+            RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
+                name          = 'hiRegitMuDetachedTripletStepTight',
+                preFilterName = 'hiRegitMuDetachedTripletStepLoose',
+                min_nhits     = 8,
+                useMVA        = False,
+                minMVA        = -0.2
             ),
-        RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
-            name          = 'hiRegitMuDetachedTripletStep',
-            preFilterName = 'hiRegitMuDetachedTripletStepTight',
-            min_nhits     = 8,
-            useMVA        = False,
-            minMVA        = -0.09
+            RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
+                name          = 'hiRegitMuDetachedTripletStep',
+                preFilterName = 'hiRegitMuDetachedTripletStepTight',
+                min_nhits     = 8,
+                useMVA        = False,
+                minMVA        = -0.09
             )
         )
 )

RecoHI/HiMuonAlgos/python/HiRegitMuonInitialStep_cff.py

@@ -45,7 +45,6 @@
     seedingHitSets = "hiRegitMuInitialStepHitTriplets"
 )
 
-
 # building: feed the new-named seeds
 hiRegitMuInitialStepTrajectoryFilterBase = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrajectoryFilterBase.clone(
     minPt = 2.5 # after each new hit, apply pT cut for traj w/ at least minHitsMinPt = cms.int32(3),
@@ -90,45 +89,46 @@
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
            name = 'hiRegitMuInitialStepLoose',
            min_nhits = 8
-            ), #end of pset
+        ), #end of pset
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
             name = 'hiRegitMuInitialStepTight',
             preFilterName = 'hiRegitMuInitialStepLoose',
             min_nhits = 8,
             useMVA = True,
             minMVA = -0.38
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
             name = 'hiRegitMuInitialStep',
             preFilterName = 'hiRegitMuInitialStepTight',
             min_nhits = 8,
             useMVA = True,
             minMVA = -0.77
-            ),
-        ) #end of vpset
-    )
+        ),
+    ) #end of vpset
+)
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuInitialStepSelector, useAnyMVA = False)
-trackingPhase1.toModify(hiRegitMuInitialStepSelector, trackSelectors= cms.VPSet(
+trackingPhase1.toModify(hiRegitMuInitialStepSelector, 
+    useAnyMVA = False,
+    trackSelectors= cms.VPSet(
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
            name = 'hiRegitMuInitialStepLoose',
            min_nhits = 8
-            ), #end of pset
+        ), #end of pset
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
             name = 'hiRegitMuInitialStepTight',
             preFilterName = 'hiRegitMuInitialStepLoose',
             min_nhits = 8,
             useMVA = False,
             minMVA = -0.38
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
             name = 'hiRegitMuInitialStep',
             preFilterName = 'hiRegitMuInitialStepTight',
             min_nhits = 8,
             useMVA = False,
             minMVA = -0.77
-            ),
-        )
+        ),
+    )
 )
 
 hiRegitMuonInitialStepTask = cms.Task(hiRegitMuInitialStepSeedLayers,

RecoHI/HiMuonAlgos/python/HiRegitMuonMixedTripletStep_cff.py

@@ -130,45 +130,46 @@
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
            name      = 'hiRegitMuMixedTripletStepLoose',
            min_nhits = 8
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
             name      = 'hiRegitMuMixedTripletStepTight',
             preFilterName = 'hiRegitMuMixedTripletStepLoose',
             min_nhits = 8,
             useMVA    = True,
             minMVA    = -0.2
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
             name      = 'hiRegitMuMixedTripletStep',
             preFilterName = 'hiRegitMuMixedTripletStepTight',
             min_nhits = 8,
             useMVA    = True,
             minMVA    = -0.09
-            )
-        ) #end of vpset
+        )
+    ) #end of vpset
 ) #end of clone
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuMixedTripletStepSelector, useAnyMVA = False)
-trackingPhase1.toModify(hiRegitMuMixedTripletStepSelector, trackSelectors= cms.VPSet(
+trackingPhase1.toModify(hiRegitMuMixedTripletStepSelector, 
+    useAnyMVA = False,
+    trackSelectors= cms.VPSet(
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
            name      = 'hiRegitMuMixedTripletStepLoose',
            min_nhits = 8
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
             name      = 'hiRegitMuMixedTripletStepTight',
             preFilterName = 'hiRegitMuMixedTripletStepLoose',
             min_nhits = 8,
             useMVA    = False,
             minMVA    = -0.2
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
             name      = 'hiRegitMuMixedTripletStep',
             preFilterName = 'hiRegitMuMixedTripletStepTight',
             min_nhits = 8,
             useMVA    = False,
             minMVA    = -0.09
-            )
-        ) #end of vpset
+        )
+    ) #end of vpset
 )
 
 hiRegitMuonMixedTripletStepTask = cms.Task(hiRegitMuMixedTripletStepClusters,

RecoHI/HiMuonAlgos/python/HiRegitMuonPixelLessStep_cff.py

@@ -98,47 +98,48 @@
     GBRForestVars  = ['chi2perdofperlayer', 'nhits', 'nlayers', 'eta'],
     trackSelectors = cms.VPSet(  
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
-           name      = 'hiRegitMuPixelLessStepLoose',
-           min_nhits = 8
-            ),
+            name      = 'hiRegitMuPixelLessStepLoose',
+            min_nhits = 8
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
             name          = 'hiRegitMuPixelLessStepTight',
             preFilterName = 'hiRegitMuPixelLessStepLoose',
             min_nhits     = 8,
             useMVA        = True,
             minMVA        = -0.2
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
             name          = 'hiRegitMuPixelLessStep',
             preFilterName = 'hiRegitMuPixelLessStepTight',
             min_nhits     = 8,
             useMVA        = True,
             minMVA        = -0.09
-            ),
-        ) #end of vpset
+        ),
+    ) #end of vpset
 )
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
-trackingPhase1.toModify(hiRegitMuPixelLessStepSelector, useAnyMVA = False)
-trackingPhase1.toModify(hiRegitMuPixelLessStepSelector, trackSelectors= cms.VPSet(
+trackingPhase1.toModify(hiRegitMuPixelLessStepSelector, 
+    useAnyMVA = False,
+    trackSelectors= cms.VPSet(
         RecoTracker.FinalTrackSelectors.multiTrackSelector_cfi.looseMTS.clone(
-           name      = 'hiRegitMuPixelLessStepLoose',
-           min_nhits = 8
-            ),
+            name      = 'hiRegitMuPixelLessStepLoose',
+            min_nhits = 8
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiTightMTS.clone(
             name          = 'hiRegitMuPixelLessStepTight',
             preFilterName = 'hiRegitMuPixelLessStepLoose',
             min_nhits     = 8,
             useMVA        = False,
             minMVA        = -0.2
-            ),
+        ),
         RecoHI.HiTracking.hiMultiTrackSelector_cfi.hiHighpurityMTS.clone(
             name          = 'hiRegitMuPixelLessStep',
             preFilterName = 'hiRegitMuPixelLessStepTight',
             min_nhits     = 8,
             useMVA        = False,
             minMVA        = -0.09
-            ),
-        ) #end of vpset
+        ),
+    ) #end of vpset
 )
 
 hiRegitMuonPixelLessStepTask = cms.Task(hiRegitMuPixelLessStepClusters,
@@ -151,4 +152,3 @@
                                         hiRegitMuPixelLessStepTracks,
                                         hiRegitMuPixelLessStepSelector)
 hiRegitMuonPixelLessStep = cms.Sequence(hiRegitMuonPixelLessStepTask)
-