Merge pull request #32386 from jeongeun/syntaxRecoHI_112X

Drop type specs in RecoHI {Configuration, HiTracking}

RecoHI/Configuration/python/Reconstruction_hiPF_cff.py

@@ -6,38 +6,38 @@
 # run a trimmed down PF sequence with heavy-ion vertex, no conversions, nucl int, etc.
 
 from RecoParticleFlow.PFProducer.particleFlowEGamma_cff import *
-particleFlowEGamma.vertexCollection = cms.InputTag("hiSelectedVertex")
-gedGsfElectronCores.ctfTracks = cms.InputTag("hiGeneralTracks")
-gedGsfElectronsTmp.ctfTracksTag = cms.InputTag("hiGeneralTracks")
-gedGsfElectronsTmp.vtxTag = cms.InputTag("hiSelectedVertex")
-gedGsfElectronsTmp.preselection.minSCEtBarrel = cms.double(15.0)
-gedGsfElectronsTmp.preselection.minSCEtEndcaps = cms.double(15.0)
-gedGsfElectronsTmp.fillConvVtxFitProb = cms.bool(False)
-
-gedPhotonsTmp.primaryVertexProducer = cms.InputTag("hiSelectedVertex")
-gedPhotonsTmp.isolationSumsCalculatorSet.trackProducer = cms.InputTag("hiGeneralTracks")
-gedPhotons.primaryVertexProducer = cms.InputTag("hiSelectedVertex")
-gedPhotons.isolationSumsCalculatorSet.trackProducer = cms.InputTag("hiGeneralTracks")
-photonIDValueMaps.vertices = cms.InputTag("hiSelectedVertex")
+particleFlowEGamma.vertexCollection = "hiSelectedVertex"
+gedGsfElectronCores.ctfTracks = "hiGeneralTracks"
+gedGsfElectronsTmp.ctfTracksTag = "hiGeneralTracks"
+gedGsfElectronsTmp.vtxTag = "hiSelectedVertex"
+gedGsfElectronsTmp.preselection.minSCEtBarrel = 15.0
+gedGsfElectronsTmp.preselection.minSCEtEndcaps = 15.0
+gedGsfElectronsTmp.fillConvVtxFitProb = False
+
+gedPhotonsTmp.primaryVertexProducer = "hiSelectedVertex"
+gedPhotonsTmp.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
+gedPhotons.primaryVertexProducer = "hiSelectedVertex"
+gedPhotons.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
+photonIDValueMaps.vertices = "hiSelectedVertex"
 from RecoHI.HiEgammaAlgos.photonIsolationHIProducer_cfi import photonIsolationHIProducer
-photonIsolationHIProducerGED = photonIsolationHIProducer.clone(photonProducer=cms.InputTag("gedPhotonsTmp"))
+photonIsolationHIProducerGED = photonIsolationHIProducer.clone(photonProducer="gedPhotonsTmp")
 
 #These are set for consistency w/ HiElectronSequence, but these cuts need to be studied
-gedGsfElectronsTmp.preselection.maxHOverEBarrelCone = cms.double(0.25)
-gedGsfElectronsTmp.preselection.maxHOverEEndcapsCone = cms.double(0.25)
-gedGsfElectronsTmp.preselection.maxHOverEBarrelTower = cms.double(0.0)
-gedGsfElectronsTmp.preselection.maxHOverEEndcapsTower = cms.double(0.0)
-gedGsfElectronsTmp.preselection.maxEOverPBarrel = cms.double(2.)
-gedGsfElectronsTmp.preselection.maxEOverPEndcaps = cms.double(2.)
-
-ootPhotonsTmp.primaryVertexProducer = cms.InputTag("hiSelectedVertex")
-ootPhotonsTmp.isolationSumsCalculatorSet.trackProducer = cms.InputTag("hiGeneralTracks")
-ootPhotons.primaryVertexProducer = cms.InputTag("hiSelectedVertex")
-ootPhotons.isolationSumsCalculatorSet.trackProducer = cms.InputTag("hiGeneralTracks")
+gedGsfElectronsTmp.preselection.maxHOverEBarrelCone = 0.25
+gedGsfElectronsTmp.preselection.maxHOverEEndcapsCone = 0.25
+gedGsfElectronsTmp.preselection.maxHOverEBarrelTower = 0.0
+gedGsfElectronsTmp.preselection.maxHOverEEndcapsTower = 0.0
+gedGsfElectronsTmp.preselection.maxEOverPBarrel = 2.
+gedGsfElectronsTmp.preselection.maxEOverPEndcaps = 2.
+
+ootPhotonsTmp.primaryVertexProducer = "hiSelectedVertex"
+ootPhotonsTmp.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
+ootPhotons.primaryVertexProducer = "hiSelectedVertex"
+ootPhotons.isolationSumsCalculatorSet.trackProducer = "hiGeneralTracks"
 
 from RecoParticleFlow.Configuration.RecoParticleFlow_cff import *
 
