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.

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 hlt (HLT) label to Phase-2 HLT modules (sequences) #45636

Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 11 additions & 1 deletion Configuration/EventContent/python/EventContent_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -677,8 +677,13 @@ def SwapKeepAndDrop(l):
])
phase2_tracker.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
'keep *_hltSiPixelClusters_*_*',
'keep *_hltSiPhase2Clusters_*_*',
'keep *_hltPhase2PixelTracks_*_*',
'keep *_hltPhase2PixelVertices_*_*'
'keep *_hltPhase2PixelVertices_*_*',
'keep *_hltGeneralTracks_*_*',
Copy link
Contributor

Choose a reason for hiding this comment

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

What is the size increasing with this hltGeneralTracks collection? FEVTDEBUGHLT is super big already, and this will effect the relvals size and Phase-2 production.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

What is the size increasing with this hltGeneralTracks collection?

Zero. This is just a renaming.

'keep *_hltOfflinePrimaryVertices_*_*',
'keep *_hltHGCalRecHit_*_*'
])

phase2_common.toModify(FEVTDEBUGHLTEventContent,
Expand All @@ -689,6 +694,11 @@ def SwapKeepAndDrop(l):
phase2_muon.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands + ['keep recoMuons_muons1stStep_*_*'])

phase2_hgcal.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands + TICL_FEVTHLT.outputCommands)

ticl_v5.toModify(FEVTDEBUGHLTEventContent, outputCommands=FEVTDEBUGHLTEventContent.outputCommands+TICLv5_FEVTHLT.outputCommands)

from Configuration.ProcessModifiers.premix_stage2_cff import premix_stage2

(premix_stage2 & phase2_tracker).toModify(FEVTDEBUGHLTEventContent,
Expand Down
2 changes: 1 addition & 1 deletion DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(hltVerticesMonitoring,
TopFolderName = "HLT/Vertexing/hltFullVertices",
vertexLabel = cms.InputTag("offlinePrimaryVertices","","HLT"))
vertexLabel = cms.InputTag("hltOfflinePrimaryVertices"))

