Skip to content
Merged
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
3 changes: 0 additions & 3 deletions Configuration/EventContent/python/EventContent_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -696,10 +696,7 @@ def SwapKeepAndDrop(l):
'keep *_hltGeneralTracks_*_*',
'keep *_hltInitialStepTrackSelectionHighPurity_*_*',
'keep *_hltHighPtTripletStepTrackSelectionHighPurity_*_*',
'keep *_hltInitialStepTrackSelectionHighPuritypTTCLST_*_*',
'keep *_hltInitialStepTrackSelectionHighPuritypLSTCLST_*_*',
'keep *_hltInitialStepTracksT5TCLST_*_*',
'keep *_hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST_*_*',
'keep *_hltOfflinePrimaryVertices_*_*',
])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,10 @@
minNdof = cms.vdouble( 1.0E-5, 1.0E-5, 1.0E-5 ),
maxChi2 = cms.vdouble( 9999., 9999., 30.0 ),
maxDr = cms.vdouble( 99., 99., 1. ),
minLayers = cms.vint32( 0, 2, 3 )
minLayers = cms.vint32( 0, 2, 3 ),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
ignoreVertices = cms.bool( True ),
)
Expand Down
30 changes: 0 additions & 30 deletions DQMOffline/Trigger/python/TrackingMonitoring_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,31 +132,6 @@
allTrackProducer = 'hltHighPtTripletStepTrackSelectionHighPurity',
)

# LST track collections
initialSteppTTCLSTTracksMonitoringHLT = trackingMonHLT.clone(
FolderName = 'HLT/Tracking/initialStepTrackSelectionHighPuritypTTCLST',
TrackProducer = 'hltInitialStepTrackSelectionHighPuritypTTCLST',
allTrackProducer = 'hltInitialStepTrackSelectionHighPuritypTTCLST'
)

initialSteppLSTCLSTTracksMonitoringHLT = trackingMonHLT.clone(
FolderName = 'HLT/Tracking/initialStepTrackSelectionHighPuritypLSTCLST',
TrackProducer = 'hltInitialStepTrackSelectionHighPuritypLSTCLST',
allTrackProducer = 'hltInitialStepTrackSelectionHighPuritypLSTCLST'
)

initialStepT5TCLSTTracksMonitoringHLT = trackingMonHLT.clone(
FolderName = 'HLT/Tracking/initialStepTracksT5TCLST',
TrackProducer = 'hltInitialStepTracksT5TCLST',
allTrackProducer = 'hltInitialStepTracksT5TCLST'
)

highPtTripletSteppLSTCLSTTracksMonitoringHLT = trackingMonHLT.clone(
FolderName = 'HLT/Tracking/highPtTripletStepTrackSelectionHighPuritypLSTCLST',
TrackProducer = 'hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST',
allTrackProducer = 'hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST'
)

