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 #42491

Merged
merged 13 commits into from
Aug 8, 2023
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
rename pixel to hltPhase2Pixel and remove duplicated modules from pat…
…hs (pixelFitter)
  • Loading branch information
lguzzi committed Aug 4, 2023
commit 6e7ff0f5759033d3fc71e0305655ee8e43a55545
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
hltPhase2L3FromL1TkMuonPixelTracks = cms.EDProducer("PixelTrackProducer",
Cleaner = cms.string('hltPixelTracksCleanerBySharedHits'),
Filter = cms.InputTag("pixelTrackFilterByKinematics"),
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"),
SeedingHitSets = cms.InputTag("hltPhase2L3FromL1TkMuonPixelTracksHitQuadruplets"),
passLabel = cms.string('')
)
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
hltPhase2L3MuonPixelTracks = cms.EDProducer("PixelTrackProducer",
Cleaner = cms.string('hltPhase2L3MuonPixelTrackCleanerBySharedHits'),
Filter = cms.InputTag("pixelTrackFilterByKinematics"),
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"),
SeedingHitSets = cms.InputTag("hltPhase2L3MuonPixelTracksHitQuadruplets"),
mightGet = cms.optional.untracked.vstring,
passLabel = cms.string('hltPhase2L3MuonPixelTracks')
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import FWCore.ParameterSet.Config as cms

pixelFitterByHelixProjections = 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
@@ -3,7 +3,7 @@
pixelTracks = cms.EDProducer("PixelTrackProducer",
Cleaner = cms.string('pixelTrackCleanerBySharedHits'),
Filter = cms.InputTag("pixelTrackFilterByKinematics"),
Fitter = cms.InputTag("pixelFitterByHelixProjections"),
Fitter = cms.InputTag("hltPhase2PixelFitterByHelixProjections"),
SeedingHitSets = cms.InputTag("pixelTracksHitSeeds"),
mightGet = cms.optional.untracked.vstring,
passLabel = cms.string('pixelTracks')
Original file line number Diff line number Diff line change
@@ -86,11 +86,10 @@
from ..modules.hltPhase2L3MuonInitialStepTracks_cfi import *
from ..modules.hltPhase2L3MuonInitialStepTracksSelectionHighPurity_cfi import *
from ..modules.hltPhase2L3MuonMerged_cfi import *
from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.hltPhase2L3MuonPixelTracks_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2L3MuonPixelTracksHitDoublets_cfi import *
from ..modules.hltPhase2L3MuonPixelTracksHitQuadruplets_cfi import *
from ..modules.hltPhase2L3MuonPixelTracksSeedLayers_cfi import *
@@ -216,11 +215,10 @@
hltPhase2L3MuonInitialStepTracks,
hltPhase2L3MuonInitialStepTracksSelectionHighPurity,
hltPhase2L3MuonMerged,
pixelFitterByHelixProjections,
hltPhase2PixelFitterByHelixProjections,
pixelTrackFilterByKinematics,
hltPhase2L3MuonPixelTracks,
pixelTrackFilterByKinematics,
pixelFitterByHelixProjections,
hltPhase2L3MuonPixelTracksHitDoublets,
hltPhase2L3MuonPixelTracksHitQuadruplets,
hltPhase2L3MuonPixelTracksSeedLayers,
Original file line number Diff line number Diff line change
@@ -64,11 +64,10 @@
from ..modules.hltPhase2L3MuonInitialStepTracks_cfi import *
from ..modules.hltPhase2L3MuonInitialStepTracksSelectionHighPurity_cfi import *
from ..modules.hltPhase2L3MuonMerged_cfi import *
from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.hltPhase2L3MuonPixelTracks_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2L3MuonPixelTracksHitDoublets_cfi import *
from ..modules.hltPhase2L3MuonPixelTracksHitQuadruplets_cfi import *
from ..modules.hltPhase2L3MuonPixelTracksSeedLayers_cfi import *
@@ -165,11 +164,10 @@
hltPhase2L3MuonInitialStepTracks,
hltPhase2L3MuonInitialStepTracksSelectionHighPurity,
hltPhase2L3MuonMerged,
pixelFitterByHelixProjections,
hltPhase2PixelFitterByHelixProjections,
pixelTrackFilterByKinematics,
hltPhase2L3MuonPixelTracks,
pixelTrackFilterByKinematics,
pixelFitterByHelixProjections,
hltPhase2L3MuonPixelTracksHitDoublets,
hltPhase2L3MuonPixelTracksHitQuadruplets,
hltPhase2L3MuonPixelTracksSeedLayers,
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@
from ..modules.hltPhase2L3MuonCandidates_cfi import *
from ..modules.hltPhase2L3MuonMerged_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2L3Muons_cfi import *
from ..modules.hltPhase2L3MuonsNoID_cfi import *
from ..modules.hltPhase2L3MuonTracks_cfi import *
@@ -120,7 +120,7 @@
hltPhase2L3MuonCandidates,
hltPhase2L3MuonMerged,
pixelTrackFilterByKinematics,
pixelFitterByHelixProjections,
hltPhase2PixelFitterByHelixProjections,
hltPhase2L3MuonTracks,
hltPhase2L3Muons,
hltPhase2L3MuonsNoID,
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@
from ..modules.hltPhase2L3MuonCandidates_cfi import *
from ..modules.hltPhase2L3MuonMerged_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2L3Muons_cfi import *
from ..modules.hltPhase2L3MuonsNoID_cfi import *
from ..modules.hltPhase2L3MuonTracks_cfi import *
@@ -114,7 +114,7 @@
hltPhase2L3MuonCandidates,
hltPhase2L3MuonMerged,
pixelTrackFilterByKinematics,
pixelFitterByHelixProjections,
hltPhase2PixelFitterByHelixProjections,
hltPhase2L3MuonTracks,
hltPhase2L3Muons,
hltPhase2L3MuonsNoID,
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
from ..modules.hltPhase2L3MuonCandidates_cfi import *
from ..modules.hltPhase2L3MuonMerged_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2L3Muons_cfi import *
from ..modules.hltPhase2L3MuonsNoID_cfi import *
from ..modules.hltPhase2L3MuonTracks_cfi import *
@@ -124,7 +124,7 @@
hltPhase2L3MuonCandidates,
hltPhase2L3MuonMerged,
pixelTrackFilterByKinematics,
pixelFitterByHelixProjections,
hltPhase2PixelFitterByHelixProjections,
hltPhase2L3MuonTracks,
hltPhase2L3Muons,
hltPhase2L3MuonsNoID,
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
from ..modules.initialStepTrackCutClassifier_cfi import *
from ..modules.initialStepTrackSelectionHighPurity_cfi import *
from ..modules.initialStepTracks_cfi import *
from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.pixelTracksHitDoublets_cfi import *
from ..modules.pixelTracksHitSeeds_cfi import *
@@ -51,7 +51,7 @@
initialStepTrackCutClassifier,
initialStepTrackSelectionHighPurity,
initialStepTracks,
pixelFitterByHelixProjections,
hltPhase2PixelFitterByHelixProjections,
pixelTrackFilterByKinematics,
pixelTracks,
pixelTracksHitDoublets,
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import FWCore.ParameterSet.Config as cms

from ..modules.pixelFitterByHelixProjections_cfi import *
from ..modules.hltPhase2PixelFitterByHelixProjections_cfi import *
from ..modules.pixelTrackFilterByKinematics_cfi import *
from ..modules.pixelTracks_cfi import *
from ..modules.pixelTracksHitDoublets_cfi import *
@@ -9,7 +9,7 @@
from ..modules.pixelTracksTrackingRegions_cfi import *

pixelTracksTask = cms.Task(
pixelFitterByHelixProjections,
hltPhase2PixelFitterByHelixProjections,
pixelTrackFilterByKinematics,
pixelTracks,
pixelTracksHitDoublets,