Skip to content
Draft
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
6 changes: 6 additions & 0 deletions Configuration/EventContent/python/EventContent_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ def SwapKeepAndDrop(l):
from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
from Configuration.ProcessModifiers.alpakaValidationLST_cff import alpakaValidationLST
from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
from RecoLocalFastTime.Configuration.RecoLocalFastTime_EventContent_cff import *
from RecoMTD.Configuration.RecoMTD_EventContent_cff import *
Expand Down Expand Up @@ -718,6 +719,11 @@ def SwapKeepAndDrop(l):
'keep *_hltInitialStepTracksT5TCLST_*_*',
'keep *_hltOfflinePrimaryVertices_*_*',
])
alpakaValidationLST.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
'keep *_hltInitialStepTracks_*_*',
'keep *_hltInitialStepTracksSerialSync_*_*',
])

phase2_common.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import FWCore.ParameterSet.Config as cms

# This modifier performs the host/device validation for the LST algorithm
alpakaValidationLST = cms.Modifier()

Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,7 @@
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
from Configuration.ProcessModifiers.hltTrackingMkFitInitialStep_cff import hltTrackingMkFitInitialStep
(trackingLST & seedingLST & hltTrackingMkFitInitialStep).toModify(hltInitialStepMkFitSeeds, seeds = "hltInitialStepTrajectorySeedsLST")

hltInitialStepMkFitSeedsSerialSync = hltInitialStepMkFitSeeds.clone(
Copy link

Choose a reason for hiding this comment

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

I thought the idea was to not cover the seedingLST part: just use the candidate directly from LST and only pass them through a fit

seeds = "hltInitialStepTrajectorySeedsLSTSerialSync"
)
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@
seeds = cms.InputTag("hltInitialStepMkFitSeeds"),
stripHits = cms.InputTag("hltMkFitSiPhase2Hits")
)

hltInitialStepTrackCandidatesMkFitSerialSync = hltInitialStepTrackCandidatesMkFit.clone(
seeds = "hltInitialStepMkFitSeedsSerialSync"
)
Original file line number Diff line number Diff line change
Expand Up @@ -87,3 +87,16 @@
(singleIterPatatrack & trackingLST & seedingLST).toModify(hltInitialStepTrackCandidates, src = "hltInitialStepTrajectorySeedsLST") # All LST seeds
(~seedingLST & ~trackingLST & hltTrackingMkFitInitialStep).toReplaceWith(hltInitialStepTrackCandidates, _hltInitialStepTrackCandidatesMkFit)
(singleIterPatatrack & seedingLST & trackingLST & hltTrackingMkFitInitialStep).toReplaceWith(hltInitialStepTrackCandidates, _hltInitialStepTrackCandidatesMkFitLSTSeeds)

# Supported combinations for LST CPU vs. GPU validation
hltInitialStepTrackCandidatesSerialSync = hltInitialStepTrackCandidates.clone()
(singleIterPatatrack & trackingLST & ~seedingLST).toModify(hltInitialStepTrackCandidatesSerialSync,
lstOutput = cms.InputTag('hltLSTSerialSync'),
lstInput = cms.InputTag('hltInputLSTSerialSync'),
lstPixelSeeds = cms.InputTag('hltInputLSTSerialSync')
Comment on lines +94 to +96
Copy link

Choose a reason for hiding this comment

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

Suggested change
lstOutput = cms.InputTag('hltLSTSerialSync'),
lstInput = cms.InputTag('hltInputLSTSerialSync'),
lstPixelSeeds = cms.InputTag('hltInputLSTSerialSync')
lstOutput = 'hltLSTSerialSync',
lstInput = 'hltInputLSTSerialSync',
lstPixelSeeds = 'hltInputLSTSerialSync'

the usual thing with modifying existing parameters; the comment applies to the rest of the PR

)
(singleIterPatatrack & seedingLST & trackingLST & hltTrackingMkFitInitialStep).toModify(hltInitialStepTrackCandidatesSerialSync,
mkFitSeeds = "hltInitialStepMkFitSeedsSerialSync",
seeds = "hltInitialStepTrajectorySeedsLSTSerialSync",
tracks = "hltInitialStepTrackCandidatesMkFitSerialSync",
)
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
useSimpleMF = cms.bool(False)
)

hltInitialStepTracksSerialSync = hltInitialStepTracks.clone(
src = cms.InputTag("hltInitialStepTrackCandidatesSerialSync"),
Copy link

Choose a reason for hiding this comment

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

Suggested change
src = cms.InputTag("hltInitialStepTrackCandidatesSerialSync"),
src = "hltInitialStepTrackCandidatesSerialSync",

)

from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,9 @@
forceKinematicWithRegionDirection = cms.bool(False)
)
)

