Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
9544a58
Revise some includes
VourMa Aug 19, 2024
fcb5e32
Work on pixelType and removal of deprecated functions in standalone
VourMa Aug 20, 2024
3864e82
bugfixes to incomplete alpaka::wait cleanup: need to wait to get coun…
slava77devel Aug 21, 2024
03da845
Make a data member private
VourMa Aug 21, 2024
c4d12fc
Simplify consumes(), esConsumes(), produces() and code checks/format
VourMa Aug 21, 2024
9713499
Merge pull request #87 from slava77/CMSSW_14_1_0_pre5/LSTb6-alpaka-wa…
VourMa Aug 21, 2024
1b6a0e1
Apply review comments
VourMa Aug 22, 2024
bb8402d
Addressing review comments on PixelType
VourMa Aug 25, 2024
b5a1383
Harmonize pixelType determination in CMSSW with the standalone
VourMa Aug 25, 2024
24f587e
Invert DeltaPhi arguments in CMSSW to harmonize with standalone
VourMa Aug 28, 2024
f245be0
Merge pull request #85 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LS…
slava77 Aug 28, 2024
1bff72d
Started moving to smart pointers
ariostas Aug 27, 2024
0340221
Cleaned up namespaces
ariostas Aug 30, 2024
3eb7a56
Addressed review comments
ariostas Aug 30, 2024
f0e560b
Renamed private data members
ariostas Aug 30, 2024
d2b9e89
Merge pull request #89 from SegmentLinking/more_review_fixes
slava77 Aug 30, 2024
46f7f22
Finished cleaning namespaces
ariostas Sep 3, 2024
e564c66
First version of LST in HLT with procModifiers
VourMa Sep 8, 2024
2bc333b
Merge pull request #88 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LS…
slava77 Sep 13, 2024
5f9c2f6
new style code-checks from cms-bot https://cmssdt.cern.ch/SDT/code-ch…
slava77devel Sep 13, 2024
fed5145
Fixes to LST in HLT with procModifiers
VourMa Sep 13, 2024
b1d9ec5
Merged refs/pull/45117/head from repository cms-sw with cms-merge-topic
VourMa Sep 15, 2024
c524c36
Make SiPhase2RecHits used for LST consistent with the HLT SiPhase2Clu…
VourMa Sep 18, 2024
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
5 changes: 5 additions & 0 deletions Configuration/ProcessModifiers/python/seedingLST_cff.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

# This modifier sets the LST (Phase-2 line segment tracking) used for track seeding
# Needs to be used on top of the trackingLST modifier
seedingLST = cms.Modifier()
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import FWCore.ParameterSet.Config as cms

def _addProcessModulesDevLST(process):
process.hltESPModulesDevLST = cms.ESProducer('LSTModulesDevESProducer@alpaka',
appendToDataLabel = cms.string(''),
alpaka = cms.untracked.PSet(
backend = cms.untracked.string('')
)
)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
modifyConfigurationForTrackingLSTModulesDevLST_ = trackingLST.makeProcessModifier(_addProcessModulesDevLST)
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import FWCore.ParameterSet.Config as cms

def _addProcessTTRHBuilderWithoutRefit(process):
process.hltESPTTRHBuilderWithoutRefit = cms.ESProducer("TkTransientTrackingRecHitBuilderESProducer",
ComponentName = cms.string('WithoutRefit'),
ComputeCoarseLocalPositionFromDisk = cms.bool(False),
Matcher = cms.string('Fake'),
Phase2StripCPE = cms.string(''),
PixelCPE = cms.string('Fake'),
StripCPE = cms.string('Fake')
)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
modifyConfigurationForTrackingLSTTTRHBuilderWithoutRefit_ = trackingLST.makeProcessModifier(_addProcessTTRHBuilderWithoutRefit)
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,31 @@
trackAlgoPriorityOrder = cms.string('trackAlgoPriorityOrder'),
writeOnlyTrkQuals = cms.bool(False)
)

