From d13c1634f69c0614f18f295f713b033ab3b192ee Mon Sep 17 00:00:00 2001 From: mmusich Date: Fri, 27 Oct 2023 18:10:11 +0200 Subject: [PATCH] customize HLT DQM vs offline validation for Run3 PbPb --- .../EventContent/python/EventContent_cff.py | 14 ++++++++++++++ .../Trigger/python/PrimaryVertexMonitoring_cff.py | 12 ++++++++++++ .../SiPixel_OfflineMonitoring_Cluster_cff.py | 5 +++++ .../SiPixel_OfflineMonitoring_TrackCluster_cff.py | 4 ++++ .../python/SiPixel_OfflineMonitoring_cff.py | 11 ++++++++++- .../python/SiStrip_OfflineMonitoring_cff.py | 14 ++++++++++++++ .../Trigger/python/TrackToTrackMonitoring_cff.py | 11 +++++++++++ .../python/TrackingMonitoring_Client_cff.py | 8 ++++++-- .../Trigger/python/TrackingMonitoring_cff.py | 14 +++++++++++++- 9 files changed, 89 insertions(+), 4 deletions(-) diff --git a/Configuration/EventContent/python/EventContent_cff.py b/Configuration/EventContent/python/EventContent_cff.py index ffa3db8c7d19b..b26061c9cb7d3 100644 --- a/Configuration/EventContent/python/EventContent_cff.py +++ b/Configuration/EventContent/python/EventContent_cff.py @@ -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 * @@ -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, + 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_*_*', diff --git a/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py b/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py index a6d008906f177..f6354bad83460 100644 --- a/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py +++ b/DQMOffline/Trigger/python/PrimaryVertexMonitoring_cff.py @@ -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") @@ -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", diff --git a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Cluster_cff.py b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Cluster_cff.py index 5846bf38d33f4..006c01eb02637 100644 --- a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Cluster_cff.py +++ b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_Cluster_cff.py @@ -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 diff --git a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py index 2b49d0a9a5034..57c5d46f19a28 100644 --- a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py +++ b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackCluster_cff.py @@ -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 diff --git a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py index 709fe6f77318d..ecd04eb15e582 100644 --- a/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py +++ b/DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_cff.py @@ -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) -) +) diff --git a/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py b/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py index 35c9ed9776c9f..56e26a6a85787 100644 --- a/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py +++ b/DQMOffline/Trigger/python/SiStrip_OfflineMonitoring_cff.py @@ -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) @@ -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', @@ -154,6 +164,10 @@ TopFolderName = 'HLT/SiStrip', Mod_On = False ) + +pp_on_PbPb_run3.toModify(HLTSiStripMonitorTrack, + Cluster_src = 'hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression') + sistripMonitorHLTsequence = cms.Sequence( HLTSiStripMonitorCluster * hltTrackRefitterForSiStripMonitorTrack diff --git a/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py b/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py index 19376a3ea0622..d265f2fd193b5 100644 --- a/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py +++ b/DQMOffline/Trigger/python/TrackToTrackMonitoring_cff.py @@ -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"), @@ -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"), diff --git a/DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py b/DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py index 0ff5d95b4f6e4..a147c37bc7039 100644 --- a/DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py +++ b/DQMOffline/Trigger/python/TrackingMonitoring_Client_cff.py @@ -27,8 +27,6 @@ trackingForElectronsEffFromHitPatternHLT ) - - TrackToTrackEfficiencies = DQMEDHarvester("DQMGenericClient", subDirs = cms.untracked.vstring( "HLT/Tracking/ValidationWRTOffline/hltMergedWrtHighPurity", @@ -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 ) diff --git a/DQMOffline/Trigger/python/TrackingMonitoring_cff.py b/DQMOffline/Trigger/python/TrackingMonitoring_cff.py index 8402732219d5e..ba2e7078c6b5e 100644 --- a/DQMOffline/Trigger/python/TrackingMonitoring_cff.py +++ b/DQMOffline/Trigger/python/TrackingMonitoring_cff.py @@ -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', @@ -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")) @@ -148,6 +156,10 @@ doEffFromHitPatternVsLUMI = False ) +pp_on_PbPb_run3.toModify(doubletRecoveryHPTracksMonitoringHLT, + TrackProducer = 'hltDoubletRecoveryPFlowTrackSelectionHighPurityPPOnAA', + allTrackProducer = 'hltDoubletRecoveryPFlowTrackSelectionHighPurityPPOnAA') + ############ #### EGM tracks # GSF: hltEgammaGsfTracks