Merge pull request #42508 from lguzzi/132X_phase2_pixel_duplicate_rem…

…oval Phase2 HLT pixel modules duplicate removal (13_2_X backport)
cms-sw · Aug 9, 2023 · 175b096 · 175b096
2 parents 4b63955 + 2ee29f5
commit 175b096
Show file tree

Hide file tree

Showing 37 changed files with 100 additions and 218 deletions.
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/ak4CaloJetsForTrk_cfi.py
@@ -26,7 +26,7 @@
     puPtMin = cms.double(10),
     rParam = cms.double(0.4),
     radiusPU = cms.double(0.5),
-    src = cms.InputTag("caloTowerForTrk"),
+    src = cms.InputTag("hltPhase2TowerMakerForAll"),
     srcPVs = cms.InputTag("firstStepPrimaryVerticesUnsorted"),
     useDeterministicSeed = cms.bool(True),
     voronoiRfact = cms.double(-0.9)

diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/caloTowerForTrk_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/caloTowerForTrk_cfi.py
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepHitDoublets_cfi.py
@@ -9,6 +9,6 @@
     produceIntermediateHitDoublets = cms.bool(True),
     produceSeedingHitSets = cms.bool(False),
     seedingLayers = cms.InputTag("highPtTripletStepSeedLayers"),
-    trackingRegions = cms.InputTag("highPtTripletStepTrackingRegions"),
+    trackingRegions = cms.InputTag("hltPhase2PixelTracksAndHighPtStepTrackingRegions"),
     trackingRegionsSeedingLayers = cms.InputTag("")
 )
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/highPtTripletStepTrackCutClassifier_cfi.py
@@ -30,5 +30,5 @@
     ),
     qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
     src = cms.InputTag("highPtTripletStepTracks"),
-    vertices = cms.InputTag("pixelVertices")
+    vertices = cms.InputTag("hltPhase2PixelVertices")
 )
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltL3MuonsPhase2L3OI_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltL3MuonsPhase2L3OI_cfi.py
@@ -72,7 +72,7 @@
             input = cms.InputTag("hltL2MuonsFromL1TkMuon","UpdatedAtVtx"),
             maxRegions = cms.int32(2),
             precise = cms.bool(True),
-            vertexCollection = cms.InputTag("pixelVertices")
+            vertexCollection = cms.InputTag("hltPhase2PixelVertices")
         ),
         PCut = cms.double(2.5),
         PtCut = cms.double(1.0),

diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3FromL1TkMuonPixelTracks_cfi.py
@@ -2,8 +2,8 @@
 
 hltPhase2L3FromL1TkMuonPixelTracks = cms.EDProducer("PixelTrackProducer",
     Cleaner = cms.string('hltPixelTracksCleanerBySharedHits'),
-    Filter = cms.InputTag("hltPhase2L3MuonPixelTracksFilter"),
-    Fitter = cms.InputTag("hltPhase2L3MuonPixelTracksFitter"),
+    Filter = cms.InputTag("hltPhase2PixelTrackFilterByKinematics"),
+    Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"),
     SeedingHitSets = cms.InputTag("hltPhase2L3FromL1TkMuonPixelTracksHitQuadruplets"),
     passLabel = cms.string('')
 )
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3GlbMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3GlbMuon_cfi.py
@@ -72,7 +72,7 @@
             input = cms.InputTag("hltL2MuonsFromL1TkMuon","UpdatedAtVtx"),
             maxRegions = cms.int32(2),
             precise = cms.bool(True),
-            vertexCollection = cms.InputTag("pixelVertices")
+            vertexCollection = cms.InputTag("hltPhase2PixelVertices")
         ),
         PCut = cms.double(2.5),
         PtCut = cms.double(1.0),

