Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Phase2 HLT pixel modules duplicate removal (13_2_X backport) #42508

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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("")
)
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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('')
)
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
)
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
Original file line number Diff line number Diff line change
@@ -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("")
)
Original file line number Diff line number Diff line change
@@ -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),
Expand All @@ -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),
Expand Down
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
Original file line number Diff line number Diff line change
@@ -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')
)
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
Original file line number Diff line number Diff line change
@@ -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),
Expand Down
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
)

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand All @@ -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 *
Expand Down Expand Up @@ -224,11 +222,9 @@
hltPhase2L3MuonInitialStepTracks,
hltPhase2L3MuonInitialStepTracksSelectionHighPurity,
hltPhase2L3MuonMerged,
hltPhase2L3MuonPixelFitterByHelixProjections,
hltPhase2L3MuonPixelTrackFilterByKinematics,
hltPhase2PixelFitterByHelixProjections,
hltPhase2PixelTrackFilterByKinematics,
hltPhase2L3MuonPixelTracks,
hltPhase2L3MuonPixelTracksFilter,
hltPhase2L3MuonPixelTracksFitter,
hltPhase2L3MuonPixelTracksHitDoublets,
hltPhase2L3MuonPixelTracksHitQuadruplets,
hltPhase2L3MuonPixelTracksSeedLayers,
Expand All @@ -250,7 +246,7 @@
hltPhase2L3OISeedsFromL2Muons,
hltPhase2L3OITrackCandidates,
hltRpcRecHits,
hltTowerMakerForAll,
hltPhase2TowerMakerForAll,
siPhase2Clusters,
siPixelClusterShapeCache,
siPixelClusters,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 *
Expand Down Expand Up @@ -165,11 +163,9 @@
hltPhase2L3MuonInitialStepTracks,
hltPhase2L3MuonInitialStepTracksSelectionHighPurity,
hltPhase2L3MuonMerged,
hltPhase2L3MuonPixelFitterByHelixProjections,
hltPhase2L3MuonPixelTrackFilterByKinematics,
hltPhase2PixelFitterByHelixProjections,
hltPhase2PixelTrackFilterByKinematics,
hltPhase2L3MuonPixelTracks,
hltPhase2L3MuonPixelTracksFilter,
hltPhase2L3MuonPixelTracksFitter,
hltPhase2L3MuonPixelTracksHitDoublets,
hltPhase2L3MuonPixelTracksHitQuadruplets,
hltPhase2L3MuonPixelTracksSeedLayers,
Expand Down
Loading