Merge pull request #46667 from mmusich/mm_fix_hlt_client_HIon_14_1_X

[14.1.X] fix HLT online DQM client to cope with PbPb HLT strip collections

DQM/HLTEvF/python/HLTSiStripMonitoring_cff.py

@@ -178,6 +178,12 @@
     measurementTracker = cms.string( "hltESPMeasurementTracker" )
 )
 
+from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
+pp_on_PbPb_run3.toModify(hltMeasurementTrackerEvent,
+                         stripClusterProducer = cms.string( "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression" ),
+                         pixelClusterProducer = cms.string( "hltSiPixelClustersAfterSplittingPPOnAA" ),
+                         )
+
 #####
 hltESPTrajectoryFitterRK = cms.ESProducer( "KFTrajectoryFitterESProducer",
   appendToDataLabel = cms.string( "" ),
@@ -223,6 +229,9 @@
 hltTrackRefitterForSiStripMonitorTrack.NavigationSchool        = 'navigationSchoolESProducer'
 hltTrackRefitterForSiStripMonitorTrack.src                     = 'hltMergedTracks' # hltIter2Merged
 
+pp_on_PbPb_run3.toModify(hltTrackRefitterForSiStripMonitorTrack,
+                         src = 'hltMergedTracksPPOnAA')
+
 HLTSiStripMonitorTrack.TopFolderName = 'HLT/SiStrip'
 HLTSiStripMonitorTrack.TrackProducer = 'hltTrackRefitterForSiStripMonitorTrack'
 HLTSiStripMonitorTrack.TrackLabel    = ''
@@ -234,6 +243,12 @@
 HLTSiStripMonitorTrack.HistoFlag_On  = False
 HLTSiStripMonitorTrack.TkHistoMap_On = False
 
+pp_on_PbPb_run3.toModify(HLTSiStripMonitorTrack,
+                         Cluster_src = "hltHITrackingSiStripRawToClustersFacilityFullZeroSuppression")
+
+pp_on_PbPb_run3.toModify(HLTSiStripMonitorCluster,
+                         BPTXfilter = dict(l1Algorithms = ['L1_ZeroBias']))
+
 HLTSiStripMonitorClusterAPVgainCalibration = HLTSiStripMonitorCluster.clone()
 from DQM.TrackingMonitorSource.pset4GenericTriggerEventFlag_cfi import *
 #HLTSiStripMonitorClusterAPVgainCalibration.BPTXfilter = genericTriggerEventFlag4fullTrackerAndHLTnoHIPnoOOTdb # HLT_ZeroBias_FirstCollisionAfterAbortGap_*
@@ -261,6 +276,10 @@
 )
 HLTSiStripMonitorClusterAPVgainCalibration.TopFolderName = cms.string('HLT/SiStrip/ZeroBias_FirstCollisionAfterAbortGap')
 
+pp_on_PbPb_run3.toModify(HLTSiStripMonitorClusterAPVgainCalibration,
+                         BPTXfilter = dict(hltPaths = ["HLT_HICentrality30100_FirstCollisionAfterAbortGap_v*"]),
+                         TopFolderName = cms.string('HLT/SiStrip/HLT_HICentrality30100_FirstCollisionAfterAbortGap'))
+
 sistripOnlineMonitorHLTsequence = cms.Sequence(
     hltMeasurementTrackerEvent
     * sistripMonitorHLTsequence # strip cluster monitoring

DQM/Integration/python/clients/hlt_dqm_sourceclient-live_cfg.py

@@ -1,8 +1,12 @@
 import FWCore.ParameterSet.Config as cms
 
 import sys
-from Configuration.Eras.Era_Run3_cff import Run3
-process = cms.Process("DQM", Run3)
+if 'runkey=hi_run' in sys.argv:
+  from Configuration.Eras.Era_Run3_pp_on_PbPb_approxSiStripClusters_cff import Run3_pp_on_PbPb_approxSiStripClusters
+  process = cms.Process("DQM", Run3_pp_on_PbPb_approxSiStripClusters)
+else:
+  from Configuration.Eras.Era_Run3_cff import Run3
+  process = cms.Process("DQM", Run3)
 
 unitTest = False
 if 'unitTest=True' in sys.argv:

DQMOffline/Trigger/python/SiPixel_OfflineMonitoring_TrackResiduals_cff.py

@@ -142,6 +142,10 @@
         VertexCut = cms.untracked.bool(True)
 )
 
+from Configuration.Eras.Modifier_pp_on_PbPb_run3_cff import pp_on_PbPb_run3
+pp_on_PbPb_run3.toModify(hltSiPixelPhase1TrackResidualsAnalyzer,
+                         vertices = 'hltPixelVerticesPPOnAA')
+
 hltSiPixelPhase1TrackResidualsHarvester = DQMEDHarvester("SiPixelPhase1Harvester",
         histograms = hltSiPixelPhase1TrackResidualsConf,
         geometry = hltSiPixelPhase1Geometry