-mvaElectrons.vertexTag = cms.InputTag("hiSelectedVertex")
+mvaElectrons.vertexTag = "hiSelectedVertex"
 
 particleFlowBlock.elementImporters = cms.VPSet(
     cms.PSet( importerName = cms.string("GSFTrackImporter"),
@@ -79,16 +79,16 @@
               source = cms.InputTag("particleFlowClusterPS") )
     )
 
-particleFlowTmp.postMuonCleaning = cms.bool(False)
-particleFlowTmp.vertexCollection = cms.InputTag("hiSelectedVertex")
-particleFlowTmp.muons = cms.InputTag("hiMuons1stStep")
-particleFlowTmp.usePFConversions = cms.bool(False)
+particleFlowTmp.postMuonCleaning = False
+particleFlowTmp.vertexCollection = "hiSelectedVertex"
+particleFlowTmp.muons = "hiMuons1stStep"
+particleFlowTmp.usePFConversions = False
 
 pfNoPileUpIso.enable = False
 pfPileUpIso.Enable = False
 pfNoPileUp.enable = False
 pfPileUp.Enable = False
-particleFlow.Muons = cms.InputTag("muons","hiMuons1stStep2muonsMap")
+particleFlow.Muons = "muons:hiMuons1stStep2muonsMap"
 
 
 # local reco must run before electrons (RecoHI/HiEgammaAlgos), due to PF integration

RecoHI/Configuration/python/peripheralHLTFilter_cff.py

@@ -1,22 +1,23 @@
 import FWCore.ParameterSet.Config as cms
 
 import HLTrigger.HLTfilters.hltHighLevel_cfi
-hltPerhiphHI = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone()
-hltPerhiphHI.HLTPaths = ["HLT_HISinglePhoton*_Eta*_Cent50_100_*",
-                         "HLT_HISinglePhoton*_Eta*_Cent30_100_*",
-                         "HLT_HIFullTrack*_L1Centrality30100_*",
-                         "HLT_HIPuAK4CaloJet*_Eta5p1_Cent50_100_v*",
-                         "HLT_HIPuAK4CaloJet*_Eta5p1_Cent30_100_v*",
-                         "HLT_HIDmesonHITrackingGlobal_Dpt*_Cent50_100_v*",
-                         "HLT_HIDmesonHITrackingGlobal_Dpt*_Cent30_100_v*",
-                         "HLT_HIL1Centralityext30100MinimumumBiasHF*",
-                         "HLT_HIL1Centralityext50100MinimumumBiasHF*",
-                         "HLT_HIQ2*005_Centrality3050_v*",
-                         "HLT_HIQ2*005_Centrality5070_v*",
-                         "HLT_HICastor*",
-                         "HLT_HIL1Castor*",
-                         "HLT_HIUPC*"]
-hltPerhiphHI.throw = False
-hltPerhiphHI.andOr = True
+hltPerhiphHI = HLTrigger.HLTfilters.hltHighLevel_cfi.hltHighLevel.clone(
+    HLTPaths = ["HLT_HISinglePhoton*_Eta*_Cent50_100_*",
+                "HLT_HISinglePhoton*_Eta*_Cent30_100_*",
+                "HLT_HIFullTrack*_L1Centrality30100_*",
+                "HLT_HIPuAK4CaloJet*_Eta5p1_Cent50_100_v*",
+                "HLT_HIPuAK4CaloJet*_Eta5p1_Cent30_100_v*",
+                "HLT_HIDmesonHITrackingGlobal_Dpt*_Cent50_100_v*",
+                "HLT_HIDmesonHITrackingGlobal_Dpt*_Cent30_100_v*",
+                "HLT_HIL1Centralityext30100MinimumumBiasHF*",
+                "HLT_HIL1Centralityext50100MinimumumBiasHF*",
+                "HLT_HIQ2*005_Centrality3050_v*",
+                "HLT_HIQ2*005_Centrality5070_v*",
+                "HLT_HICastor*",
+                "HLT_HIL1Castor*",
+                "HLT_HIUPC*"],
+    throw = False,
+    andOr = True
+)
 
 peripheralHLTFilterSequence = cms.Sequence( hltPerhiphHI )

RecoHI/HiTracking/python/HIBestVertexSequences_cff.py

@@ -3,7 +3,7 @@
 # sort by number of tracks and keep the best
 hiBestAdaptiveVertex = cms.EDFilter("HIBestVertexSelection",
     src = cms.InputTag("hiPixelAdaptiveVertex"),
-	maxNumber = cms.uint32(1)
+    maxNumber = cms.uint32(1)
 )
 
 # select best of precise vertex, fast vertex, and beamspot