iter3TracksMonitoringHLT = trackingMonHLT.clone(
FolderName = 'HLT/Tracking/iter3Merged',
TrackProducer = 'hltIter3Merged',
Expand Down Expand Up @@ -299,10 +274,5 @@
run3_common.toReplaceWith(trackingMonitorHLT, cms.Sequence(pixelTracksMonitoringHLT + iterHLTTracksMonitoringHLT + doubletRecoveryHPTracksMonitoringHLT))
phase2_tracker.toReplaceWith(trackingMonitorHLT, cms.Sequence(pixelTracksMonitoringHLT + iterHLTTracksMonitoringHLT + iterInitialStepMonitoringHLT + iterHighPtTripletsMonitoringHLT))

from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
(~seedingLST & trackingLST).toReplaceWith(trackingMonitorHLT, cms.Sequence(pixelTracksMonitoringHLT + iterHLTTracksMonitoringHLT + initialSteppTTCLSTTracksMonitoringHLT + initialSteppLSTCLSTTracksMonitoringHLT + initialStepT5TCLSTTracksMonitoringHLT + iterHighPtTripletsMonitoringHLT))
(seedingLST & trackingLST).toReplaceWith(trackingMonitorHLT, cms.Sequence(pixelTracksMonitoringHLT + iterHLTTracksMonitoringHLT + initialSteppTTCLSTTracksMonitoringHLT + initialStepT5TCLSTTracksMonitoringHLT + highPtTripletSteppLSTCLSTTracksMonitoringHLT))

run3_common.toReplaceWith(trackingMonitorHLTall, cms.Sequence(pixelTracksMonitoringHLT + iter0TracksMonitoringHLT + iter0HPTracksMonitoringHLT + doubletRecoveryTracksMonitoringHLT + doubletRecoveryHPTracksMonitoringHLT + iterHLTTracksMonitoringHLT))
run3_common.toReplaceWith(egmTrackingMonitorHLT, cms.Sequence(gsfTracksMonitoringHLT))
Original file line number Diff line number Diff line change
Expand Up @@ -29,50 +29,18 @@
from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST

(~singleIterPatatrack & trackingLST).toModify(hltGeneralTracks, indivShareFrac = [0.1,0.1])

_hltGeneralTracksSingleIterPatatrack = hltGeneralTracks.clone(
TrackProducers = ["hltInitialStepTrackSelectionHighPurity"],
hasSelector = [0],
indivShareFrac = [1.0],
selectedTrackQuals = ["hltInitialStepTrackSelectionHighPurity"],
setsToMerge = {0: dict(pQual=True, tLists=[0,1])}
)

(singleIterPatatrack & ~trackingLST & ~seedingLST).toReplaceWith(hltGeneralTracks, _hltGeneralTracksSingleIterPatatrack)

_hltGeneralTracksLST = hltGeneralTracks.clone(
TrackProducers = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPurity"],
hasSelector = [0,0,0,0],
indivShareFrac = [0.1,0.1,0.1,0.1],
selectedTrackQuals = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPurity"],
setsToMerge = {0: dict(pQual=True, tLists=[0,1,2,3])}
setsToMerge = {0: dict(pQual=True, tLists=[0])}
)

(~singleIterPatatrack & trackingLST & ~seedingLST).toReplaceWith(hltGeneralTracks, _hltGeneralTracksLST)

_hltGeneralTracksSingleIterPatatrackLST = hltGeneralTracks.clone(
TrackProducers = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST"],
hasSelector = [0,0,0],
indivShareFrac = [0.1,0.1,0.1],
selectedTrackQuals = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTrackSelectionHighPuritypLSTCLST", "hltInitialStepTracksT5TCLST"],
setsToMerge = {0: dict(pQual=True, tLists=[0,1,2])}
)

(singleIterPatatrack & trackingLST & ~seedingLST).toReplaceWith(hltGeneralTracks, _hltGeneralTracksSingleIterPatatrackLST)

_hltGeneralTracksLSTSeeding = hltGeneralTracks.clone(
TrackProducers = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST"],
hasSelector = [0,0,0],
indivShareFrac = [0.1,0.1,0.1],
selectedTrackQuals = ["hltInitialStepTrackSelectionHighPuritypTTCLST", "hltInitialStepTracksT5TCLST", "hltHighPtTripletStepTrackSelectionHighPuritypLSTCLST"],
setsToMerge = {0: dict(pQual=True, tLists=[0,1,2])}
)

(~singleIterPatatrack & trackingLST & seedingLST).toReplaceWith(hltGeneralTracks, _hltGeneralTracksLSTSeeding)

(singleIterPatatrack & trackingLST & seedingLST).toModify(_hltGeneralTracksSingleIterPatatrack,
TrackProducers = ["hltInitialStepTracks"],
selectedTrackQuals = ["hltInitialStepTracks"])
(singleIterPatatrack & trackingLST & seedingLST).toReplaceWith(hltGeneralTracks, _hltGeneralTracksSingleIterPatatrack)
(singleIterPatatrack & trackingLST).toModify(_hltGeneralTracksSingleIterPatatrack, indivShareFrac = [0.1])
(singleIterPatatrack).toReplaceWith(hltGeneralTracks, _hltGeneralTracksSingleIterPatatrack)

from Configuration.ProcessModifiers.ngtScouting_cff import ngtScouting
from ..modules.hltPhase2PixelTracks_cfi import *
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,9 @@
src = cms.InputTag("hltHighPtTripletStepSeeds"),
useHitsSplitting = cms.bool(False)
)

from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST

(~singleIterPatatrack & trackingLST & seedingLST).toModify(hltHighPtTripletStepTrackCandidates, src = "hltInitialStepTrackCandidates:pLSTSsLST")

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
minLayers = cms.vint32(3, 3, 4),
minNVtxTrk = cms.int32(3),
minNdof = cms.vdouble(1e-05, 1e-05, 1e-05),
minPixelHits = cms.vint32(0, 0, 3)
minPixelHits = cms.vint32(0, 0, 3),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
src = cms.InputTag("hltHighPtTripletStepTracks"),
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,20 @@
minLayers = cms.vint32(3, 3, 3),
minNVtxTrk = cms.int32(3),
minNdof = cms.vdouble(1e-05, 1e-05, 1e-05),
minPixelHits = cms.vint32(0, 0, 3)
minPixelHits = cms.vint32(0, 0, 3),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
src = cms.InputTag("hltInitialStepTracks"),
vertices = cms.InputTag("hltPhase2PixelVertices")
)

