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.

Sign up for GitHub

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

add fillDescriptions to CkfTrackCandidateMaker (and its dependencies) #36459

Merged
merged 3 commits into from
Jan 8, 2022
Merged

add fillDescriptions to CkfTrackCandidateMaker (and its dependencies) #36459

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21d4e79
add fillDescriptions to CkfTrackCandidateMaker (and its dependencies)
missirol Dec 10, 2021
e46d33c
removed 1 unnecessary check in customiseFor36459 for HLT
missirol Jan 5, 2022
ea77013
restored correct impl for -DVI_REPRODUCIBLE in CkfTrackCandidateMaker…
missirol Jan 5, 2022
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
59 changes: 58 additions & 1 deletion HLTrigger/Configuration/python/customizeHLTforCMSSW.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,15 +143,72 @@ def customiseFor2018Input(process):

return process

def customiseFor36459(process):
"""Update the HLT configuration for the changes in #36459:
add fillDescriptions to CkfTrackCandidateMaker (and its dependencies)
"""
for iMod in producers_by_type(process, 'CkfTrackCandidateMaker'):
for aPar in ['SimpleMagneticField', 'TrajectoryBuilder']:
if hasattr(iMod, aPar): delattr(iMod, aPar)

# convert onlyPixelHitsForSeedCleaner to tracked bool
if hasattr(iMod, 'onlyPixelHitsForSeedCleaner'):
theMod = getattr(iMod, 'onlyPixelHitsForSeedCleaner')
if not theMod.isTracked():
setattr(iMod, 'onlyPixelHitsForSeedCleaner', cms.bool(theMod.value()))

# convert numHitsForSeedCleaner to tracked int32
if hasattr(iMod, 'numHitsForSeedCleaner'):
theMod = getattr(iMod, 'numHitsForSeedCleaner')
if not theMod.isTracked():
setattr(iMod, 'numHitsForSeedCleaner', cms.int32(theMod.value()))

# convert clustersToSkip to tracked InputTag
if hasattr(iMod, 'clustersToSkip'):
theMod = getattr(iMod, 'clustersToSkip')
if not theMod.isTracked():
setattr(iMod, 'clustersToSkip', cms.InputTag(theMod.value()))

for iMod in producers_by_type(process, 'CkfTrajectoryMaker'):
for aPar in ['TrajectoryBuilder']:
if hasattr(iMod, aPar):
delattr(iMod, aPar)

for aPSet in process._Process__psets.values():
if hasattr(aPSet, 'ComponentType') and aPSet.ComponentType in ['CkfTrajectoryBuilder', 'GroupedCkfTrajectoryBuilder', 'MuonCkfTrajectoryBuilder']:
for aPar in ['MeasurementTrackerName', 'cleanTrajectoryAfterInOut', 'doSeedingRegionRebuilding', 'useHitsSplitting']:
if hasattr(aPSet, aPar):
delattr(aPSet, aPar)

if aPSet.ComponentType == 'GroupedCkfTrajectoryBuilder' and aPSet.useSameTrajFilter:
if not hasattr(aPSet, 'inOutTrajectoryFilter'):
aPSet.inOutTrajectoryFilter = aPSet.trajectoryFilter.clone()

if aPSet.ComponentType == 'CkfTrajectoryBuilder' and hasattr(aPSet, 'minNrOfHitsForRebuild'):
delattr(aPSet, 'minNrOfHitsForRebuild')

if aPSet.ComponentType != 'GroupedCkfTrajectoryBuilder' and hasattr(aPSet, 'useSameTrajFilter'):
delattr(aPSet, 'useSameTrajFilter')

for iProdName in ['SeedCreatorFromRegionConsecutiveHitsEDProducer', 'SeedCreatorFromRegionConsecutiveHitsTripletOnlyEDProducer']:
for iMod in producers_by_type(process, iProdName):
if hasattr(iMod, 'SeedComparitorPSet') and hasattr(iMod.SeedComparitorPSet, 'comparitors'):
for pSetIdx in range(len(iMod.SeedComparitorPSet.comparitors)):
if iMod.SeedComparitorPSet.comparitors[pSetIdx].ComponentName == 'StripSubClusterShapeSeedFilter':
if not hasattr(iMod.SeedComparitorPSet.comparitors[pSetIdx], 'layerMask'):
iMod.SeedComparitorPSet.comparitors[pSetIdx].layerMask = cms.PSet()

return process

# CMSSW version specific customizations
def customizeHLTforCMSSW(process, menuType="GRun"):

