Skip to content

customize HLT offline DQM for Run3 PbPb and introduce HI 2023A relval workflow (with reHLT) #43141

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

Merged
cmsbuild merged 2 commits into from
Nov 9, 2023
Merged

customize HLT offline DQM for Run3 PbPb and introduce HI 2023A relval workflow (with reHLT) #43141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d13c163
customize HLT DQM vs offline validation for Run3 PbPb
mmusich Oct 27, 2023
4c13db6
Introduce wf 142.0
mmusich Oct 28, 2023
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
14 changes: 14 additions & 0 deletions Configuration/EventContent/python/EventContent_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,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.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
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 @@ -640,6 +641,19 @@ def SwapKeepAndDrop(l):
FEVTDEBUGHLTEventContent.outputCommands.append('keep *_*_MergedTrackTruth_*')
FEVTDEBUGHLTEventContent.outputCommands.append('keep *_*_StripDigiSimLink_*')
FEVTDEBUGHLTEventContent.outputCommands.append('keep *_*_PixelDigiSimLink_*')

pp_on_PbPb_run3.toModify(FEVTDEBUGHLTEventContent,
Copy link
Contributor

@makortel makortel Oct 30, 2023

Choose a reason for hiding this comment

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

I'm wondering if it would make sense to customize

cmssw/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py

Line 219 in 994bf20

HLTDebugFEVT = cms.PSet(

instead?

Copy link
Contributor Author

@mmusich mmusich Oct 30, 2023

Choose a reason for hiding this comment

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

No, because that implies a charge in the confdb menu and I don't think we want this at this point (perhaps later)

Copy link
Contributor Author

@mmusich mmusich Nov 2, 2023

Choose a reason for hiding this comment

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

I'm wondering if it would make sense to customize
cmssw/HLTrigger/Configuration/python/HLTrigger_EventContent_cff.py

For the record (while a bit inelegant) this was taken care in the development combined table at https://its.cern.ch/jira/browse/CMSHLT-2964. This should not stop integration of these changes though, as the ad-hoc customization can be removed once the HLT menu is updated in the release.

Copy link
Contributor Author

@mmusich mmusich Nov 16, 2023

Choose a reason for hiding this comment

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

this has been taken care of by #43300 (and corresponding backports)

outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
'keep *_hltMergedTracksPPOnAA_*_*',
'keep *_hltVerticesPFFilterPPOnAA_*_*',
'keep *_hltDoubletRecoveryPFlowTrackSelectionHighPurityPPOnAA_*_*',
'keep *_hltPixelTracksPPOnAA_*_*',
'keep *_hltPixelVerticesPPOnAA_*_*',
'keep *_hltTrimmedPixelVerticesPPOnAA_*_*',
'keep *_hltSiPixelClustersAfterSplittingPPOnAA_*_*',
'keep *_hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression_*_*'
])

approxSiStripClusters.toModify(FEVTDEBUGHLTEventContent,
outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
'keep *_hltSiStripClusters2ApproxClusters_*_*',
Expand Down
3 changes: 3 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_standard.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,6 +568,9 @@
workflows[141.008511] = ['Run3-2023_JetMET2023B_RecoECALOnlyCPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_ECALOnlyCPU','HARVESTRUN3_ECALOnly']]
workflows[141.008521] = ['Run3-2023_JetMET2023B_RecoHCALOnlyCPU',['RunJetMET2023B','HLTDR3_2023','RECODR3_reHLT_HCALOnlyCPU','HARVESTRUN3_HCALOnly']]

### run3-2023 (2023 HI data RawPrime with re-HLT)
workflows[142.0] = ['',['RunHIPhysicsRawPrime2023A','HLTDR3_HI2023ARawprime','RECOHIRUN3_reHLT_2023','HARVESTRUN3_HI2023A']]

### fastsim ###
workflows[5.1] = ['TTbarFS', ['TTbarFS','HARVESTFS']]
workflows[5.2] = ['SingleMuPt10FS', ['SingleMuPt10FS','HARVESTFS']]
Expand Down
14 changes: 14 additions & 0 deletions Configuration/PyReleaseValidation/python/relval_steps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,9 @@
steps['RunMuonEG2023D']={'INPUT':InputInfo(dataSet='/MuonEG/Run2023D-v1/RAW',label='2023D',events=100000,location='STD', ls=Run2023D)}
steps['RunParkingDoubleMuonLowMass2023D']={'INPUT':InputInfo(dataSet='/ParkingDoubleMuonLowMass0/Run2023D-v1/RAW',label='2023D',events=100000,location='STD', ls=Run2023D)}

