Skip to content

[WIP] add fillPSetDescription to CkfTrackCandidateMakerBase and propagate it to CkfTrackCandidateMaker #35385

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

Closed
mmusich wants to merge 6 commits into from
Closed

[WIP] add fillPSetDescription to CkfTrackCandidateMakerBase and propagate it to CkfTrackCandidateMaker #35385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ce803e4
add fillPSetDescription to CkfTrackCandidateMakerBase and propagate i…
mmusich Sep 23, 2021
679b471
adding fillDescriptions in CkfTrackCandidateMaker (wip)
missirol Sep 23, 2021
83320d3
fixes for fillDescriptions in CkfTrackCandidateMaker and CkfTrajector…
missirol Sep 25, 2021
5ac6970
apply patch from @missirol
mmusich Sep 30, 2021
f185abf
fillDescriptions for CkfTrackCandidateMaker: patch for HI wfs
missirol Sep 30, 2021
5a66707
fix MinHitsTrajectoryFilter::fillPSetDescription
mmusich Oct 2, 2021
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
28 changes: 28 additions & 0 deletions HLTrigger/Configuration/python/customizeHLTforCMSSW.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,33 @@ def customiseFor35269(process):
process.load("RecoTracker.TkMSParametrization.multipleScatteringParametrisationMakerESProducer_cfi")
return process

def customiseFor35385(process):
"""Update the HLT configuration for the changes in #35385:
Introduction of fillDescriptions for CkfTrackCandidateMaker and CkfTrajectoryMaker
"""
for iMod in producers_by_type(process, 'CkfTrackCandidateMaker'):
for aPar in ['SimpleMagneticField', 'TrajectoryBuilder']:
if hasattr(iMod, aPar): delattr(iMod, aPar)

if not hasattr(iMod, 'maxSeedsBeforeCleaning'):
iMod.maxSeedsBeforeCleaning = cms.uint32(0)

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')

return process

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

Expand All @@ -170,5 +197,6 @@ def customizeHLTforCMSSW(process, menuType="GRun"):
process = customiseFor35309(process)
process = customiseFor35315(process)
process = customiseFor35269(process)
process = customiseFor35385(process)

return process
4 changes: 2 additions & 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,8 @@

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

# fitting: feed new-names
Expand Down
2 changes: 1 addition & 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 @@ -78,7 +78,7 @@
# trackign candidate
hiRegitMuPixelPairStepTrackCandidates = RecoTracker.IterativeTracking.PixelPairStep_cff.pixelPairStepTrackCandidates.clone(
src = 'hiRegitMuPixelPairStepSeeds',
TrajectoryBuilder = 'hiRegitMuPixelPairStepTrajectoryBuilder',
skipClusters = True,
clustersToSkip = "hiRegitMuPixelPairStepClusters",
maxNSeeds = 1000000
)
Expand Down
9 changes: 4 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,11 @@
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'),
skipClusters = True,
clustersToSkip = 'hiDetachedQuadStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
5 changes: 2 additions & 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,8 @@
numHitsForSeedCleaner = cms.int32(50),
onlyPixelHitsForSeedCleaner = cms.bool(True),
TrajectoryBuilderPSet = dict(refToPSet_ = 'hiDetachedTripletStepTrajectoryBuilder'),
TrajectoryBuilder = 'hiDetachedTripletStepTrajectoryBuilder',
clustersToSkip = cms.InputTag('hiDetachedTripletStepClusters'),
skipClusters = True,
clustersToSkip = 'hiDetachedTripletStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
9 changes: 4 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,11 @@
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'),
skipClusters = True,
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
9 changes: 4 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,11 @@
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'),
skipClusters = True,
clustersToSkip = 'hiLowPtQuadStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
8 changes: 4 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,11 @@
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'),
skipClusters = True,
clustersToSkip = 'hiLowPtTripletStepClusters',
doSeedingRegionRebuilding = True,
useHitsSplitting = True
)
Expand Down
3 changes: 2 additions & 1 deletion RecoHI/HiTracking/python/hiMixedTripletStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
mixedTripletStepPropagatorOpposite.ptMin = 0.4

# MAKING OF TRACK CANDIDATES
mixedTripletStepTrackCandidates.clustersToSkip = cms.InputTag('hiMixedTripletStepClusters')
mixedTripletStepTrackCandidates.skipClusters = True
mixedTripletStepTrackCandidates.clustersToSkip = 'hiMixedTripletStepClusters'

# TRACK FITTING
hiMixedTripletStepTracks = mixedTripletStepTracks.clone()
Expand Down
1 change: 1 addition & 0 deletions RecoHI/HiTracking/python/hiPixelLessStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
pixelLessStepTrajectoryFilter.minPt = 0.7

# MAKING OF TRACK CANDIDATES
pixelLessStepTrackCandidates.skipClusters = True
pixelLessStepTrackCandidates.clustersToSkip = 'hiPixelLessStepClusters'

# TRACK FITTING
Expand Down
8 changes: 4 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,12 @@
import RecoTracker.CkfPattern.CkfTrackCandidates_cfi
hiPixelPairTrackCandidates = RecoTracker.CkfPattern.CkfTrackCandidates_cfi.ckfTrackCandidates.clone(
src = 'hiPixelPairSeeds',
clustersToSkip = cms.InputTag('hiPixelPairClusters'),
skipClusters = True,
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
5 changes: 3 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,9 @@
# 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'),
skipClusters = True,
clustersToSkip = 'hiRegitDetachedTripletStepClusters'
)

hiRegitDetachedTripletStepTrackCandidates = RecoTracker.IterativeTracking.DetachedTripletStep_cff.detachedTripletStepTrackCandidates.clone(
Expand Down
5 changes: 3 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 @@ -45,8 +45,9 @@


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

# track candidates
Expand Down
5 changes: 3 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,9 @@


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

# track candidates
Expand Down
5 changes: 3 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 @@ -73,8 +73,9 @@
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'),
skipClusters = True,
clustersToSkip = 'hiRegitMixedTripletStepClusters',
)

hiRegitMixedTripletStepTrackCandidates = RecoTracker.IterativeTracking.MixedTripletStep_cff.mixedTripletStepTrackCandidates.clone(
Expand Down
5 changes: 3 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 @@ -49,8 +49,9 @@
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'),
skipClusters = True,
clustersToSkip = 'hiRegitPixelPairStepClusters',
)

# trackign candidate
Expand Down
1 change: 1 addition & 0 deletions RecoHI/HiTracking/python/hiTobTecStep_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
tobTecStepTrajectoryFilter.minPt = 0.85

# MAKING OF TRACK CANDIDATES
tobTecStepTrackCandidates.skipClusters = True
tobTecStepTrackCandidates.clustersToSkip = 'hiTobTecStepClusters'

# TRACK FITTING
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