_hltGeneralTracksLST = hltGeneralTracks.clone(
TrackProducers = cms.VInputTag("hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPurity"),
hasSelector = cms.vint32(0,0,0,0),
indivShareFrac = cms.vdouble(0.1,0.1,0.1,0.1),
selectedTrackQuals = cms.VInputTag(cms.InputTag("hltInitialStepTrackSelectionHighPuritypTTCLST"), cms.InputTag("hltInitialStepTrackSelectionHighPuritypLSTCLST"), cms.InputTag("hltInitialStepTracksT5TCLST"), cms.InputTag("hltHighPtTripletStepTrackSelectionHighPurity")),
setsToMerge = cms.VPSet(cms.PSet(
pQual = cms.bool(True),
tLists = cms.vint32(0,1,2,3)
))
)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
trackingLST.toReplaceWith(hltGeneralTracks, _hltGeneralTracksLST)

_hltGeneralTracksLSTSeeding = hltGeneralTracks.clone(
TrackProducers = cms.VInputTag("hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST"),
hasSelector = cms.vint32(0,0,0),
indivShareFrac = cms.vdouble(0.1,0.1,0.1),
selectedTrackQuals = cms.VInputTag(cms.InputTag("hltInitialStepTrackSelectionHighPuritypTTCLST"), cms.InputTag("hltInitialStepTracksT5TCLST"), cms.InputTag("hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST")),
setsToMerge = cms.VPSet(cms.PSet(
pQual = cms.bool(True),
tLists = cms.vint32(0,1,2)
))
)

from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
(seedingLST & trackingLST).toReplaceWith(hltGeneralTracks, _hltGeneralTracksLSTSeeding)
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,11 @@
trackClassifier = cms.InputTag("","QualityMasks"),
trajectories = cms.InputTag("hltInitialStepTrackSelectionHighPurity")
)

_hltHighPtTripletStepClustersLST = hltHighPtTripletStepClusters.clone(
trajectories = cms.InputTag("hltInitialStepSeedTracksLST")
)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
trackingLST.toReplaceWith(hltHighPtTripletStepClusters, _hltHighPtTripletStepClustersLST)

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