# if the gpu modifier is enabled, make the Pixel, ECAL and HCAL reconstruction offloadable to a GPU
from HLTrigger.Configuration.customizeHLTforPatatrack import customizeHLTforPatatrack
gpu.makeProcessModifier(customizeHLTforPatatrack).apply(process)

# add call to action function in proper order: newest last!
# process = customiseFor12718(process)
process = customiseFor36459(process)

return process
3 changes: 1 addition & 2 deletions RecoHI/HiMuonAlgos/python/HiRegitMuonDetachedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@

hiRegitMuDetachedTripletStepTrackCandidates = RecoTracker.IterativeTracking.DetachedTripletStep_cff._detachedTripletStepTrackCandidatesCkf.clone(
src = 'hiRegitMuDetachedTripletStepSeeds',
TrajectoryBuilder = 'hiRegitMuDetachedTripletStepTrajectoryBuilder',
clustersToSkip = cms.InputTag("hiRegitMuDetachedTripletStepClusters")
clustersToSkip = 'hiRegitMuDetachedTripletStepClusters'
)

# fitting: feed new-names
Expand Down
1 change: 0 additions & 1 deletion RecoHI/HiMuonAlgos/python/HiRegitMuonPixelPairStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@
# trackign candidate
hiRegitMuPixelPairStepTrackCandidates = RecoTracker.IterativeTracking.PixelPairStep_cff._pixelPairStepTrackCandidatesCkf.clone(
src = 'hiRegitMuPixelPairStepSeeds',
TrajectoryBuilder = 'hiRegitMuPixelPairStepTrajectoryBuilder',
clustersToSkip = "hiRegitMuPixelPairStepClusters",
maxNSeeds = 1000000
)
Expand Down
8 changes: 3 additions & 5 deletions RecoHI/HiTracking/python/hiDetachedQuadStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
# TRACK BUILDING
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
hiDetachedQuadStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = dict(refToPSet_ = 'hiDetachedQuadStepTrajectoryFilter'),
maxCand = 4,#4 for pp
estimator = 'hiDetachedQuadStepChi2Est',
Expand All @@ -142,11 +141,10 @@
hiDetachedQuadStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = 'hiDetachedQuadStepSeeds',
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
numHitsForSeedCleaner = 50,
onlyPixelHitsForSeedCleaner = True,
TrajectoryBuilderPSet = dict(refToPSet_ = 'hiDetachedQuadStepTrajectoryBuilder'),
TrajectoryBuilder = 'hiDetachedQuadStepTrajectoryBuilder',
clustersToSkip = cms.InputTag('hiDetachedQuadStepClusters'),
clustersToSkip = 'hiDetachedQuadStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
4 changes: 1 addition & 3 deletions RecoHI/HiTracking/python/hiDetachedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@
# TRACK BUILDING
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
hiDetachedTripletStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = dict(refToPSet_ = 'hiDetachedTripletStepTrajectoryFilter'),
maxCand = 2,
estimator = 'hiDetachedTripletStepChi2Est',
Expand All @@ -161,8 +160,7 @@
numHitsForSeedCleaner = cms.int32(50),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not removing the explicit type also here and below (and above for maxDPhiForLooperReconstruction, maxPtForLooperReconstruction)?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@perrotta I agree, this should be fixed. I'm wondering what the best timeline is: we could test this PR as is in the IB over the weekend, to see if any issues show up in other wfs, before the next pre-release, or I could apply the changes now and that will likely delay things a bit (b/c of re-testing and re-getting signatures). If you think this could be merged already now, I would go for the first option (and will make a separate PR on Monday to fix the explicit-type changes I missed); if you prefer otherwise, I can apply the changes already to this PR.

