Merge pull request #49397 from mmusich/mm_make_pixel_gpu_on_demand

Monitoring of Pixel tracking SoAs: partial revert of #49340 and #49237

Author: cmsbuild

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

@@ -90,6 +90,13 @@
 process.load('DQM.SiPixelHeterogeneous.SiPixelHeterogenousDQMHarvesting_cff')
 process.siPixelTrackComparisonHarvesterAlpaka.topFolderName = cms.string('SiPixelHeterogeneous/PixelTrackCompareGPUvsCPU')
 
+#-------------------------------------
+#  User switches for what to monitor
+#-------------------------------------
+doRecHits  = False
+doTracks   = True
+doVertices = True
+
 #-------------------------------------
 #	Some Settings before Finishing up
 #-------------------------------------
@@ -179,12 +186,51 @@
 process.dump = cms.EDAnalyzer("EventContentAnalyzer")
 process.dumpPath = cms.Path(process.dump)
 
+#-------------------------------------
+#  Build the monitoring sequence based on flags
+#-------------------------------------
+monitoring_modules = []
+
+# Mandatory pixel digi error modules
+monitoring_modules.append(process.siPixelPhase1MonitorRawDataASerial)
+monitoring_modules.append(process.siPixelPhase1MonitorRawDataADevice)
+monitoring_modules.append(process.siPixelPhase1CompareDigiErrorsSoAAlpaka)
+
+if doRecHits:
+    monitoring_modules.append(process.siPixelRecHitsSoAMonitorDevice)
+    monitoring_modules.append(process.siPixelRecHitsSoAMonitorSerial)
+    monitoring_modules.append(process.siPixelPhase1CompareRecHits)
+
+if doTracks:
+    monitoring_modules.append(process.siPixelTrackSoAMonitorDevice)
+    monitoring_modules.append(process.siPixelTrackSoAMonitorSerial)
+    monitoring_modules.append(process.siPixelPhase1CompareTracks)
+
+if doVertices:
+    monitoring_modules.append(process.siPixelVertexSoAMonitorDevice)
+    monitoring_modules.append(process.siPixelVertexSoAMonitorSerial)
+    monitoring_modules.append(process.siPixelCompareVertices)
+
+# Always add the comparison harvesting sequence as before
+monitoring_modules.append(process.siPixelPhase1RawDataHarvesterSerial)
+monitoring_modules.append(process.siPixelPhase1RawDataHarvesterDevice)
+
+if doTracks:
+    monitoring_modules.append(process.siPixelTrackComparisonHarvesterAlpaka)
+
+# Now create the path with those modules
+process.tasksPath = cms.Path()
+for mod in monitoring_modules:
+    process.tasksPath *= mod
+
+print(process.tasksPath)
+    
 #-------------------------------------
 #	Pixel DQM Tasks/Clients Sequences Definition
 #-------------------------------------
 
-process.tasksPath = cms.Path(process.monitorpixelSoACompareSourceAlpaka *
-                             process.siPixelHeterogeneousDQMComparisonHarvestingAlpaka)
+#process.tasksPath = cms.Path(process.monitorpixelSoACompareSourceAlpaka *
+#                             process.siPixelHeterogeneousDQMComparisonHarvestingAlpaka)
 
 #-------------------------------------
 #	Paths/Sequences Definitions

DQM/SiPixelHeterogeneous/python/SiPixelHeterogenousDQMHarvesting_cff.py

@@ -28,7 +28,6 @@
 
 phase2_tracker.toReplaceWith(siPixelHeterogeneousDQMComparisonHarvestingAlpaka,_siPixelHeterogeneousDQMComparisonHarvestingAlpakaPhase2)
 
-
 # add the harvester in case of the validation modifier is active
 from Configuration.ProcessModifiers.gpuValidationPixel_cff import gpuValidationPixel
 gpuValidationPixel.toReplaceWith(siPixelHeterogeneousDQMHarvesting,siPixelHeterogeneousDQMComparisonHarvesting)

DQMOffline/Trigger/python/HeterogeneousMonitoringClient_cff.py

@@ -4,4 +4,6 @@
 from DQM.SiPixelHeterogeneous.siPixelTrackComparisonHarvester_cfi import *
 hltSiPixelTrackComparisonHarvester = siPixelTrackComparisonHarvester.clone(topFolderName = 'HLT/HeterogeneousComparisons/PixelTracks')
 
-HLTHeterogeneousMonitoringHarvesting =  cms.Sequence(hltSiPixelTrackComparisonHarvester)
+HLTHeterogeneousMonitoringHarvesting =  cms.Sequence(
+    hltSiPixelTrackComparisonHarvester
+)

DQMOffline/Trigger/python/HeterogeneousMonitoring_cff.py

@@ -97,7 +97,7 @@
 HLTHeterogeneousMonitoringSequence = cms.Sequence(
     hltPfHcalGPUComparisonTask +
     hltSiPixelPhase1CompareDigiErrors +
-    hltSiPixelPhase1CompareRecHits +
+    #hltSiPixelPhase1CompareRecHits +   # waiting a resolution of #49349
     hltSiPixelPhase1CompareTracks +
     hltSiPixelCompareVertices +
     hltEcalMonitorTask +