hltInitialStepTrajectorySeedsLSTSerialSync = hltInitialStepTrajectorySeedsLST.clone(
lstOutput = cms.InputTag('hltLSTSerialSync'),
Copy link

Choose a reason for hiding this comment

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

Suggested change
lstOutput = cms.InputTag('hltLSTSerialSync'),
lstOutput = 'hltLSTSerialSync',

lstInput = cms.InputTag('hltInputLSTSerialSync'),
lstPixelSeeds = cms.InputTag('hltInputLSTSerialSync')
)
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import FWCore.ParameterSet.Config as cms
from HeterogeneousCore.AlpakaCore.functions import makeSerialClone

hltInputLST = cms.EDProducer('LSTInputProducer@alpaka',
ptCut = cms.double(0.8),
Expand All @@ -20,6 +21,8 @@
from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
singleIterPatatrack.toReplaceWith(hltInputLST, _hltInputLSTSingleIterPatatrack)

hltInputLSTSerialSync = makeSerialClone(hltInputLST)

_hltInputLSTNGTScouting = hltInputLST.clone(
seedTracks = ['hltInitialStepSeedTracksLST']
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import FWCore.ParameterSet.Config as cms
from HeterogeneousCore.AlpakaCore.functions import makeSerialClone

hltLST = cms.EDProducer('LSTProducer@alpaka',
lstInput = cms.InputTag('hltInputLST'),
Expand All @@ -16,3 +17,7 @@
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
(seedingLST & trackingLST).toModify(hltLST, nopLSDupClean = True,
tcpLSTriplets = True )

hltLSTSerialSync = makeSerialClone(hltLST,
lstInput = "hltInputLSTSerialSync"
)
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,15 @@

(~singleIterPatatrack & trackingLST).toReplaceWith(HLTInitialStepSequence, _HLTInitialStepSequenceLST)

from Configuration.ProcessModifiers.alpakaValidationLST_cff import alpakaValidationLST
alpakaValidationLST.toReplaceWith(_HLTInitialStepSequenceLST, cms.Sequence(
_HLTInitialStepSequenceLST.copy()
+hltInputLSTSerialSync
+hltLSTSerialSync
+hltInitialStepTrackCandidatesSerialSync
+hltInitialStepTracksSerialSync
)
)
(singleIterPatatrack & trackingLST & ~seedingLST).toReplaceWith(HLTInitialStepSequence, _HLTInitialStepSequenceLST.copyAndExclude([HLTHighPtTripletStepSeedingSequence,hltHighPtTripletStepSeedTracksLST]))

from ..modules.hltInitialStepTrajectorySeedsLST_cfi import *
Expand Down Expand Up @@ -106,6 +115,8 @@

(singleIterPatatrack & trackingLST & seedingLST & hltTrackingMkFitInitialStep).toReplaceWith(HLTInitialStepSequence, _HLTInitialStepSequenceSingleIterPatatrackLSTSeedingMkFitTracking)

#(alpakaValidation & singleIterPatatrack & trackingLST & seedingLST & hltTrackingMkFitInitialStep).toReplaceWith(HLTInitialStepSequence, HLTInitialStepSequence.copyAndAdd([hltInputLSTSerialSync,hltLSTSerialSync,hltInitialStepTrajectorySeedsLSTSerialSync,hltInitialStepTrackCandidatesSerialSync,hltInitialStepTracksSerialSync]))
Copy link

Choose a reason for hiding this comment

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

cleanup?


from ..modules.hltInitialStepTrackCandidatesMkFitFit_cfi import *

_HLTInitialStepSequenceMkFitFitTracking = cms.Sequence(
Expand Down
21 changes: 21 additions & 0 deletions Validation/RecoTrack/python/HLTmultiTrackValidator_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,27 @@ def _modifyForPhase2(trackvalidator):
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(hltTrackValidator, _modifyForPhase2)


from DQM.TrackingMonitorSource.TrackToTrackComparisonHists_cfi import TrackToTrackComparisonHists as _TrackToTrackComparisonHists
hltInitialStepTrackToTrackSerialSync = _TrackToTrackComparisonHists.clone(
requireValidHLTPaths = False,
monitoredTrack = "hltInitialStepTracks",
monitoredBeamSpot = "hltOnlineBeamSpot",
monitoredPrimaryVertices = "hltPhase2PixelVertices",
referenceTrack = "hltInitialStepTracksSerialSync",
referenceBeamSpot = "hltOnlineBeamSpot",
referencePrimaryVertices = "hltPhase2PixelVertices",
topDirName = cms.string('HLT/Tracking/ValidationWRTSerialSync/initialStepTracks'),
)

from Configuration.ProcessModifiers.alpakaValidationLST_cff import alpakaValidationLST
alpakaValidationLST.toReplaceWith(hltMultiTrackValidation, cms.Sequence(
hltMultiTrackValidation.copy()
+hltInitialStepTrackToTrackSerialSync
)
)


from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from Configuration.ProcessModifiers.ngtScouting_cff import ngtScouting
from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
Expand Down