diff --git a/...onfiguration/python/HLT_75e33/modules/hltPhase2L3MuonPixelFitterByHelixProjections_cfi.py b/...onfiguration/python/HLT_75e33/modules/hltPhase2L3MuonPixelFitterByHelixProjections_cfi.py
diff --git a/...Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTrackFilterByKinematics_cfi.py b/...Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTrackFilterByKinematics_cfi.py
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksFilter_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracksFilter_cfi.py
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2L3MuonPixelTracks_cfi.py
@@ -2,8 +2,8 @@
 
 hltPhase2L3MuonPixelTracks = cms.EDProducer("PixelTrackProducer",
     Cleaner = cms.string('hltPhase2L3MuonPixelTrackCleanerBySharedHits'),
-    Filter = cms.InputTag("hltPhase2L3MuonPixelTrackFilterByKinematics"),
-    Fitter = cms.InputTag("hltPhase2L3MuonPixelFitterByHelixProjections"),
+    Filter = cms.InputTag("hltPhase2PixelTrackFilterByKinematics"),
+    Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"),
     SeedingHitSets = cms.InputTag("hltPhase2L3MuonPixelTracksHitQuadruplets"),
     mightGet = cms.optional.untracked.vstring,
     passLabel = cms.string('hltPhase2L3MuonPixelTracks')

diff --git a/...tPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p07_cfi.py b/...tPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p07_cfi.py
@@ -3,7 +3,7 @@
 hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p07 = cms.EDProducer("L3MuonCombinedRelativeIsolationProducer",
     CaloDepositsLabel = cms.InputTag("notUsed"),
     CaloExtractorPSet = cms.PSet(
-        CaloTowerCollectionLabel = cms.InputTag("hltTowerMakerForAll"),
+        CaloTowerCollectionLabel = cms.InputTag("hltPhase2TowerMakerForAll"),
         ComponentName = cms.string('CaloExtractor'),
         DR_Max = cms.double(0.3),
         DR_Veto_E = cms.double(0.07),

diff --git a/...ltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p4_cfi.py b/...ltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p4_cfi.py
@@ -3,7 +3,7 @@
 hltPhase2L3MuonsTrkIsoRegionalNewdR0p3dRVeto0p005dz0p25dr0p20ChisqInfPtMin0p0Cut0p4 = cms.EDProducer("L3MuonCombinedRelativeIsolationProducer",
     CaloDepositsLabel = cms.InputTag("notUsed"),
     CaloExtractorPSet = cms.PSet(
-        CaloTowerCollectionLabel = cms.InputTag("hltTowerMakerForAll"),
+        CaloTowerCollectionLabel = cms.InputTag("hltPhase2TowerMakerForAll"),
         ComponentName = cms.string('CaloExtractor'),
         DR_Max = cms.double(0.3),
         DR_Veto_E = cms.double(0.07),

diff --git a/...s/hltPhase2L3MuonPixelTracksFitter_cfi.py → ...hase2PixelFitterByHelixProjections_cfi.py b/...s/hltPhase2L3MuonPixelTracksFitter_cfi.py → ...hase2PixelFitterByHelixProjections_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-hltPhase2L3MuonPixelTracksFitter = cms.EDProducer("PixelFitterByHelixProjectionsProducer",
+hltPhase2PixelFitterByHelixProjections = cms.EDProducer("PixelFitterByHelixProjectionsProducer",
     scaleErrorsForBPix1 = cms.bool(False),
     scaleFactor = cms.double(0.65)
 )
diff --git a/...dules/pixelTrackFilterByKinematics_cfi.py → ...Phase2PixelTrackFilterByKinematics_cfi.py b/...dules/pixelTrackFilterByKinematics_cfi.py → ...Phase2PixelTrackFilterByKinematics_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-pixelTrackFilterByKinematics = cms.EDProducer("PixelTrackFilterByKinematicsProducer",
+hltPhase2PixelTrackFilterByKinematics = cms.EDProducer("PixelTrackFilterByKinematicsProducer",
     chi2 = cms.double(1000.0),
     nSigmaInvPtTolerance = cms.double(0.0),
     nSigmaTipMaxTolerance = cms.double(0.0),

diff --git a/...modules/pixelTracksTrackingRegions_cfi.py → ...TracksAndHighPtStepTrackingRegions_cfi.py b/...modules/pixelTracksTrackingRegions_cfi.py → ...TracksAndHighPtStepTrackingRegions_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-pixelTracksTrackingRegions = cms.EDProducer("GlobalTrackingRegionFromBeamSpotEDProducer",
+hltPhase2PixelTracksAndHighPtStepTrackingRegions = cms.EDProducer("GlobalTrackingRegionFromBeamSpotEDProducer",
     RegionPSet = cms.PSet(
         beamSpot = cms.InputTag("hltOnlineBeamSpot"),
         nSigmaZ = cms.double(4.0),

diff --git a/...e33/modules/pixelTracksHitDoublets_cfi.py → ...es/hltPhase2PixelTracksHitDoublets_cfi.py b/...e33/modules/pixelTracksHitDoublets_cfi.py → ...es/hltPhase2PixelTracksHitDoublets_cfi.py
@@ -1,13 +1,13 @@
 import FWCore.ParameterSet.Config as cms
 
-pixelTracksHitDoublets = cms.EDProducer("HitPairEDProducer",
+hltPhase2PixelTracksHitDoublets = cms.EDProducer("HitPairEDProducer",
     clusterCheck = cms.InputTag(""),
     layerPairs = cms.vuint32(0, 1, 2),
     maxElement = cms.uint32(50000000),
     maxElementTotal = cms.uint32(50000000),
     produceIntermediateHitDoublets = cms.bool(True),
     produceSeedingHitSets = cms.bool(False),
-    seedingLayers = cms.InputTag("pixelTracksSeedLayers"),
-    trackingRegions = cms.InputTag("pixelTracksTrackingRegions"),
+    seedingLayers = cms.InputTag("hltPhase2PixelTracksSeedLayers"),
+    trackingRegions = cms.InputTag("hltPhase2PixelTracksAndHighPtStepTrackingRegions"),
     trackingRegionsSeedingLayers = cms.InputTag("")
 )
diff --git a/..._75e33/modules/pixelTracksHitSeeds_cfi.py → ...dules/hltPhase2PixelTracksHitSeeds_cfi.py b/..._75e33/modules/pixelTracksHitSeeds_cfi.py → ...dules/hltPhase2PixelTracksHitSeeds_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-pixelTracksHitSeeds = cms.EDProducer("CAHitQuadrupletEDProducer",
+hltPhase2PixelTracksHitSeeds = cms.EDProducer("CAHitQuadrupletEDProducer",
     CAHardPtCut = cms.double(0.0),
     CAPhiCut = cms.double(0.2),
     CAThetaCut = cms.double(0.0012),
@@ -9,7 +9,7 @@
         clusterShapeCacheSrc = cms.InputTag("siPixelClusterShapeCache"),
         clusterShapeHitFilter = cms.string('ClusterShapeHitFilter')
     ),
-    doublets = cms.InputTag("pixelTracksHitDoublets"),
+    doublets = cms.InputTag("hltPhase2PixelTracksHitDoublets"),
     extraHitRPhitolerance = cms.double(0.032),
     fitFastCircle = cms.bool(True),
     fitFastCircleChi2Cut = cms.bool(True),

diff --git a/...5e33/modules/pixelTracksSeedLayers_cfi.py → ...les/hltPhase2PixelTracksSeedLayers_cfi.py b/...5e33/modules/pixelTracksSeedLayers_cfi.py → ...les/hltPhase2PixelTracksSeedLayers_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-pixelTracksSeedLayers = cms.EDProducer("SeedingLayersEDProducer",
+hltPhase2PixelTracksSeedLayers = cms.EDProducer("SeedingLayersEDProducer",
     BPix = cms.PSet(
         HitProducer = cms.string('siPixelRecHits'),
         TTRHBuilder = cms.string('WithTrackAngle')

diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/hltPhase2PixelTracks_cfi.py
@@ -0,0 +1,10 @@
+import FWCore.ParameterSet.Config as cms
+
+hltPhase2PixelTracks = cms.EDProducer("PixelTrackProducer",
+    Cleaner = cms.string('pixelTrackCleanerBySharedHits'),
+    Filter = cms.InputTag("hltPhase2PixelTrackFilterByKinematics"),
+    Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"),
+    SeedingHitSets = cms.InputTag("hltPhase2PixelTracksHitSeeds"),
+    mightGet = cms.optional.untracked.vstring,
+    passLabel = cms.string('hltPhase2PixelTracks')
+)
diff --git a/...on/HLT_75e33/modules/pixelVertices_cfi.py → ...e33/modules/hltPhase2PixelVertices_cfi.py b/...on/HLT_75e33/modules/pixelVertices_cfi.py → ...e33/modules/hltPhase2PixelVertices_cfi.py
@@ -1,14 +1,14 @@
 import FWCore.ParameterSet.Config as cms
 
-pixelVertices = cms.EDProducer("PixelVertexProducer",
+hltPhase2PixelVertices = cms.EDProducer("PixelVertexProducer",
     Finder = cms.string('DivisiveVertexFinder'),
     Method2 = cms.bool(True),
     NTrkMin = cms.int32(2),
     PVcomparer = cms.PSet(
         refToPSet_ = cms.string('pSetPvClusterComparerForIT')
     ),
     PtMin = cms.double(1.0),
-    TrackCollection = cms.InputTag("pixelTracks"),
+    TrackCollection = cms.InputTag("hltPhase2PixelTracks"),
     UseError = cms.bool(True),
     Verbosity = cms.int32(0),
     WtAverage = cms.bool(True),

diff --git a/..._75e33/modules/hltTowerMakerForAll_cfi.py → .../modules/hltPhase2TowerMakerForAll_cfi.py b/..._75e33/modules/hltTowerMakerForAll_cfi.py → .../modules/hltPhase2TowerMakerForAll_cfi.py
@@ -1,6 +1,6 @@
 import FWCore.ParameterSet.Config as cms
 
-hltTowerMakerForAll = cms.EDProducer("CaloTowersCreator",
+hltPhase2TowerMakerForAll = cms.EDProducer("CaloTowersCreator",
     AllowMissingInputs = cms.bool(False),
     EBGrid = cms.vdouble(-1.0, 1.0, 10.0, 100.0, 1000.0),
     EBSumThreshold = cms.double(0.2),

diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepSeeds_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepSeeds_cfi.py
@@ -1,7 +1,7 @@
 import FWCore.ParameterSet.Config as cms
 
 initialStepSeeds = cms.EDProducer("SeedGeneratorFromProtoTracksEDProducer",
-    InputCollection = cms.InputTag("pixelTracks"),
+    InputCollection = cms.InputTag("hltPhase2PixelTracks"),
     InputVertexCollection = cms.InputTag(""),
     SeedCreatorPSet = cms.PSet(
         refToPSet_ = cms.string('seedFromProtoTracks')

diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/initialStepTrackCutClassifier_cfi.py
@@ -30,5 +30,5 @@
     ),
     qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
     src = cms.InputTag("initialStepTracks"),
-    vertices = cms.InputTag("pixelVertices")
+    vertices = cms.InputTag("hltPhase2PixelVertices")
 )
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelFitterByHelixProjections_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pixelFitterByHelixProjections_cfi.py
diff --git a/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracks_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/modules/pixelTracks_cfi.py
diff --git a/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py b/HLTrigger/Configuration/python/HLT_75e33/paths/HLT_IsoMu24_FromL1TkMuon_cfi.py
@@ -90,11 +90,9 @@
 from ..modules.hltPhase2L3MuonInitialStepTracks_cfi import *
 from ..modules.hltPhase2L3MuonInitialStepTracksSelectionHighPurity_cfi import *
 from ..modules.hltPhase2L3MuonMerged_cfi import *
-from ..modules.hltPhase2L3MuonPixelFitterByHelixProjections_cfi import *
-from ..modules.hltPhase2L3MuonPixelTrackFilterByKinematics_cfi import *
+from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
+from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import *
 from ..modules.hltPhase2L3MuonPixelTracks_cfi import *
-from ..modules.hltPhase2L3MuonPixelTracksFilter_cfi import *
-from ..modules.hltPhase2L3MuonPixelTracksFitter_cfi import *
 from ..modules.hltPhase2L3MuonPixelTracksHitDoublets_cfi import *
 from ..modules.hltPhase2L3MuonPixelTracksHitQuadruplets_cfi import *
 from ..modules.hltPhase2L3MuonPixelTracksSeedLayers_cfi import *
@@ -116,7 +114,7 @@
 from ..modules.hltPhase2L3OISeedsFromL2Muons_cfi import *
 from ..modules.hltPhase2L3OITrackCandidates_cfi import *
 from ..modules.hltRpcRecHits_cfi import *
-from ..modules.hltTowerMakerForAll_cfi import *
+from ..modules.hltPhase2TowerMakerForAll_cfi import *
 from ..modules.MeasurementTrackerEvent_cfi import *
 from ..modules.siPhase2Clusters_cfi import *
 from ..modules.siPixelClusters_cfi import *
@@ -224,11 +222,9 @@
         hltPhase2L3MuonInitialStepTracks,
         hltPhase2L3MuonInitialStepTracksSelectionHighPurity,
         hltPhase2L3MuonMerged,
-        hltPhase2L3MuonPixelFitterByHelixProjections,
-        hltPhase2L3MuonPixelTrackFilterByKinematics,
+        hltPhase2PixelFitterByHelixProjections,
+        hltPhase2PixelTrackFilterByKinematics,
         hltPhase2L3MuonPixelTracks,
-        hltPhase2L3MuonPixelTracksFilter,
-        hltPhase2L3MuonPixelTracksFitter,
         hltPhase2L3MuonPixelTracksHitDoublets,
         hltPhase2L3MuonPixelTracksHitQuadruplets,
         hltPhase2L3MuonPixelTracksSeedLayers,
@@ -250,7 +246,7 @@
         hltPhase2L3OISeedsFromL2Muons,
         hltPhase2L3OITrackCandidates,
         hltRpcRecHits,
-        hltTowerMakerForAll,
+        hltPhase2TowerMakerForAll,
         siPhase2Clusters,
         siPixelClusterShapeCache,
         siPixelClusters,

diff --git a/...figuration/python/HLT_75e33/paths/HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_FromL1TkMuon_cfi.py b/...figuration/python/HLT_75e33/paths/HLT_Mu17_TrkIsoVVL_Mu8_TrkIsoVVL_DZ_FromL1TkMuon_cfi.py
@@ -64,11 +64,9 @@
 from ..modules.hltPhase2L3MuonInitialStepTracks_cfi import *
 from ..modules.hltPhase2L3MuonInitialStepTracksSelectionHighPurity_cfi import *
 from ..modules.hltPhase2L3MuonMerged_cfi import *
-from ..modules.hltPhase2L3MuonPixelFitterByHelixProjections_cfi import *
-from ..modules.hltPhase2L3MuonPixelTrackFilterByKinematics_cfi import *
+from ..modules.hltPhase2PixelTrackFilterByKinematics_cfi import *
 from ..modules.hltPhase2L3MuonPixelTracks_cfi import *
-from ..modules.hltPhase2L3MuonPixelTracksFilter_cfi import *
-from ..modules.hltPhase2L3MuonPixelTracksFitter_cfi import *
+from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
 from ..modules.hltPhase2L3MuonPixelTracksHitDoublets_cfi import *
 from ..modules.hltPhase2L3MuonPixelTracksHitQuadruplets_cfi import *
 from ..modules.hltPhase2L3MuonPixelTracksSeedLayers_cfi import *
@@ -165,11 +163,9 @@
         hltPhase2L3MuonInitialStepTracks,
         hltPhase2L3MuonInitialStepTracksSelectionHighPurity,
         hltPhase2L3MuonMerged,
-        hltPhase2L3MuonPixelFitterByHelixProjections,
-        hltPhase2L3MuonPixelTrackFilterByKinematics,
+        hltPhase2PixelFitterByHelixProjections,
+        hltPhase2PixelTrackFilterByKinematics,
         hltPhase2L3MuonPixelTracks,
-        hltPhase2L3MuonPixelTracksFilter,
-        hltPhase2L3MuonPixelTracksFitter,
         hltPhase2L3MuonPixelTracksHitDoublets,
         hltPhase2L3MuonPixelTracksHitQuadruplets,
         hltPhase2L3MuonPixelTracksSeedLayers,