hltPixelVerticesMonitoring = hltVerticesMonitoring.clone(
TopFolderName = "HLT/Vertexing/hltPixelVertices",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

HLTclusterMonitorIT = clusterMonitorIT.clone(
TopFolderName = cms.string('HLT/TrackerPhase2ITCluster'),
InnerPixelClusterSource = cms.InputTag('siPixelClusters','','HLT'),
InnerPixelClusterSource = cms.InputTag('hltSiPixelClusters'),
)
HLTclusterMonitorOT = clusterMonitorOT.clone(
TopFolderName = cms.string('HLT/TrackerPhase2OTCluster'),
clusterSrc = cms.InputTag('siPhase2Clusters','','HLT'),
clusterSrc = cms.InputTag('hltSiPhase2Clusters'),
)

HLTtrackerphase2DQMSource = cms.Sequence(HLTclusterMonitorIT +
Expand Down
12 changes: 6 additions & 6 deletions DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(hltMerged2highPurity,
monitoredTrack = cms.InputTag("generalTracks","","HLT"),
monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT"))
monitoredTrack = cms.InputTag("hltGeneralTracks"),
monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices"))

hltMerged2highPurityPV = TrackToTrackComparisonHists.clone(
dzWRTPvCut = 0.1,
Expand All @@ -51,8 +51,8 @@

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(hltMerged2highPurityPV,
monitoredTrack = cms.InputTag("generalTracks","","HLT"),
monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT"))
monitoredTrack = cms.InputTag("hltGeneralTracks"),
monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices"))

#
# E/gamma monitoring
Expand Down Expand Up @@ -82,11 +82,11 @@
from Configuration.Eras.Modifier_phase2_common_cff import phase2_common
phase2_common.toModify(hltEgammaGsfTracksVsOffline,
monitoredTrack = cms.InputTag("hltEgammaGsfTracksL1Seeded"),
monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT"))
monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices"))

phase2_common.toModify(hltEgammaGsfTracksVsOfflinePV,
monitoredTrack = cms.InputTag("hltEgammaGsfTracksL1Seeded"),
monitoredPrimaryVertices = cms.InputTag("offlinePrimaryVertices","","HLT"))
monitoredPrimaryVertices = cms.InputTag("hltOfflinePrimaryVertices"))

hltToOfflineTrackValidatorSequence = cms.Sequence(
cms.ignore(highPurityTracks)
Expand Down
4 changes: 2 additions & 2 deletions DQMOffline/Trigger/python/TrackingMonitoring_cff.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,8 @@

phase2_tracker.toModify(iterHLTTracksMonitoringHLT,
primaryVertex = 'hltPhase2PixelVertices',
TrackProducer = 'generalTracks::HLT',
allTrackProducer = 'generalTracks::HLT')
TrackProducer = 'hltGeneralTracks',
allTrackProducer = 'hltGeneralTracks')

iter3TracksMonitoringHLT = trackingMonHLT.clone(
FolderName = 'HLT/Tracking/iter3Merged',
Expand Down

This file was deleted.

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 @@ -3,5 +3,5 @@
hltAK4PFCHSJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer",
algorithm = cms.string('AK4PFchs'),
level = cms.string('L1FastJet'),
srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp")
srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp")
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
maxRecoveredHcalCells = cms.uint32(9999999),
minSeed = cms.uint32(14327),
rParam = cms.double(0.4),
src = cms.InputTag("pfNoPileUpJME"),
src = cms.InputTag("hltPfNoPileUpJME"),
srcPVs = cms.InputTag(""),
useDeterministicSeed = cms.bool(True),
voronoiRfact = cms.double(-0.9)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
nSigmaPU = cms.double(1.0),
rParam = cms.double(0.4),
radiusPU = cms.double(0.5),
src = cms.InputTag("pfClusterRefsForJets"),
src = cms.InputTag("hltPfClusterRefsForJets"),
srcPVs = cms.InputTag("NotUsed"),
useDeterministicSeed = cms.bool(True),
voronoiRfact = cms.double(-0.9)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
hltAK4PFJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer",
algorithm = cms.string('AK4PF'),
level = cms.string('L1FastJet'),
srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp")
srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp")
)
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
radiusPU = cms.double(0.4),
rcut_factor = cms.double(-1.0),
restrictInputs = cms.bool(False),
src = cms.InputTag("particleFlowTmp"),
src = cms.InputTag("hltParticleFlowTmp"),
srcPVs = cms.InputTag("hltPhase2PixelVertices"),
srcWeights = cms.InputTag(""),
subjetPtMin = cms.double(-1.0),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
maxRecoveredHcalCells = cms.uint32(9999999),
minSeed = cms.uint32(14327),
rParam = cms.double(0.4),
src = cms.InputTag("particleFlowTmp"),
src = cms.InputTag("hltParticleFlowTmp"),
srcPVs = cms.InputTag(""),
useDeterministicSeed = cms.bool(True),
voronoiRfact = cms.double(-0.9)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
hltAK4PFPuppiJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer",
algorithm = cms.string('AK4PFPuppiHLT'),
level = cms.string('L1FastJet'),
srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp")
srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp")
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
maxRecoveredHcalCells = cms.uint32(9999999),
minSeed = cms.uint32(14327),
rParam = cms.double(0.4),
src = cms.InputTag("particleFlowTmp"),
src = cms.InputTag("hltParticleFlowTmp"),
srcPVs = cms.InputTag(""),
srcWeights = cms.InputTag("hltPFPuppi"),
useDeterministicSeed = cms.bool(True),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
hltAK8PFCHSJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer",
algorithm = cms.string('AK8PFchs'),
level = cms.string('L1FastJet'),
srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp")
srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp")
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
maxRecoveredHcalCells = cms.uint32(9999999),
minSeed = cms.uint32(14327),
rParam = cms.double(0.8),
src = cms.InputTag("pfNoPileUpJME"),
src = cms.InputTag("hltPfNoPileUpJME"),
srcPVs = cms.InputTag(""),
useDeterministicSeed = cms.bool(True),
voronoiRfact = cms.double(-0.9)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
nSigmaPU = cms.double(1.0),
rParam = cms.double(0.8),
radiusPU = cms.double(0.5),
src = cms.InputTag("pfClusterRefsForJets"),
src = cms.InputTag("hltPfClusterRefsForJets"),
srcPVs = cms.InputTag("NotUsed"),
useDeterministicSeed = cms.bool(True),
voronoiRfact = cms.double(-0.9)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
hltAK8PFJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer",
algorithm = cms.string('AK8PF'),
level = cms.string('L1FastJet'),
srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp")
srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp")
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
maxRecoveredHcalCells = cms.uint32(9999999),
minSeed = cms.uint32(14327),
rParam = cms.double(0.8),
src = cms.InputTag("particleFlowTmp"),
src = cms.InputTag("hltParticleFlowTmp"),
srcPVs = cms.InputTag(""),
useDeterministicSeed = cms.bool(True),
voronoiRfact = cms.double(-0.9)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
hltAK8PFPuppiJetCorrectorL1 = cms.EDProducer("L1FastjetCorrectorProducer",
algorithm = cms.string('AK8PFPuppi'),
level = cms.string('L1FastJet'),
srcRho = cms.InputTag("fixedGridRhoFastjetAllTmp")
srcRho = cms.InputTag("hltFixedGridRhoFastjetAllTmp")
)
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
maxRecoveredHcalCells = cms.uint32(9999999),
minSeed = cms.uint32(14327),
rParam = cms.double(0.8),
src = cms.InputTag("particleFlowTmp"),
src = cms.InputTag("hltParticleFlowTmp"),
srcPVs = cms.InputTag(""),
srcWeights = cms.InputTag("hltPFPuppi"),
useDeterministicSeed = cms.bool(True),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import FWCore.ParameterSet.Config as cms

ak4CaloJetsForTrk = cms.EDProducer("FastjetJetProducer",
hltAk4CaloJetsForTrk = cms.EDProducer("FastjetJetProducer",
Active_Area_Repeats = cms.int32(1),
GhostArea = cms.double(0.01),
Ghost_EtaMax = cms.double(5.0),
Expand All @@ -27,7 +27,7 @@
rParam = cms.double(0.4),
radiusPU = cms.double(0.5),
src = cms.InputTag("hltPhase2TowerMakerForAll"),
srcPVs = cms.InputTag("firstStepPrimaryVerticesUnsorted"),
srcPVs = cms.InputTag("hltFirstStepPrimaryVerticesUnsorted"),
useDeterministicSeed = cms.bool(True),
voronoiRfact = cms.double(-0.9)
)
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
calculateSignificance = cms.bool(False),
globalThreshold = cms.double(0.3),
noHF = cms.bool(False),
src = cms.InputTag("towerMaker")
src = cms.InputTag("hltTowerMaker")
)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

hltDeepBLifetimeTagInfosPFPuppiModEta2p4 = cms.EDProducer("CandIPProducer",
candidates = cms.InputTag("particleFlowTmp"),
candidates = cms.InputTag("hltParticleFlowTmp"),
computeGhostTrack = cms.bool(True),
computeProbabilities = cms.bool(True),
ghostTrackPriorDeltaR = cms.double(0.03),
Expand All @@ -15,6 +15,6 @@
minimumNumberOfHits = cms.int32(3),
minimumNumberOfPixelHits = cms.int32(2),
minimumTransverseMomentum = cms.double(1.0),
primaryVertex = cms.InputTag("offlinePrimaryVertices"),
primaryVertex = cms.InputTag("hltOfflinePrimaryVertices"),
useTrackQuality = cms.bool(False)
)
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import FWCore.ParameterSet.Config as cms

hltDeepBLifetimeTagInfosPFPuppi = cms.EDProducer("CandIPProducer",
candidates = cms.InputTag("particleFlowTmp"),
candidates = cms.InputTag("hltParticleFlowTmp"),
computeGhostTrack = cms.bool(True),
computeProbabilities = cms.bool(True),
ghostTrackPriorDeltaR = cms.double(0.03),
Expand All @@ -15,6 +15,6 @@
minimumNumberOfHits = cms.int32(3),
minimumNumberOfPixelHits = cms.int32(2),
minimumTransverseMomentum = cms.double(1.0),
primaryVertex = cms.InputTag("offlinePrimaryVertices"),
primaryVertex = cms.InputTag("hltOfflinePrimaryVertices"),
useTrackQuality = cms.bool(False)
)
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
mightGet = cms.optional.untracked.vstring,
minHits = cms.uint32(8),
minPt = cms.double(1.4),
primaryVertices = cms.InputTag("offlinePrimaryVertices"),
tracks = cms.InputTag("particleFlowTmp"),
primaryVertices = cms.InputTag("hltOfflinePrimaryVertices"),
tracks = cms.InputTag("hltParticleFlowTmp"),
useDirectVertexFitter = cms.bool(True),
useVertexReco = cms.bool(True),
vertexMinAngleCosine = cms.double(0.95),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
fitterTini = cms.double(256),
maxTimeSignificance = cms.double(3.5),
mightGet = cms.optional.untracked.vstring,
primaryVertices = cms.InputTag("offlinePrimaryVertices"),
primaryVertices = cms.InputTag("hltOfflinePrimaryVertices"),
secondaryVertices = cms.InputTag("hltDeepInclusiveSecondaryVerticesPF"),
sigCut = cms.double(5),
trackMinLayers = cms.int32(4),
trackMinPixels = cms.int32(1),
trackMinPt = cms.double(1.4),
tracks = cms.InputTag("particleFlowTmp")
tracks = cms.InputTag("hltParticleFlowTmp")
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import FWCore.ParameterSet.Config as cms

hltEcalBarrelClusterFastTimer = cms.EDProducer("EcalBarrelClusterFastTimer",
ebClusters = cms.InputTag("hltParticleFlowClusterECALUncorrected"),
ebTimeHits = cms.InputTag("hltEcalDetailedTimeRecHit","EcalRecHitsEB"),
ecalDepth = cms.double(7.0),
minEnergyToConsider = cms.double(0.0),
minFractionToConsider = cms.double(0.1),
resolutionModels = cms.VPSet(cms.PSet(
modelName = cms.string('PerfectResolutionModel')
)),
timedVertices = cms.InputTag("hltOfflinePrimaryVertices4D")
)
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import FWCore.ParameterSet.Config as cms

ecalDetailedTimeRecHit = cms.EDProducer("EcalDetailedTimeRecHitProducer",
hltEcalDetailedTimeRecHit = cms.EDProducer("EcalDetailedTimeRecHitProducer",
EBDetailedTimeRecHitCollection = cms.string('EcalRecHitsEB'),
EBRecHitCollection = cms.InputTag("hltEcalRecHit","EcalRecHitsEB"),
EBTimeDigiCollection = cms.InputTag("mix","EBTimeDigi"),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import FWCore.ParameterSet.Config as cms

ecalMultiFitUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer",
hltEcalMultiFitUncalibRecHit = cms.EDProducer("EcalUncalibRecHitProducer",
EBdigiCollection = cms.InputTag("hltEcalDigis","ebDigis"),
EBhitCollection = cms.string('EcalUncalibRecHitsEB'),
EEdigiCollection = cms.InputTag("hltEcalDigis","eeDigis"),
Expand Down
Loading