Merge pull request #36511 from NiharSaha/CMSSW_12_3_X_RecoTau_Vertex

Drop type specs in RecoTau and RecoVertex

Validation/RecoTau/python/RecoTauValidation_cff.py

@@ -6,28 +6,28 @@
 tauValidationMiniAODZTT.discriminators = cms.VPSet([p for p in tauValidationMiniAODZTT.discriminators if any(disc in p.discriminator.value() for disc in discs_to_retain) ])
 
 tauValidationMiniAODZEE = tauValidationMiniAODZTT.clone(
-  RefCollection = cms.InputTag("kinematicSelectedTauValDenominatorZEE"),
-  ExtensionName = cms.string('ZEE')
+  RefCollection = "kinematicSelectedTauValDenominatorZEE",
+  ExtensionName = 'ZEE'
 )
 tauValidationMiniAODZMM = tauValidationMiniAODZTT.clone(
-  RefCollection = cms.InputTag("kinematicSelectedTauValDenominatorZMM"),
-  ExtensionName = cms.string('ZMM')
+  RefCollection = "kinematicSelectedTauValDenominatorZMM",
+  ExtensionName = 'ZMM'
 )
 tauValidationMiniAODQCD = tauValidationMiniAODZTT.clone(
-  RefCollection = cms.InputTag("kinematicSelectedTauValDenominatorQCD"),
-  ExtensionName = cms.string('QCD')
+  RefCollection = "kinematicSelectedTauValDenominatorQCD",
+  ExtensionName = 'QCD'
 )
 tauValidationMiniAODRealData = tauValidationMiniAODZTT.clone(
-  RefCollection = cms.InputTag("CleanedPFJets"),
-  ExtensionName = cms.string('RealData')
+  RefCollection = "CleanedPFJets",
+  ExtensionName = 'RealData'
 )
 tauValidationMiniAODRealElectronsData = tauValidationMiniAODZTT.clone(
-  RefCollection = cms.InputTag("ElZLegs","theProbeLeg"),
-  ExtensionName = cms.string("RealElectronsData")
+  RefCollection = "ElZLegs:theProbeLeg",
+  ExtensionName = "RealElectronsData"
 )
 tauValidationMiniAODRealMuonsData = tauValidationMiniAODZTT.clone(
-  RefCollection = cms.InputTag("MuZLegs","theProbeLeg"),
-  ExtensionName = cms.string('RealMuonsData')
+  RefCollection = "MuZLegs:theProbeLeg",
+  ExtensionName = 'RealMuonsData'
 )
 
 

Validation/RecoVertex/python/HLTmultiPVvalidator_cff.py

@@ -2,46 +2,46 @@
 
 from Validation.RecoVertex.PrimaryVertexAnalyzer4PUSlimmed_cfi import *
 
-hltMultiPVanalysis = vertexAnalysis.clone()
-hltMultiPVanalysis.do_generic_sim_plots  = False
-hltMultiPVanalysis.verbose               = cms.untracked.bool(False)
-hltMultiPVanalysis.root_folder           = cms.untracked.string("HLT/Vertexing/ValidationWRTsim")
-hltMultiPVanalysis.vertexRecoCollections = cms.VInputTag( )
-hltMultiPVanalysis.trackAssociatorMap    = cms.untracked.InputTag("trackingParticleRecoTrackAsssociation")
-hltMultiPVanalysis.vertexAssociator      = cms.untracked.InputTag("VertexAssociatorByPositionAndTracks")
-
+hltMultiPVanalysis = vertexAnalysis.clone(
+    do_generic_sim_plots  = False,
+    verbose               = False,
+    root_folder           = "HLT/Vertexing/ValidationWRTsim",
+    vertexRecoCollections = [""],
+    trackAssociatorMap    = "trackingParticleRecoTrackAsssociation",
+    vertexAssociator      = "VertexAssociatorByPositionAndTracks"
+)
 from Validation.RecoTrack.associators_cff import hltTrackAssociatorByHits, tpToHLTpixelTrackAssociation
 from SimTracker.VertexAssociation.VertexAssociatorByPositionAndTracks_cfi import VertexAssociatorByPositionAndTracks as _VertexAssociatorByPositionAndTracks
-vertexAssociatorByPositionAndTracks4pixelTracks = _VertexAssociatorByPositionAndTracks.clone()
-vertexAssociatorByPositionAndTracks4pixelTracks.trackAssociation = cms.InputTag("tpToHLTpixelTrackAssociation")
-
+vertexAssociatorByPositionAndTracks4pixelTracks = _VertexAssociatorByPositionAndTracks.clone(
+    trackAssociation = "tpToHLTpixelTrackAssociation"
+)
 tpToHLTpfMuonMergingTrackAssociation = tpToHLTpixelTrackAssociation.clone(
     label_tr = "hltPFMuonMerging"
 )