RunHI2023={375491: [[100, 100]]}
steps['RunHIPhysicsRawPrime2023A']={'INPUT':InputInfo(dataSet='/HIPhysicsRawPrime0/HIRun2023A-v1/RAW',label='HI2023A',events=100000,location='STD', ls=RunHI2023)}

# Highstat HLTPhysics
Run2015DHS=selectedLS([258712,258713,258714,258741,258742,258745,258749,258750,259626,259637,259683,259685,259686,259721,259809,259810,259818,259820,259821,259822,259862,259890,259891])
steps['RunHLTPhy2015DHS']={'INPUT':InputInfo(dataSet='/HLTPhysics/Run2015D-v1/RAW',label='2015DHS',events=100000,location='STD', ls=Run2015DHS)}
Expand Down Expand Up @@ -2075,6 +2078,12 @@ def lhegensim2018ml(fragment,howMuch):

steps['HLTDR3_2023B']=merge( [ {'-s':'L1REPACK:Full,HLT:@%s'%hltKey2023,},{'--conditions':'auto:run3_hlt_relval'},{'--era' : 'Run3'},steps['HLTD'] ] )

steps['HLTDR3_HI2023ARawprime']=merge([{'-s':'L1REPACK:Full,HLT:HIon'},
{'--conditions':'auto:run3_hlt_HIon'},
{'--era' : 'Run3_pp_on_PbPb_approxSiStripClusters_2023'},
{'--customise' : 'HLTrigger/Configuration/CustomConfigs.customiseL1THLTforHIonRepackedRAWPrime'},
steps['HLTD']])

# special setting for lumi section boundary crossing in RunEGamma2018Dml
steps['HLTDR2_2018ml']=merge( [ {'--customise_commands':'"process.source.skipEvents=cms.untracked.uint32(7000)"'},steps['HLTDR2_2018'] ] )

Expand Down Expand Up @@ -2936,6 +2945,8 @@ def gen2023HiMix(fragment,howMuch):
steps['RECONANORUN3_ZB_reHLT_2023']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,NANO,DQM:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['RECONANORUN3_reHLT_2023']])
steps['RECOCOSMRUN3_reHLT_2023']=merge([{'--scenario':'cosmics','-s':'RAW2DIGI,L1Reco,RECO,DQM','--datatier':'RECO,DQMIO','--eventcontent':'RECO,DQM'},steps['RECONANORUN3_reHLT_2023']])

steps['RECOHIRUN3_reHLT_2023']=merge([{'-s':'RAW2DIGI,L1Reco,RECO,PAT,DQM:@standardDQM','--datatier':'RECO,MINIAOD,DQMIO','--eventcontent':'RECO,MINIAOD,DQM','--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023','--conditions':'auto:run3_data_HIon'},steps['RECODR3_reHLT_2023']])