@@ -19,18 +19,18 @@
 
 from RecoHI.HiTracking.HIPixelAdaptiveVertex_cfi import *
 hiOfflinePrimaryVertices=hiPixelAdaptiveVertex.clone( # vertexing run AFTER tracking
-    TrackLabel = cms.InputTag("hiGeneralTracks"),
+    TrackLabel = "hiGeneralTracks",
 
     TkFilterParameters = cms.PSet(
-        algorithm = cms.string('filterWithThreshold'),
-        maxNormalizedChi2 = cms.double(5.0),
-        minPixelLayersWithHits=cms.int32(3),    #0 missing pix hit (Run 1 pixels)
-        minSiliconLayersWithHits = cms.int32(5),#at least 8 (3pix+5strip) hits total
-        maxD0Significance = cms.double(3.0),    #default is 5.0 in pp; 3.0 here suppresses split vtxs
-        minPt = cms.double(0.0),
-        maxEta = cms.double(100.),               
-        trackQuality = cms.string("any"),
-        numTracksThreshold = cms.int32(2)
+	algorithm                = cms.string('filterWithThreshold'),
+        maxNormalizedChi2        = cms.double(5.0),
+        minPixelLayersWithHits   = cms.int32(3),   #0 missing pix hit (Run 1 pixels)
+        minSiliconLayersWithHits = cms.int32(5), #at least 8 (3pix+5strip) hits total
+        maxD0Significance        = cms.double(3.0),      #default is 5.0 in pp; 3.0 here suppresses split vtxs
+        minPt                    = cms.double(0.0),
+        maxEta                   = cms.double(100.),               
+        trackQuality             = cms.string("any"),
+        numTracksThreshold       = cms.int32(2)
     )
 )
 from Configuration.Eras.Modifier_trackingPhase1_cff import trackingPhase1
@@ -45,7 +45,7 @@
 )
 # select best of precise vertex, fast vertex, and beamspot
 hiSelectedVertex = hiSelectedPixelVertex.clone(
-    useFinalAdaptiveVertexCollection = cms.bool(True),
+    useFinalAdaptiveVertexCollection = True,
     finalAdaptiveVertexCollection = cms.InputTag("hiBestOfflinePrimaryVertex")
 )
 bestFinalHiVertexTask = cms.Task(hiOfflinePrimaryVertices , hiBestOfflinePrimaryVertex , hiSelectedVertex )

RecoHI/HiTracking/python/HIInitialJetCoreClusterSplitting_cff.py

@@ -10,22 +10,26 @@
 hiCaloTowerForTrkPreSplitting = hiCaloTowerForTrk.clone()
 hiAkPu4CaloJetsForTrkPreSplitting = akPu4CaloJetsForTrk.clone(
     src = 'hiCaloTowerForTrkPreSplitting',
-    srcPVs = 'hiSelectedVertexPreSplitting')
+    srcPVs = 'hiSelectedVertexPreSplitting'
+)
 hiAkPu4CaloJetsCorrectedPreSplitting = akPu4CaloJetsCorrected.clone(
-    src = 'hiAkPu4CaloJetsForTrkPreSplitting')
+    src = 'hiAkPu4CaloJetsForTrkPreSplitting'
+)
 hiAkPu4CaloJetsSelectedPreSplitting = akPu4CaloJetsSelected.clone(
-    src = 'hiAkPu4CaloJetsCorrectedPreSplitting')
+    src = 'hiAkPu4CaloJetsCorrectedPreSplitting'
+)
 hiJetsForCoreTrackingPreSplitting = hiJetsForCoreTracking.clone(
-    src = 'hiAkPu4CaloJetsSelectedPreSplitting')
+    src = 'hiAkPu4CaloJetsSelectedPreSplitting'
+)
 
 
 from RecoLocalTracker.SubCollectionProducers.jetCoreClusterSplitter_cfi import jetCoreClusterSplitter
 siPixelClusters = jetCoreClusterSplitter.clone(
-    pixelClusters = cms.InputTag('siPixelClustersPreSplitting'),
+    pixelClusters = 'siPixelClustersPreSplitting',
     vertices      = 'hiSelectedVertexPreSplitting',
     cores         = 'hiJetsForCoreTrackingPreSplitting',
-    deltaRmax     = cms.double(0.1),
-    ptMin = cms.double(50)
+    deltaRmax     = 0.1,
+    ptMin         = 50
 )
 
 from RecoLocalTracker.SiPixelRecHits.SiPixelRecHits_cfi import siPixelRecHits