onlyPixelHitsForSeedCleaner = cms.bool(True),
TrajectoryBuilderPSet = dict(refToPSet_ = 'hiDetachedTripletStepTrajectoryBuilder'),
TrajectoryBuilder = 'hiDetachedTripletStepTrajectoryBuilder',
clustersToSkip = cms.InputTag('hiDetachedTripletStepClusters'),
clustersToSkip = 'hiDetachedTripletStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
8 changes: 3 additions & 5 deletions RecoHI/HiTracking/python/hiHighPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
# TRACK BUILDING
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
hiHighPtTripletStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = dict(refToPSet_ = 'hiHighPtTripletStepTrajectoryFilter'),
maxCand = 3,#3 for pp
estimator = 'hiHighPtTripletStepChi2Est',
Expand All @@ -141,11 +140,10 @@
hiHighPtTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = 'hiHighPtTripletStepSeeds',
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
numHitsForSeedCleaner = 50,
onlyPixelHitsForSeedCleaner = True,
TrajectoryBuilderPSet = dict(refToPSet_ = 'hiHighPtTripletStepTrajectoryBuilder'),
TrajectoryBuilder = 'hiHighPtTripletStepTrajectoryBuilder',
clustersToSkip = cms.InputTag('hiHighPtTripletStepClusters'),
clustersToSkip = 'hiHighPtTripletStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
1 change: 0 additions & 1 deletion RecoHI/HiTracking/python/hiJetCoreRegionalStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
# TRACK BUILDING
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
hiJetCoreRegionalStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = dict(refToPSet_ = 'hiJetCoreRegionalStepTrajectoryFilter'),
maxCand = 50,
estimator = 'hiJetCoreRegionalStepChi2Est',
Expand Down
8 changes: 3 additions & 5 deletions RecoHI/HiTracking/python/hiLowPtQuadStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@
# TRACK BUILDING
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
hiLowPtQuadStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = dict(refToPSet_ = 'hiLowPtQuadStepTrajectoryFilter'),
maxCand = 4,#4 for pp
estimator = 'hiLowPtQuadStepChi2Est',
Expand All @@ -145,11 +144,10 @@
hiLowPtQuadStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = 'hiLowPtQuadStepSeeds',
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
numHitsForSeedCleaner = 50,
onlyPixelHitsForSeedCleaner = True,
TrajectoryBuilderPSet = dict(refToPSet_ = 'hiLowPtQuadStepTrajectoryBuilder'),
TrajectoryBuilder = 'hiLowPtQuadStepTrajectoryBuilder',
clustersToSkip = cms.InputTag('hiLowPtQuadStepClusters'),
clustersToSkip = 'hiLowPtQuadStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
7 changes: 3 additions & 4 deletions RecoHI/HiTracking/python/hiLowPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@
# TRACK BUILDING
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
hiLowPtTripletStepTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = dict(refToPSet_ = 'hiLowPtTripletStepTrajectoryFilter'),
maxCand = 3,
estimator = 'hiLowPtTripletStepChi2Est',
Expand All @@ -151,10 +150,10 @@
hiLowPtTripletStepTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = 'hiLowPtTripletStepSeeds',
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
numHitsForSeedCleaner = 50,
onlyPixelHitsForSeedCleaner = True,
TrajectoryBuilderPSet = dict(refToPSet_ = 'hiLowPtTripletStepTrajectoryBuilder'),
clustersToSkip = cms.InputTag('hiLowPtTripletStepClusters'),
clustersToSkip = 'hiLowPtTripletStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
7 changes: 3 additions & 4 deletions RecoHI/HiTracking/python/hiPixelPairStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@
# TRACK BUILDING
import RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi
hiPixelPairTrajectoryBuilder = RecoTracker.CkfPattern.GroupedCkfTrajectoryBuilder_cfi.GroupedCkfTrajectoryBuilder.clone(
MeasurementTrackerName = '',
trajectoryFilter = dict(refToPSet_ = 'hiPixelPairTrajectoryFilter'),
maxCand = 3,
estimator = 'hiPixelPairChi2Est',
Expand All @@ -149,11 +148,11 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
hiPixelPairTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = 'hiPixelPairSeeds',
clustersToSkip = cms.InputTag('hiPixelPairClusters'),
clustersToSkip = 'hiPixelPairClusters',
TrajectoryBuilderPSet = dict(refToPSet_ = 'hiPixelPairTrajectoryBuilder'),
### these two parameters are relevant only for the CachingSeedCleanerBySharedInput
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
numHitsForSeedCleaner = 50,
onlyPixelHitsForSeedCleaner = True,
)
trackingPhase1.toModify(hiPixelPairTrackCandidates,
src = 'hiPixelPairStepSeedsPhase1'
Expand Down
4 changes: 2 additions & 2 deletions RecoHI/HiTracking/python/hiRegitDetachedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
# building: feed the new-named seeds
hiRegitDetachedTripletStepTrajectoryFilter = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryFilterBase.clone()
hiRegitDetachedTripletStepTrajectoryBuilder = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('hiRegitDetachedTripletStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('hiRegitDetachedTripletStepClusters')
trajectoryFilter = dict(refToPSet_ = 'hiRegitDetachedTripletStepTrajectoryFilter'),
clustersToSkip = 'hiRegitDetachedTripletStepClusters'
)

hiRegitDetachedTripletStepTrackCandidates = RecoTracker.IterativeTracking.DetachedTripletStep_cff._detachedTripletStepTrackCandidatesCkf.clone(
Expand Down
4 changes: 2 additions & 2 deletions RecoHI/HiTracking/python/hiRegitInitialStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@


hiRegitInitialStepTrajectoryBuilder = RecoTracker.IterativeTracking.InitialStep_cff.initialStepTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('hiRegitInitialStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('hiRegitInitialStepClusters')
trajectoryFilter = dict(refToPSet_ = 'hiRegitInitialStepTrajectoryFilter'),
clustersToSkip = 'hiRegitInitialStepClusters'
)

# track candidates
Expand Down
4 changes: 2 additions & 2 deletions RecoHI/HiTracking/python/hiRegitLowPtTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@


hiRegitLowPtTripletStepTrajectoryBuilder = RecoTracker.IterativeTracking.LowPtTripletStep_cff.lowPtTripletStepTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('hiRegitLowPtTripletStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('hiRegitLowPtTripletStepClusters'),
trajectoryFilter = dict(refToPSet_ = 'hiRegitLowPtTripletStepTrajectoryFilter'),
clustersToSkip = 'hiRegitLowPtTripletStepClusters',
)

# track candidates
Expand Down
4 changes: 2 additions & 2 deletions RecoHI/HiTracking/python/hiRegitMixedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
hiRegitMixedTripletStepTrajectoryFilter = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrajectoryFilter.clone()

hiRegitMixedTripletStepTrajectoryBuilder = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('hiRegitMixedTripletStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('hiRegitMixedTripletStepClusters'),
trajectoryFilter = dict(refToPSet_ = 'hiRegitMixedTripletStepTrajectoryFilter'),
clustersToSkip = 'hiRegitMixedTripletStepClusters',
)

hiRegitMixedTripletStepTrackCandidates = RecoTracker.IterativeTracking.MixedTripletStep_cff._mixedTripletStepTrackCandidatesCkf.clone(
Expand Down
4 changes: 2 additions & 2 deletions RecoHI/HiTracking/python/hiRegitPixelPairStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@
hiRegitPixelPairStepTrajectoryFilter = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrajectoryFilterBase.clone()

hiRegitPixelPairStepTrajectoryBuilder = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrajectoryBuilder.clone(
trajectoryFilter = cms.PSet(refToPSet_ = cms.string('hiRegitPixelPairStepTrajectoryFilter')),
clustersToSkip = cms.InputTag('hiRegitPixelPairStepClusters'),
trajectoryFilter = dict(refToPSet_ = 'hiRegitPixelPairStepTrajectoryFilter'),
clustersToSkip = 'hiRegitPixelPairStepClusters',
)

# trackign candidate
Expand Down
6 changes: 5 additions & 1 deletion RecoMuon/L3TrackFinder/interface/MuonCkfTrajectoryBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
#ifndef RecoMuon_L3TrackFinder_MuonCkfTrajectoryBuilder_H
#define RecoMuon_L3TrackFinder_MuonCkfTrajectoryBuilder_H

#include "RecoTracker/CkfPattern/interface/CkfTrajectoryBuilder.h"
#include "FWCore/Framework/interface/ESWatcher.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "RecoTracker/CkfPattern/interface/CkfTrajectoryBuilder.h"

class TrackingComponentsRecord;

class MuonCkfTrajectoryBuilder : public CkfTrajectoryBuilder {
public:
MuonCkfTrajectoryBuilder(const edm::ParameterSet& conf, edm::ConsumesCollector& iC);
~MuonCkfTrajectoryBuilder() override;

static void fillPSetDescription(edm::ParameterSetDescription& iDesc);

protected:
void setEvent_(const edm::Event& iEvent, const edm::EventSetup& iSetup) override;

Expand Down
3 changes: 2 additions & 1 deletion RecoMuon/L3TrackFinder/plugins/SealModules.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#include "FWCore/Framework/interface/MakerMacros.h"
#include "FWCore/ParameterSet/interface/ValidatedPluginMacros.h"

#include "RecoMuon/L3TrackFinder/interface/MuonCkfTrajectoryBuilder.h"
#include "RecoTracker/CkfPattern/interface/BaseCkfTrajectoryBuilderFactory.h"
#include "RecoMuon/L3TrackFinder/interface/HLTMuonL2SelectorForL3IO.h"

DEFINE_EDM_PLUGIN(BaseCkfTrajectoryBuilderFactory, MuonCkfTrajectoryBuilder, "MuonCkfTrajectoryBuilder");
DEFINE_EDM_VALIDATED_PLUGIN(BaseCkfTrajectoryBuilderFactory, MuonCkfTrajectoryBuilder, "MuonCkfTrajectoryBuilder");
DEFINE_FWK_MODULE(HLTMuonL2SelectorForL3IO);
1 change: 0 additions & 1 deletion RecoMuon/L3TrackFinder/python/MuonCkfTrajectoryBuilder_cfi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
intermediateCleaning = cms.bool(False),
#would skip the first layer to search for measurement if bare TrajectorySeed
useSeedLayer = cms.bool(False),
MeasurementTrackerName = cms.string(''),
estimator = cms.string('Chi2'),
TTRHBuilder = cms.string('WithTrackAngle'),
#propagator used only if useSeedLayer=true
Expand Down
9 changes: 9 additions & 0 deletions RecoMuon/L3TrackFinder/src/MuonCkfTrajectoryBuilder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,15 @@ MuonCkfTrajectoryBuilder::MuonCkfTrajectoryBuilder(const edm::ParameterSet& conf

MuonCkfTrajectoryBuilder::~MuonCkfTrajectoryBuilder() {}

void MuonCkfTrajectoryBuilder::fillPSetDescription(edm::ParameterSetDescription& iDesc) {
CkfTrajectoryBuilder::fillPSetDescription(iDesc);
iDesc.add<double>("deltaEta", .1);
iDesc.add<double>("deltaPhi", .1);
iDesc.add<std::string>("propagatorProximity", "SteppingHelixPropagatorAny");
iDesc.add<bool>("useSeedLayer", false);
iDesc.add<double>("rescaleErrorIfFail", 1.);
}

void MuonCkfTrajectoryBuilder::setEvent_(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
CkfTrajectoryBuilder::setEvent_(iEvent, iSetup);

Expand Down
6 changes: 4 additions & 2 deletions RecoPixelVertexing/PixelLowPtUtilities/interface/ClusterShapeTrajectoryFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#ifndef _ClusterShapeTrajectoryFilter_h_
#define _ClusterShapeTrajectoryFilter_h_

#include "TrackingTools/TrajectoryFiltering/interface/TrajectoryFilter.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "TrackingTools/TrajectoryFiltering/interface/TrajectoryFilter.h"

namespace edm {
class ParameterSet;
Expand All @@ -21,9 +22,10 @@ class SiPixelClusterShapeCache;
class ClusterShapeTrajectoryFilter : public TrajectoryFilter {
public:
ClusterShapeTrajectoryFilter(const edm::ParameterSet& iConfig, edm::ConsumesCollector& iC);

~ClusterShapeTrajectoryFilter() override;

static void fillPSetDescription(edm::ParameterSetDescription& iDesc);

void setEvent(const edm::Event& iEvent, const edm::EventSetup& iSetup) override;

bool qualityFilter(const TempTrajectory&) const override;
Expand Down
7 changes: 7 additions & 0 deletions RecoPixelVertexing/PixelLowPtUtilities/interface/StripSubClusterShapeTrajectoryFilter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "RecoTracker/MeasurementDet/interface/MeasurementTrackerEvent.h"
#include "FWCore/Framework/interface/ESHandle.h"
#include "FWCore/Utilities/interface/EDGetToken.h"
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
#include "FWCore/ParameterSet/interface/ParameterSet.h"
#include "RecoTracker/TkSeedingLayers/interface/SeedComparitor.h"
#include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
Expand All @@ -33,6 +34,8 @@ class StripSubClusterShapeFilterBase {
StripSubClusterShapeFilterBase(const edm::ParameterSet &iConfig, edm::ConsumesCollector &iC);
virtual ~StripSubClusterShapeFilterBase();

static void fillPSetDescription(edm::ParameterSetDescription &iDesc);

protected:
void setEventBase(const edm::Event &, const edm::EventSetup &);

Expand Down Expand Up @@ -86,6 +89,10 @@ class StripSubClusterShapeTrajectoryFilter : public StripSubClusterShapeFilterBa

~StripSubClusterShapeTrajectoryFilter() override {}

static void fillPSetDescription(edm::ParameterSetDescription &iDesc) {
StripSubClusterShapeFilterBase::fillPSetDescription(iDesc);
}

bool qualityFilter(const TempTrajectory &) const override;
bool qualityFilter(const Trajectory &) const override;

Expand Down
Loading