# patatrack validation in data
steps['RecoData_Patatrack_AllGPU_Validation_2023'] = merge([{'-s':'RAW2DIGI:RawToDigi_pixelOnly+RawToDigi_ecalOnly+RawToDigi_hcalOnly,RECO:reconstruction_pixelTrackingOnly+reconstruction_ecalOnly+reconstruction_hcalOnly,DQM:@pixelTrackingOnlyDQM+@ecalOnly+@hcalOnly+@hcal2Only',
'--conditions':'auto:run3_data_prompt',
Expand Down Expand Up @@ -3613,6 +3624,9 @@ def gen2023HiMix(fragment,howMuch):
steps['HARVESTRUN3_COS_2022']=merge([{'--data':'', '--scenario':'cosmics', '--era':'Run3', '-s':'HARVESTING:dqmHarvesting'},steps['HARVESTDRUN3']])
steps['HARVESTRUN3_2023']=merge([{'--era':'Run3_2023', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']])
steps['HARVESTRUN3_2023B']=merge([{'--era':'Run3', '-s':'HARVESTING:@standardDQM+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']])

steps['HARVESTRUN3_HI2023A']=merge([{'--era':'Run3_pp_on_PbPb_approxSiStripClusters_2023', '-s':'HARVESTING:@standardDQM+@miniAODDQM'},steps['HARVESTRUN3_2022']])

steps['HARVESTRUN3_ZB_2023B']=merge([{'--era':'Run3', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']])
steps['HARVESTRUN3_ZB_2023']=merge([{'--era':'Run3_2023', '-s':'HARVESTING:@rerecoZeroBias+@miniAODDQM+@nanoAODDQM'},steps['HARVESTRUN3_2022']])
steps['HARVESTRUN3_COS_2023']=merge([{'--scenario':'cosmics', '--era':'Run3_2023', '-s':'HARVESTING:dqmHarvesting'},steps['HARVESTRUN3_2022']])
Expand Down
12 changes: 12 additions & 0 deletions DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
useHPforAlignmentPlots = False
)

from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify(hltPixelVerticesMonitoring,
vertexLabel = "hltPixelVerticesPPOnAA")

phase2_tracker.toModify(hltPixelVerticesMonitoring,
vertexLabel = "hltPhase2PixelVertices")

Expand All @@ -27,11 +31,19 @@
ndof = 1,
useHPforAlignmentPlots = False
)

pp_on_PbPb_run3.toModify(hltTrimmedPixelVerticesMonitoring,
vertexLabel = "hltTrimmedPixelVerticesPPOnAA")

hltVerticesPFFilterMonitoring = hltVerticesMonitoring.clone(
TopFolderName = "HLT/Vertexing/hltVerticesPFFilter",
vertexLabel = "hltVerticesPFFilter",
useHPforAlignmentPlots = False
)

pp_on_PbPb_run3.toModify(hltVerticesPFFilterMonitoring,
vertexLabel = cms.InputTag("hltVerticesPFFilterPPOnAA"))

hltVerticesL3PFBjetsMonitoring = hltVerticesMonitoring.clone(
TopFolderName = "HLT/Vertexing/hltVerticesL3PFBjets",
vertexLabel = "hltVerticesL3PFBjets",
Expand Down
5 changes: 5 additions & 0 deletions DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Cluster_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,11 @@
triggerflag = hltSiPixelPhase1ClustersTriggers,
)

from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify(hltSiPixelPhase1ClustersAnalyzer,
pixelSrc = "hltSiPixelClustersAfterSplittingPPOnAA",
stripSrc = "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression")

hltSiPixelPhase1ClustersHarvester = DQMEDHarvester("SiPixelPhase1Harvester",
histograms = hltSiPixelPhase1ClustersConf,
geometry = hltSiPixelPhase1Geometry
Expand Down
4 changes: 4 additions & 0 deletions DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,10 @@
geometry = hltSiPixelPhase1Geometry
)

from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify(hltSiPixelPhase1TrackClustersAnalyzer,
clusters = "hltSiPixelClustersAfterSplittingPPOnAA")

hltSiPixelPhase1TrackClustersHarvester = DQMEDHarvester("SiPixelPhase1Harvester",
histograms = hltSiPixelPhase1TrackClustersConf,
geometry = hltSiPixelPhase1Geometry
Expand Down
11 changes: 10 additions & 1 deletion DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@
from RecoLocalTracker.SiPixelRecHits.SiPixelTemplateStoreESProducer_cfi import *

hltSiPixelClusterShapeCache = siPixelClusterShapeCache.clone(src = 'hltSiPixelClusters')

from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify(hltSiPixelClusterShapeCache,
src = "hltSiPixelClustersAfterSplittingPPOnAA")

hltrefittedForPixelDQM = refittedForPixelDQM.clone(src ='hltMergedTracks',
TTRHBuilder = 'WithTrackAngle') # no templates at HLT

pp_on_PbPb_run3.toModify(hltrefittedForPixelDQM,
src ='hltMergedTracksPPOnAA')

sipixelMonitorHLTsequence = cms.Sequence(
hltSiPixelClusterShapeCache
+ hltSiPixelPhase1ClustersAnalyzer
+ hltrefittedForPixelDQM
+ hltSiPixelPhase1TrackClustersAnalyzer,
cms.Task(SiPixelTemplateStoreESProducer)
)
)
14 changes: 14 additions & 0 deletions DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
ClusterHisto = True,
Mod_On = False
)

from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify(HLTSiStripMonitorCluster,
ClusterProducerStrip = "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression",
ClusterProducerPix = "hltSiPixelClustersAfterSplittingPPOnAA")

HLTSiStripMonitorCluster.TH1TotalNumberOfClusters.subdetswitchon = cms.bool(True)
HLTSiStripMonitorCluster.TProfClustersApvCycle.subdetswitchon = cms.bool(False)
HLTSiStripMonitorCluster.TProfTotalNumberOfClusters.subdetswitchon = cms.bool(True)
Expand Down Expand Up @@ -144,6 +150,10 @@
#TTRHBuilder = 'hltESPTTRHBuilderAngleAndTemplate',
TTRHBuilder = 'hltESPTTRHBWithTrackAngle'
)

pp_on_PbPb_run3.toModify(hltTrackRefitterForSiStripMonitorTrack,
src = 'hltMergedTracksPPOnAA')

import DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi
HLTSiStripMonitorTrack = DQM.SiStripMonitorTrack.SiStripMonitorTrack_cfi.SiStripMonitorTrack.clone(
TrackProducer = 'hltTrackRefitterForSiStripMonitorTrack',
Expand All @@ -154,6 +164,10 @@
TopFolderName = 'HLT/SiStrip',
Mod_On = False
)

pp_on_PbPb_run3.toModify(HLTSiStripMonitorTrack,
Cluster_src = 'hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression')

sistripMonitorHLTsequence = cms.Sequence(
HLTSiStripMonitorCluster
* hltTrackRefitterForSiStripMonitorTrack
Expand Down
11 changes: 11 additions & 0 deletions DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
monitoredPrimaryVertices = "hltVerticesPFSelector"
)

from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify(hltMerged2highPurity,
topDirName = "HLT/Tracking/ValidationWRTOffline/hltMergedPPonAAWrtHighPurity",
monitoredTrack = "hltMergedTracksPPOnAA",
monitoredPrimaryVertices = "hltVerticesPFFilterPPOnAA")

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(hltMerged2highPurity,
monitoredTrack = cms.InputTag("generalTracks","","HLT"),
Expand All @@ -38,6 +44,11 @@
monitoredPrimaryVertices = "hltVerticesPFSelector"
)

pp_on_PbPb_run3.toModify(hltMerged2highPurityPV,
topDirName = "HLT/Tracking/ValidationWRTOffline/hltMergedPPonAAWrtHighPurityPV",
monitoredTrack = "hltMergedTracksPPOnAA",
monitoredPrimaryVertices = "hltVerticesPFFilterPPOnAA")

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(hltMerged2highPurityPV,
monitoredTrack = cms.InputTag("generalTracks","","HLT"),
Expand Down
8 changes: 6 additions & 2 deletions DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@
trackingForElectronsEffFromHitPatternHLT
)



TrackToTrackEfficiencies = DQMEDHarvester("DQMGenericClient",
subDirs = cms.untracked.vstring(
"HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurity",
Expand Down Expand Up @@ -65,6 +63,12 @@
),
)

from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify(TrackToTrackEfficiencies,
subDirs = [
"HLT/Tracking/ValidationWRTOffline/hltMergedPPonAAWrtHighPurity",
"HLT/Tracking/ValidationWRTOffline/hltMergedPPonAAWrtHighPurityPV"])

trackEfficiencyMonitoringClientHLT = cms.Sequence(
TrackToTrackEfficiencies
)
Expand Down
14 changes: 13 additions & 1 deletion DQMOffline/Trigger/python/TrackingMonitoring_cff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
doEffFromHitPatternVsLUMI = False
)

from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
pp_on_PbPb_run3.toModify(pixelTracksMonitoringHLT,
TrackProducer = 'hltPixelTracksPPOnAA',
allTrackProducer = 'hltPixelTracksPPOnAA')

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
phase2_tracker.toModify(pixelTracksMonitoringHLT,
TrackProducer = 'hltPhase2PixelTracks',
Expand Down Expand Up @@ -101,7 +106,10 @@
doSIPPlots = cms.bool(True)
)

from Configuration.Eras.Modifier_phase2_tracker_cff import phase2_tracker
pp_on_PbPb_run3.toModify(iterHLTTracksMonitoringHLT,
TrackProducer = 'hltMergedTracksPPOnAA',
allTrackProducer = 'hltMergedTracksPPOnAA')

phase2_tracker.toModify(iterHLTTracksMonitoringHLT,
TrackProducer = cms.InputTag("generalTracks","","HLT"),
allTrackProducer = cms.InputTag("generalTracks","","HLT"))
Expand Down Expand Up @@ -148,6 +156,10 @@
doEffFromHitPatternVsLUMI = False
)

pp_on_PbPb_run3.toModify(doubletRecoveryHPTracksMonitoringHLT,
TrackProducer = 'hltDoubletRecoveryPFlowTrackSelectionHighPurityPPOnAA',
allTrackProducer = 'hltDoubletRecoveryPFlowTrackSelectionHighPurityPPOnAA')

############
#### EGM tracks
# GSF: hltEgammaGsfTracks
Expand Down