hltHighPtTripletStepSeedTracksLST = cms.EDProducer(
"TrackFromSeedProducer",
src = cms.InputTag("hltHighPtTripletStepSeeds"),
beamSpot = cms.InputTag("offlineBeamSpot"),
TTRHBuilder = cms.string("WithoutRefit")
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltHighPtTripletStepTrackCandidates_cfi import hltHighPtTripletStepTrackCandidates as _hltHighPtTripletStepTrackCandidates
hltHighPtTripletStepTrackCandidatespLSTCLST = _hltHighPtTripletStepTrackCandidates.clone( src = cms.InputTag("hltInitialStepTrackCandidates:pLSTSsLST") )

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltHighPtTripletStepTrackCutClassifier_cfi import hltHighPtTripletStepTrackCutClassifier as _hltHighPtTripletStepTrackCutClassifier
hltHighPtTripletStepTrackCutClassifierpLSTCLST = _hltHighPtTripletStepTrackCutClassifier.clone( src = cms.InputTag("hltHighPtTripletStepTrackspLSTCLST") )

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltHighPtTripletStepTrackSelectionHighPurity_cfi import hltHighPtTripletStepTrackSelectionHighPurity as _hltHighPtTripletStepTrackSelectionHighPurity
hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST = _hltHighPtTripletStepTrackSelectionHighPurity.clone(
originalMVAVals = cms.InputTag("hltHighPtTripletStepTrackCutClassifierpLSTCLST","MVAValues"),
originalQualVals = cms.InputTag("hltHighPtTripletStepTrackCutClassifierpLSTCLST","QualityMasks"),
originalSource = cms.InputTag("hltHighPtTripletStepTrackspLSTCLST")
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltHighPtTripletStepTracks_cfi import hltHighPtTripletStepTracks as _hltHighPtTripletStepTracks
hltHighPtTripletStepTrackspLSTCLST = _hltHighPtTripletStepTracks.clone( src = cms.InputTag("hltHighPtTripletStepTrackCandidatespLSTCLST") )

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

hltInitialStepSeedTracksLST = cms.EDProducer(
"TrackFromSeedProducer",
src = cms.InputTag("hltInitialStepSeeds"),
beamSpot = cms.InputTag("offlineBeamSpot"),
TTRHBuilder = cms.string("WithoutRefit")
)

Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,27 @@
src = cms.InputTag("hltInitialStepSeeds"),
useHitsSplitting = cms.bool(False)
)

_hltInitialStepTrackCandidatesLST = cms.EDProducer('LSTOutputConverter',
lstOutput = cms.InputTag('hltLST'),
phase2OTHits = cms.InputTag('hltPhase2OTHitsInputLST'),
lstPixelSeeds = cms.InputTag('hltPixelSeedInputLST'),
includeT5s = cms.bool(True),
includeNonpLSTSs = cms.bool(False),
propagatorAlong = cms.ESInputTag('', 'PropagatorWithMaterial'),
propagatorOpposite = cms.ESInputTag('', 'PropagatorWithMaterialOpposite'),
SeedCreatorPSet = cms.PSet(
ComponentName = cms.string('SeedFromConsecutiveHitsCreator'),
propagator = cms.string('PropagatorWithMaterial'),
SeedMomentumForBOFF = cms.double(5),
OriginTransverseErrorMultiplier = cms.double(1),
MinOneOverPtError = cms.double(1),
magneticField = cms.string(''),
TTRHBuilder = cms.string('WithTrackAngle'),
forceKinematicWithRegionDirection = cms.bool(False)
)
)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
trackingLST.toReplaceWith(hltInitialStepTrackCandidates, _hltInitialStepTrackCandidatesLST)

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltInitialStepTrackCutClassifier_cfi import hltInitialStepTrackCutClassifier as _hltInitialStepTrackCutClassifier
hltInitialStepTrackCutClassifierpLSTCLST = _hltInitialStepTrackCutClassifier.clone( src = cms.InputTag("hltInitialStepTrackspLSTCLST") )

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltInitialStepTrackCutClassifier_cfi import hltInitialStepTrackCutClassifier as _hltInitialStepTrackCutClassifier
hltInitialStepTrackCutClassifierpTTCLST = _hltInitialStepTrackCutClassifier.clone( src = cms.InputTag("hltInitialStepTrackspTTCLST") )

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltInitialStepTrackSelectionHighPurity_cfi import hltInitialStepTrackSelectionHighPurity as _hltInitialStepTrackSelectionHighPurity
hltInitialStepTrackSelectionHighPuritypLSTCLST = _hltInitialStepTrackSelectionHighPurity.clone(
originalMVAVals = cms.InputTag("hltInitialStepTrackCutClassifierpLSTCLST","MVAValues"),
originalQualVals = cms.InputTag("hltInitialStepTrackCutClassifierpLSTCLST","QualityMasks"),
originalSource = cms.InputTag("hltInitialStepTrackspLSTCLST")
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltInitialStepTrackSelectionHighPurity_cfi import hltInitialStepTrackSelectionHighPurity as _hltInitialStepTrackSelectionHighPurity
hltInitialStepTrackSelectionHighPuritypTTCLST = _hltInitialStepTrackSelectionHighPurity.clone(
originalMVAVals = cms.InputTag("hltInitialStepTrackCutClassifierpTTCLST","MVAValues"),
originalQualVals = cms.InputTag("hltInitialStepTrackCutClassifierpTTCLST","QualityMasks"),
originalSource = cms.InputTag("hltInitialStepTrackspTTCLST")
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltInitialStepTracks_cfi import hltInitialStepTracks as _hltInitialStepTracks
hltInitialStepTracksT5TCLST = _hltInitialStepTracks.clone( src = cms.InputTag("hltInitialStepTrackCandidates:t5TCsLST") )

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltInitialStepTracks_cfi import hltInitialStepTracks as _hltInitialStepTracks
hltInitialStepTrackspLSTCLST = _hltInitialStepTracks.clone( src = cms.InputTag("hltInitialStepTrackCandidates:pLSTCsLST") )

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from ..modules.hltInitialStepTracks_cfi import hltInitialStepTracks as _hltInitialStepTracks
hltInitialStepTrackspTTCLST = _hltInitialStepTracks.clone( src = cms.InputTag("hltInitialStepTrackCandidates:pTTCsLST") )

14 changes: 14 additions & 0 deletions HLTrigger/Configuration/python/HLT_75e33/modules/hltLST_cfi.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import FWCore.ParameterSet.Config as cms

hltLST = cms.EDProducer('LSTProducer@alpaka',
pixelSeedInput = cms.InputTag('hltPixelSeedInputLST'),
phase2OTHitsInput = cms.InputTag('hltPhase2OTHitsInputLST'),
verbose = cms.bool(False),
nopLSDupClean = cms.bool(False),
tcpLSTriplets = cms.bool(False),
mightGet = cms.optional.untracked.vstring,
alpaka = cms.untracked.PSet(
backend = cms.untracked.string('')
)
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import FWCore.ParameterSet.Config as cms

hltPhase2OTHitsInputLST = cms.EDProducer('LSTPhase2OTHitsInputProducer',
phase2OTRecHits = cms.InputTag('hltSiPhase2RecHits'),
mightGet = cms.optional.untracked.vstring
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import FWCore.ParameterSet.Config as cms

hltPixelSeedInputLST = cms.EDProducer('LSTPixelSeedInputProducer',
beamSpot = cms.InputTag('offlineBeamSpot'),
seedTracks = cms.VInputTag(
'hltInitialStepSeedTracksLST',
'hltHighPtTripletStepSeedTracksLST'
)
)

Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

from RecoLocalTracker.Phase2TrackerRecHits.Phase2TrackerRecHits_cfi import siPhase2RecHits as _siPhase2RecHits
hltSiPhase2RecHits = _siPhase2RecHits.clone( src = cms.InputTag("hltSiPhase2Clusters") )

Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,16 @@
from ..sequences.HLTHighPtTripletStepSeedingSequence_cfi import *

HLTHighPtTripletStepSequence = cms.Sequence(HLTHighPtTripletStepSeedingSequence+hltHighPtTripletStepTrackCandidates+hltHighPtTripletStepTracks+hltHighPtTripletStepTrackCutClassifier+hltHighPtTripletStepTrackSelectionHighPurity)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
trackingLST.toReplaceWith(HLTHighPtTripletStepSequence, HLTHighPtTripletStepSequence.copyAndExclude([HLTHighPtTripletStepSeedingSequence]))

from ..modules.hltHighPtTripletStepTrackCandidatespLSTCLST_cfi import *
from ..modules.hltHighPtTripletStepTrackspLSTCLST_cfi import *
from ..modules.hltHighPtTripletStepTrackCutClassifierpLSTCLST_cfi import *
from ..modules.hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST_cfi import *
_HLTHighPtTripletStepSequenceLSTSeeding = cms.Sequence(hltHighPtTripletStepTrackCandidatespLSTCLST+hltHighPtTripletStepTrackspLSTCLST+hltHighPtTripletStepTrackCutClassifierpLSTCLST+hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST)

from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
(seedingLST & trackingLST).toReplaceWith(HLTHighPtTripletStepSequence, _HLTHighPtTripletStepSequenceLSTSeeding)

Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,43 @@
from ..modules.hltInitialStepTrackSelectionHighPurity_cfi import *

HLTInitialStepSequence = cms.Sequence(hltInitialStepSeeds+hltInitialStepTrackCandidates+hltInitialStepTracks+hltInitialStepTrackCutClassifier+hltInitialStepTrackSelectionHighPurity)

from ..modules.hltInitialStepSeedTracksLST_cfi import *
from ..sequences.HLTHighPtTripletStepSeedingSequence_cfi import *
from ..modules.hltHighPtTripletStepSeedTracksLST_cfi import *
from ..modules.hltPixelSeedInputLST_cfi import *
from ..modules.hltSiPhase2RecHits_cfi import *
from ..modules.hltPhase2OTHitsInputLST_cfi import *
from ..modules.hltLST_cfi import *
from ..modules.hltInitialStepTrackspTTCLST_cfi import *
from ..modules.hltInitialStepTrackspLSTCLST_cfi import *
from ..modules.hltInitialStepTracksT5TCLST_cfi import *
from ..modules.hltInitialStepTrackCutClassifierpTTCLST_cfi import *
from ..modules.hltInitialStepTrackCutClassifierpLSTCLST_cfi import *
from ..modules.hltInitialStepTrackSelectionHighPuritypTTCLST_cfi import *
from ..modules.hltInitialStepTrackSelectionHighPuritypLSTCLST_cfi import *
_HLTInitialStepSequenceLST = cms.Sequence(
hltInitialStepSeeds
+hltInitialStepSeedTracksLST
+HLTHighPtTripletStepSeedingSequence
+hltHighPtTripletStepSeedTracksLST
+hltPixelSeedInputLST
+hltSiPhase2RecHits # Probably need to move elsewhere in the final setup
+hltPhase2OTHitsInputLST # Probably need to move elsewhere in the final setup
+hltLST
+hltInitialStepTrackCandidates
+hltInitialStepTrackspTTCLST
+hltInitialStepTrackspLSTCLST
+hltInitialStepTracksT5TCLST
+hltInitialStepTrackCutClassifierpTTCLST
+hltInitialStepTrackCutClassifierpLSTCLST
+hltInitialStepTrackSelectionHighPuritypTTCLST
+hltInitialStepTrackSelectionHighPuritypLSTCLST
)

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
trackingLST.toReplaceWith(HLTInitialStepSequence, _HLTInitialStepSequenceLST)

from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
(seedingLST & trackingLST).toReplaceWith(HLTInitialStepSequence, _HLTInitialStepSequenceLST.copyAndExclude([hltInitialStepTrackspLSTCLST,hltInitialStepTrackCutClassifierpLSTCLST,hltInitialStepTrackSelectionHighPuritypLSTCLST]))

3 changes: 3 additions & 0 deletions HLTrigger/Configuration/python/HLT_75e33_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@
fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPSiPixelCablingSoA_cfi")
fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPSiPixelGainCalibrationForHLTSoA_cfi")

fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPModulesDevLST_cfi")
fragment.load("HLTrigger/Configuration/HLT_75e33/eventsetup/hltESPTTRHBuilderWithoutRefit_cfi")

fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_AK4PFPuppiJet520_cfi")
fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_L1Seeded_cfi")
fragment.load("HLTrigger/Configuration/HLT_75e33/paths/HLT_Diphoton30_23_IsoCaloId_Unseeded_cfi")
Expand Down
30 changes: 14 additions & 16 deletions RecoTracker/LST/plugins/LSTOutputConverter.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,14 @@ class LSTOutputConverter : public edm::global::EDProducer<> {
};

LSTOutputConverter::LSTOutputConverter(edm::ParameterSet const& iConfig)
: lstOutputToken_(consumes<LSTOutput>(iConfig.getParameter<edm::InputTag>("lstOutput"))),
lstPhase2OTHitsInputToken_{consumes<LSTPhase2OTHitsInput>(iConfig.getParameter<edm::InputTag>("phase2OTHits"))},
lstPixelSeedToken_{consumes<TrajectorySeedCollection>(iConfig.getParameter<edm::InputTag>("lstPixelSeeds"))},
: lstOutputToken_(consumes(iConfig.getParameter<edm::InputTag>("lstOutput"))),
lstPhase2OTHitsInputToken_{consumes(iConfig.getParameter<edm::InputTag>("phase2OTHits"))},
lstPixelSeedToken_{consumes(iConfig.getParameter<edm::InputTag>("lstPixelSeeds"))},
includeT5s_(iConfig.getParameter<bool>("includeT5s")),
includeNonpLSTSs_(iConfig.getParameter<bool>("includeNonpLSTSs")),
mfToken_(esConsumes()),
propagatorAlongToken_{
esConsumes<Propagator, TrackingComponentsRecord>(iConfig.getParameter<edm::ESInputTag>("propagatorAlong"))},
propagatorOppositeToken_{esConsumes<Propagator, TrackingComponentsRecord>(
iConfig.getParameter<edm::ESInputTag>("propagatorOpposite"))},
propagatorAlongToken_{esConsumes(iConfig.getParameter<edm::ESInputTag>("propagatorAlong"))},
propagatorOppositeToken_{esConsumes(iConfig.getParameter<edm::ESInputTag>("propagatorOpposite"))},
tGeomToken_(esConsumes()),
seedCreator_(SeedCreatorFactory::get()->create("SeedFromConsecutiveHitsCreator",
iConfig.getParameter<edm::ParameterSet>("SeedCreatorPSet"),
Expand All @@ -77,15 +75,15 @@ LSTOutputConverter::LSTOutputConverter(edm::ParameterSet const& iConfig)
// - The minimal set for TCs is t5TCsLST, pTTCsLST and pLSTCsLST.
// That would complicate the handling of collections though,
// so it is deferred to when we have a clearer picture of what's needed.
trajectorySeedPutToken_(produces<TrajectorySeedCollection>("")),
trajectorySeedpLSPutToken_(produces<TrajectorySeedCollection>("pLSTSsLST")),
trackCandidatePutToken_(produces<TrackCandidateCollection>("")),
trackCandidatepTCPutToken_(produces<TrackCandidateCollection>("pTCsLST")),
trackCandidateT5TCPutToken_(produces<TrackCandidateCollection>("t5TCsLST")),
trackCandidateNopLSTCPutToken_(produces<TrackCandidateCollection>("nopLSTCsLST")),
trackCandidatepTTCPutToken_(produces<TrackCandidateCollection>("pTTCsLST")),
trackCandidatepLSTCPutToken_(produces<TrackCandidateCollection>("pLSTCsLST")),
seedStopInfoPutToken_(produces<std::vector<SeedStopInfo>>()) {}
trajectorySeedPutToken_(produces("")),
trajectorySeedpLSPutToken_(produces("pLSTSsLST")),
trackCandidatePutToken_(produces("")),
trackCandidatepTCPutToken_(produces("pTCsLST")),
trackCandidateT5TCPutToken_(produces("t5TCsLST")),
trackCandidateNopLSTCPutToken_(produces("nopLSTCsLST")),
trackCandidatepTTCPutToken_(produces("pTTCsLST")),
trackCandidatepLSTCPutToken_(produces("pLSTCsLST")),
seedStopInfoPutToken_(produces()) {}

void LSTOutputConverter::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
Expand Down
5 changes: 2 additions & 3 deletions RecoTracker/LST/plugins/LSTPhase2OTHitsInputProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@ class LSTPhase2OTHitsInputProducer : public edm::global::EDProducer<> {
};

LSTPhase2OTHitsInputProducer::LSTPhase2OTHitsInputProducer(edm::ParameterSet const& iConfig)
: phase2OTRecHitToken_(
consumes<Phase2TrackerRecHit1DCollectionNew>(iConfig.getParameter<edm::InputTag>("phase2OTRecHits"))),
lstPhase2OTHitsInputPutToken_(produces<LSTPhase2OTHitsInput>()) {}
: phase2OTRecHitToken_(consumes(iConfig.getParameter<edm::InputTag>("phase2OTRecHits"))),
lstPhase2OTHitsInputPutToken_(produces()) {}

void LSTPhase2OTHitsInputProducer::fillDescriptions(edm::ConfigurationDescriptions& descriptions) {
edm::ParameterSetDescription desc;
Expand Down
6 changes: 3 additions & 3 deletions RecoTracker/LST/plugins/LSTPixelSeedInputProducer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ class LSTPixelSeedInputProducer : public edm::global::EDProducer<> {

LSTPixelSeedInputProducer::LSTPixelSeedInputProducer(edm::ParameterSet const& iConfig)
: mfToken_(esConsumes()),
beamSpotToken_(consumes<reco::BeamSpot>(iConfig.getParameter<edm::InputTag>("beamSpot"))),
lstPixelSeedInputPutToken_(produces<LSTPixelSeedInput>()),
lstPixelSeedsPutToken_(produces<TrajectorySeedCollection>()) {
beamSpotToken_(consumes(iConfig.getParameter<edm::InputTag>("beamSpot"))),
lstPixelSeedInputPutToken_(produces()),
lstPixelSeedsPutToken_(produces()) {
seedTokens_ = edm::vector_transform(iConfig.getParameter<std::vector<edm::InputTag>>("seedTracks"),
[&](const edm::InputTag& tag) { return consumes<edm::View<reco::Track>>(tag); });
}
Expand Down
Loading