-vertexAssociatorByPositionAndTracks4pfMuonMergingTracks = _VertexAssociatorByPositionAndTracks.clone()
-vertexAssociatorByPositionAndTracks4pfMuonMergingTracks.trackAssociation = cms.InputTag("tpToHLTpfMuonMergingTrackAssociation")
-
+vertexAssociatorByPositionAndTracks4pfMuonMergingTracks = _VertexAssociatorByPositionAndTracks.clone(
+    trackAssociation = "tpToHLTpfMuonMergingTrackAssociation"
+)
 
 
-hltPixelPVanalysis = hltMultiPVanalysis.clone()
-hltPixelPVanalysis.do_generic_sim_plots  = True
-hltPixelPVanalysis.trackAssociatorMap    = cms.untracked.InputTag("tpToHLTpixelTrackAssociation")
-hltPixelPVanalysis.vertexAssociator      = cms.untracked.InputTag("vertexAssociatorByPositionAndTracks4pixelTracks")
-hltPixelPVanalysis.vertexRecoCollections = cms.VInputTag(
-    "hltPixelVertices",
-    "hltTrimmedPixelVertices",
+hltPixelPVanalysis = hltMultiPVanalysis.clone(
+    do_generic_sim_plots  = True,
+    trackAssociatorMap    = "tpToHLTpixelTrackAssociation",
+    vertexAssociator      = "vertexAssociatorByPositionAndTracks4pixelTracks",
+    vertexRecoCollections = (
+        "hltPixelVertices",
+        "hltTrimmedPixelVertices",
+    )
 )
 
 
-
-hltPVanalysis = hltMultiPVanalysis.clone()
-hltPVanalysis.trackAssociatorMap = cms.untracked.InputTag("tpToHLTpfMuonMergingTrackAssociation")
-hltPVanalysis.vertexAssociator   = cms.untracked.InputTag("vertexAssociatorByPositionAndTracks4pfMuonMergingTracks")
-hltPVanalysis.vertexRecoCollections   = cms.VInputTag(
-    "hltVerticesPFFilter"
-#    "hltFastPVPixelVertices"
+hltPVanalysis = hltMultiPVanalysis.clone(
+    trackAssociatorMap = "tpToHLTpfMuonMergingTrackAssociation",
+    vertexAssociator   = "vertexAssociatorByPositionAndTracks4pfMuonMergingTracks",
+    vertexRecoCollections   = (
+    "hltVerticesPFFilter",
+    #"hltFastPVPixelVertices"
+    )
 )
-
 hltMultiPVAssociations = cms.Task(
     hltTrackAssociatorByHits,
     tpToHLTpixelTrackAssociation,

Validation/RecoVertex/python/HLTpostProcessorVertex_cfi.py

@@ -2,5 +2,6 @@
 
 from Validation.RecoVertex.PrimaryVertexAnalyzer4PUSlimmed_Client_cfi import *
 
-postProcessorHLTvertexing = postProcessorVertex.clone()
-postProcessorHLTvertexing.subDirs = cms.untracked.vstring("HLT/Vertexing/ValidationWRTsim/*")
+postProcessorHLTvertexing = postProcessorVertex.clone(
+    subDirs = ("HLT/Vertexing/ValidationWRTsim/*",)
+)

Validation/RecoVertex/python/PrimaryVertexAnalyzer4PUSlimmed_cfi.py

@@ -6,12 +6,12 @@
                                                filter = cms.bool(False)
 )
 
-selectedOfflinePrimaryVerticesWithBS = selectedOfflinePrimaryVertices.clone()
-selectedOfflinePrimaryVerticesWithBS.src = cms.InputTag('offlinePrimaryVerticesWithBS')
-
-selectedPixelVertices = selectedOfflinePrimaryVertices.clone()
-selectedPixelVertices.src = cms.InputTag('pixelVertices')
-
+selectedOfflinePrimaryVerticesWithBS = selectedOfflinePrimaryVertices.clone(
+  src = 'offlinePrimaryVerticesWithBS'
+)
+selectedPixelVertices = selectedOfflinePrimaryVertices.clone(
+  src = 'pixelVertices'
+)
 from DQMServices.Core.DQMEDAnalyzer import DQMEDAnalyzer
 vertexAnalysis = DQMEDAnalyzer('PrimaryVertexAnalyzer4PUSlimmed',
                                 use_only_charged_tracks = cms.untracked.bool(True),

Validation/RecoVertex/python/pvSelectionSequence_cff.py

@@ -12,11 +12,11 @@
 
 noFakeVertices = goodVertices.clone(cut=cms.string("!isFake"))
 
-goodVerticesD0s5 = goodVertices.clone(src = cms.InputTag("offlinePrimaryVerticesD0s5"))
-goodVerticesD0s51mm = goodVertices.clone(src = cms.InputTag("offlinePrimaryVerticesD0s51mm"))
-goodVerticesDA100um = goodVertices.clone(src = cms.InputTag("offlinePrimaryVerticesDA100um"))
-goodVerticesDA100umV7 = goodVertices.clone(src = cms.InputTag("offlinePrimaryVerticesDA100umV7"))
-goodVerticesDA100umV8 = goodVertices.clone(src = cms.InputTag("offlinePrimaryVerticesDA100umV8"))
+goodVerticesD0s5 = goodVertices.clone(src = "offlinePrimaryVerticesD0s5")
+goodVerticesD0s51mm = goodVertices.clone(src = "offlinePrimaryVerticesD0s51mm")
+goodVerticesDA100um = goodVertices.clone(src = "offlinePrimaryVerticesDA100um")
+goodVerticesDA100umV7 = goodVertices.clone(src = "offlinePrimaryVerticesDA100umV7")
+goodVerticesDA100umV8 = goodVertices.clone(src = "offlinePrimaryVerticesDA100umV8")
 
 
 seqPVSelection = cms.Sequence(goodVertices + noFakeVertices + goodVerticesD0s5 + goodVerticesD0s51mm +