from Configuration.ProcessModifiers.hltTrackingMkFitInitialStep_cff import hltTrackingMkFitInitialStep
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
from Configuration.ProcessModifiers.trackingLST_cff import trackingLST

trackingLST.toModify(hltInitialStepTrackCutClassifier, mva = dict( passThroughForDisplaced = True ))
(singleIterPatatrack & trackingLST & seedingLST).toModify(hltInitialStepTrackCutClassifier, mva = dict( passThroughForAll = True ))

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@
useSimpleMF = cms.bool(False)
)

from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST

(~singleIterPatatrack & trackingLST & seedingLST).toModify(hltInitialStepTracks, src = "hltInitialStepTrackCandidates:nopLSTCsLST")

_hltInitialStepTracksMkFitFit = cms.EDProducer("MkFitOutputTrackConverter",
measurementTrackerEvent = cms.InputTag("hltMeasurementTrackerEvent"),
Expand All @@ -43,9 +48,7 @@

from Configuration.ProcessModifiers.hltTrackingMkFitInitialStep_cff import hltTrackingMkFitInitialStep
from Configuration.ProcessModifiers.trackingMkFitFit_cff import trackingMkFitFit

(hltTrackingMkFitInitialStep & trackingMkFitFit).toReplaceWith(hltInitialStepTracks, _hltInitialStepTracksMkFitFit)

from Configuration.ProcessModifiers.singleIterPatatrack_cff import singleIterPatatrack
from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
from Configuration.ProcessModifiers.seedingLST_cff import seedingLST
(singleIterPatatrack & trackingLST & seedingLST & hltTrackingMkFitInitialStep & trackingMkFitFit).toReplaceWith(hltInitialStepTracks, _hltInitialStepTracksMkFitFitLSTSeeds)

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
minLayers = cms.vint32(3, 3, 4),
minNVtxTrk = cms.int32(3),
minNdof = cms.vdouble(1e-05, 1e-05, 1e-05),
minPixelHits = cms.vint32(0, 3, 4)
minPixelHits = cms.vint32(0, 3, 4),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
src = cms.InputTag("hltIter0Phase2L3FromL1TkMuonCtfWithMaterialTracks"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
minLayers = cms.vint32(3, 3, 3),
minNVtxTrk = cms.int32(3),
minNdof = cms.vdouble(1e-05, 1e-05, 1e-05),
minPixelHits = cms.vint32(0, 0, 0)
minPixelHits = cms.vint32(0, 0, 0),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
src = cms.InputTag("hltIter2Phase2L3FromL1TkMuonCtfWithMaterialTracks"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
minLayers = cms.vint32(3, 3, 4),
minNVtxTrk = cms.int32(3),
minNdof = cms.vdouble(1e-05, 1e-05, 1e-05),
minPixelHits = cms.vint32(0, 0, 3)
minPixelHits = cms.vint32(0, 0, 3),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
src = cms.InputTag("hltPhase2L3MuonHighPtTripletStepTracks"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
minLayers = cms.vint32(3, 3, 3),
minNVtxTrk = cms.int32(3),
minNdof = cms.vdouble(1e-05, 1e-05, 1e-05),
minPixelHits = cms.vint32(0, 0, 3)
minPixelHits = cms.vint32(0, 0, 3),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
src = cms.InputTag("hltPhase2L3MuonInitialStepTracks"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
minLayers = cms.vint32(3, 5, 5),
minNVtxTrk = cms.int32(3),
minNdof = cms.vdouble(1e-05, 1e-05, 1e-05),
minPixelHits = cms.vint32(0, 0, 1)
minPixelHits = cms.vint32(0, 0, 1),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
src = cms.InputTag("hltPhase2L3OIMuCtfWithMaterialTracks"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@
minLayers = cms.vint32(3, 3, 3),
minNVtxTrk = cms.int32(3),
minNdof = cms.vdouble(1e-05, 1e-05, 1e-05),
minPixelHits = cms.vint32(0, 0, 3)
minPixelHits = cms.vint32(0, 0, 3),
passThroughForAll = cms.bool(False),
passThroughForDisplaced = cms.bool(False),
minLayersForDisplaced = cms.int32(4)
),
qualityCuts = cms.vdouble(-0.7, 0.1, 0.7),
src = cms.InputTag("hltPhase2PixelTracksCAExtension"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,3 @@

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