Merge pull request #49340 from mmusich/mm_hlt_gpu_vs_cpu_comparisons_in_offline_dqm

Implement GPU vs CPU comparison for HLT pixel tracking heterogeneous products in patatrack workflows

Author: cmsbuild

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1378,7 +1378,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
     },
     harvest = {
-        '-s': 'HARVESTING:@ecalOnlyValidation+@ecal'
+        '-s': 'HARVESTING:@ecalOnlyValidation+@ecal+@hltGPUvsCPU'
     },
     suffix = 'Patatrack_ECALOnlyAlpaka',
     offset = 0.412,
@@ -1400,7 +1400,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
     },
     harvest = {
-        '-s': 'HARVESTING:@ecalOnlyValidation+@ecal'
+        '-s': 'HARVESTING:@ecalOnlyValidation+@ecal+@hltGPUvsCPU'
     },
     suffix = 'Patatrack_ECALOnlyAlpakaValidation',
     offset = 0.413,
@@ -1419,7 +1419,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
     },
     harvest = {
-        '-s': 'HARVESTING:@hcalOnlyValidation'
+        '-s': 'HARVESTING:@hcalOnlyValidation+@hltGPUvsCPU'
     },
     suffix = 'Patatrack_HCALOnlyAlpaka_Validation',
     offset = 0.422,
@@ -1438,7 +1438,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
     },
     harvest = {
-        '-s': 'HARVESTING:@hcalOnlyValidation'
+        '-s': 'HARVESTING:@hcalOnlyValidation+@hltGPUvsCPU'
     },
     suffix = 'Patatrack_HCALOnlyGPUandAlpaka_Validation',
     offset = 0.423,
@@ -1517,7 +1517,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
     },
     harvest = {
-        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
+        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@hltGPUvsCPU'
     },
     suffix = 'Patatrack_PixelOnlyAlpaka',
     offset = 0.402,
@@ -1560,7 +1560,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
     },
     harvest = {
-        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM',
+        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@hltGPUvsCPU',
         '--procModifiers': 'alpakaValidation',
     },
     suffix = 'Patatrack_PixelOnlyAlpaka_Validation',
@@ -1599,7 +1599,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling'
     },
     harvest = {
-        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
+        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@hltGPUvsCPU'
     },
     suffix = 'Patatrack_PixelOnlyTripletsAlpaka',
     offset = 0.406,
@@ -1620,7 +1620,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
         '--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling'
     },
     harvest = {
-        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
+        '-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@hltGPUvsCPU'
     },
     suffix = 'Patatrack_PixelOnlyTripletsAlpaka_Validation',
     offset = 0.407,

DQM/SiPixelHeterogeneous/plugins/SiPixelCompareRecHits.cc

@@ -223,30 +223,30 @@ void SiPixelCompareRecHits::bookHistograms(DQMStore::IBooker& iBook,
 
   // clang-format off
   //Global
-  hnHits_ = iBook.book2I("nHits", "ReferencevsTarget RecHits per event;#Reference RecHits;#Target RecHits", 200, 0, 5000,200, 0, 5000);
+  hnHits_ = iBook.book2I("nHits", "RecHits per event;#Reference RecHits;#Target RecHits", 200, 0, 5000,200, 0, 5000);
   //Barrel Layer
   for(unsigned int il=0;il<tkGeom_->numberOfLayers(PixelSubdetector::PixelBarrel);il++){
-    hBchargeL_[il] = iBook.book2I(Form("recHitsBLay%dCharge",il+1), Form("ReferencevsTarget RecHits Charge Barrel Layer%d;Reference Charge;Target Charge",il+1), 250, 0, 100000, 250, 0, 100000);
-    hBsizexL_[il] = iBook.book2I(Form("recHitsBLay%dSizex",il+1), Form("ReferencevsTarget RecHits SizeX Barrel Layer%d;Reference SizeX;Target SizeX",il+1), 30, 0, 30, 30, 0, 30);
-    hBsizeyL_[il] = iBook.book2I(Form("recHitsBLay%dSizey",il+1), Form("ReferencevsTarget RecHits SizeY Barrel Layer%d;Reference SizeY;Target SizeY",il+1), 30, 0, 30, 30, 0, 30);
-    hBposxL_[il] = iBook.book2D(Form("recHitsBLay%dPosx",il+1), Form("ReferencevsTarget RecHits x-pos in Barrel Layer%d;Reference pos x;Target pos x",il+1), 200, -5, 5, 200,-5,5);
-    hBposyL_[il] = iBook.book2D(Form("recHitsBLay%dPosy",il+1), Form("ReferencevsTarget RecHits y-pos in Barrel Layer%d;Reference pos y;Target pos y",il+1), 200, -5, 5, 200,-5,5);
+    hBchargeL_[il] = iBook.book2I(Form("recHitsBLay%dCharge",il+1), Form("RecHits Charge Barrel Layer%d;Reference Charge;Target Charge",il+1), 250, 0, 100000, 250, 0, 100000);
+    hBsizexL_[il] = iBook.book2I(Form("recHitsBLay%dSizex",il+1), Form("RecHits SizeX Barrel Layer%d;Reference SizeX;Target SizeX",il+1), 30, 0, 30, 30, 0, 30);
+    hBsizeyL_[il] = iBook.book2I(Form("recHitsBLay%dSizey",il+1), Form("RecHits SizeY Barrel Layer%d;Reference SizeY;Target SizeY",il+1), 30, 0, 30, 30, 0, 30);
+    hBposxL_[il] = iBook.book2D(Form("recHitsBLay%dPosx",il+1), Form("RecHits x-pos in Barrel Layer%d;Reference pos x;Target pos x",il+1), 200, -5, 5, 200,-5,5);
+    hBposyL_[il] = iBook.book2D(Form("recHitsBLay%dPosy",il+1), Form("RecHits y-pos in Barrel Layer%d;Reference pos y;Target pos y",il+1), 200, -5, 5, 200,-5,5);
   }
   //Endcaps
   //Endcaps Disk
   for(int is=0;is<2;is++){
     int sign=is==0? -1:1;
     for(unsigned int id=0;id<tkGeom_->numberOfLayers(PixelSubdetector::PixelEndcap);id++){
-      hFchargeD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dCharge",id*sign+sign), Form("ReferencevsTarget RecHits Charge Endcaps Disk%+d;Reference Charge;Target Charge",id*sign+sign), 250, 0, 100000, 250, 0, 100000);
-      hFsizexD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dSizex",id*sign+sign), Form("ReferencevsTarget RecHits SizeX Endcaps Disk%+d;Reference SizeX;Target SizeX",id*sign+sign), 30, 0, 30, 30, 0, 30);
-      hFsizeyD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dSizey",id*sign+sign), Form("ReferencevsTarget RecHits SizeY Endcaps Disk%+d;Reference SizeY;Target SizeY",id*sign+sign), 30, 0, 30, 30, 0, 30);
-      hFposxD_[is][id] = iBook.book2D(Form("recHitsFDisk%+dPosx",id*sign+sign), Form("ReferencevsTarget RecHits x-pos Endcaps Disk%+d;Reference pos x;Target pos x",id*sign+sign), 200, -5, 5, 200, -5, 5);
-      hFposyD_[is][id] = iBook.book2D(Form("recHitsFDisk%+dPosy",id*sign+sign), Form("ReferencevsTarget RecHits y-pos Endcaps Disk%+d;Reference pos y;Target pos y",id*sign+sign), 200, -5, 5, 200, -5, 5);
+      hFchargeD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dCharge",id*sign+sign), Form("RecHits Charge Endcaps Disk%+d;Reference Charge;Target Charge",id*sign+sign), 250, 0, 100000, 250, 0, 100000);
+      hFsizexD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dSizex",id*sign+sign), Form("RecHits SizeX Endcaps Disk%+d;Reference SizeX;Target SizeX",id*sign+sign), 30, 0, 30, 30, 0, 30);
+      hFsizeyD_[is][id] = iBook.book2I(Form("recHitsFDisk%+dSizey",id*sign+sign), Form("RecHits SizeY Endcaps Disk%+d;Reference SizeY;Target SizeY",id*sign+sign), 30, 0, 30, 30, 0, 30);
+      hFposxD_[is][id] = iBook.book2D(Form("recHitsFDisk%+dPosx",id*sign+sign), Form("RecHits x-pos Endcaps Disk%+d;Reference pos x;Target pos x",id*sign+sign), 200, -5, 5, 200, -5, 5);
+      hFposyD_[is][id] = iBook.book2D(Form("recHitsFDisk%+dPosy",id*sign+sign), Form("RecHits y-pos Endcaps Disk%+d;Reference pos y;Target pos y",id*sign+sign), 200, -5, 5, 200, -5, 5);
     }
   }
   //1D differences
-  hBchargeDiff_ = iBook.book1D("rechitChargeDiffBpix","Charge differnce of rechits in BPix; rechit charge difference (Reference - Target)", 101, -50.5, 50.5);
-  hFchargeDiff_ = iBook.book1D("rechitChargeDiffFpix","Charge differnce of rechits in FPix; rechit charge difference (Reference - Target)", 101, -50.5, 50.5);
+  hBchargeDiff_ = iBook.book1D("rechitChargeDiffBpix","Charge difference of rechits in BPix; rechit charge difference (Reference - Target)", 101, -50.5, 50.5);
+  hFchargeDiff_ = iBook.book1D("rechitChargeDiffFpix","Charge difference of rechits in FPix; rechit charge difference (Reference - Target)", 101, -50.5, 50.5);
   hBsizeXDiff_ = iBook.book1D("rechitsizeXDiffBpix","SizeX difference of rechits in BPix; rechit sizex difference (Reference - Target)", 21, -10.5, 10.5);
   hFsizeXDiff_ = iBook.book1D("rechitsizeXDiffFpix","SizeX difference of rechits in FPix; rechit sizex difference (Reference - Target)", 21, -10.5, 10.5);
   hBsizeYDiff_ = iBook.book1D("rechitsizeYDiffBpix","SizeY difference of rechits in BPix; rechit sizey difference (Reference - Target)", 21, -10.5, 10.5);

DQM/SiPixelHeterogeneous/plugins/SiPixelCompareRecHitsSoA.cc

@@ -222,8 +222,8 @@ void SiPixelCompareRecHitsSoA<T>::bookHistograms(DQMStore::IBooker& iBook,
     }
   }
   //1D differences
-  hBchargeDiff_ = iBook.book1D("rechitChargeDiffBpix","Charge differnce of rechits in BPix; rechit charge difference (CPU - GPU)", 101, -50.5, 50.5);
-  hFchargeDiff_ = iBook.book1D("rechitChargeDiffFpix","Charge differnce of rechits in FPix; rechit charge difference (CPU - GPU)", 101, -50.5, 50.5);
+  hBchargeDiff_ = iBook.book1D("rechitChargeDiffBpix","Charge difference of rechits in BPix; rechit charge difference (CPU - GPU)", 101, -50.5, 50.5);
+  hFchargeDiff_ = iBook.book1D("rechitChargeDiffFpix","Charge difference of rechits in FPix; rechit charge difference (CPU - GPU)", 101, -50.5, 50.5);
   hBsizeXDiff_ = iBook.book1D("rechitsizeXDiffBpix","SizeX difference of rechits in BPix; rechit sizex difference (CPU - GPU)", 21, -10.5, 10.5);
   hFsizeXDiff_ = iBook.book1D("rechitsizeXDiffFpix","SizeX difference of rechits in FPix; rechit sizex difference (CPU - GPU)", 21, -10.5, 10.5);
   hBsizeYDiff_ = iBook.book1D("rechitsizeYDiffBpix","SizeY difference of rechits in BPix; rechit sizey difference (CPU - GPU)", 21, -10.5, 10.5);

DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py

@@ -87,6 +87,7 @@
 from DQMOffline.EGamma.egammaPostProcessing_cff import *
 from DQMOffline.HLTScouting.HLTScoutingPostProcessing_cff import *
 from DQMOffline.Trigger.DQMOffline_Trigger_Client_cff import *
+from DQMOffline.Trigger.HeterogeneousMonitoringClient_cff import *
 from DQMOffline.Trigger.DQMOffline_HLT_Client_cff import *
 from DQMOffline.RecoB.dqmCollector_cff import *
 from DQM.BeamMonitor.AlcaBeamMonitorClient_cff import *
@@ -101,6 +102,9 @@
 DQMOffline_SecondStepTrigger = cms.Sequence( triggerOfflineDQMClient *
 						hltOfflineDQMClient )
 
+# HLT Heterogeneous monitoring sequence
+DQMHarvestHLTGPUvsCPU = cms.Sequence( HLTHeterogeneousMonitoringHarvesting )
+
 DQMOffline_SecondStepBTag = cms.Sequence( bTagCollectorSequenceDATA )
 
 DQMOffline_SecondStepBeam = cms.Sequence( alcaBeamMonitorClient )

DQMOffline/Configuration/python/autoDQM.py

@@ -233,7 +233,7 @@
 
             'hltGPUvsCPU' : ['DQMOfflineHLTGPUvsCPU',
                              'PostDQMOffline',
-                             'dqmHarvesting'],
+                             'DQMHarvestHLTGPUvsCPU'],
 
             'standardDQMExpress': ['DQMOfflineExpress',
                                    'PostDQMOffline',

DQMOffline/Trigger/python/HeterogeneousMonitoringClient_cff.py

@@ -0,0 +1,7 @@
+import FWCore.ParameterSet.Config as cms
+
+# Tracker
+from DQM.SiPixelHeterogeneous.siPixelTrackComparisonHarvester_cfi import *
+hltSiPixelTrackComparisonHarvester = siPixelTrackComparisonHarvester.clone(topFolderName = 'HLT/HeterogeneousComparisons/PixelTracks')
+
+HLTHeterogeneousMonitoringHarvesting =  cms.Sequence(hltSiPixelTrackComparisonHarvester)

DQMOffline/Trigger/python/HeterogeneousMonitoring_cff.py

@@ -28,9 +28,28 @@
 from DQM.SiPixelHeterogeneous.SiPixelHeterogenousDQM_FirstStep_cff import *
 
 hltSiPixelPhase1CompareDigiErrors = siPixelPhase1RawDataErrorComparator.clone(
-    topFolderName = cms.string('HLT/HeterogeneousComparisons/PixelErrors'),
-    pixelErrorSrcGPU = cms.InputTag("hltSiPixelDigiErrors"),
-    pixelErrorSrcCPU = cms.InputTag("hltSiPixelDigiErrorsSerialSync")
+    pixelErrorSrcGPU = 'hltSiPixelDigiErrors',
+    pixelErrorSrcCPU = 'hltSiPixelDigiErrorsSerialSync',
+    topFolderName = 'HLT/HeterogeneousComparisons/PixelErrors'
+)
+
+hltSiPixelPhase1CompareRecHits = siPixelPhase1CompareRecHits.clone(
+    pixelHitsReferenceSoA = 'hltSiPixelRecHitsSoASerialSync',
+    pixelHitsTargetSoA  = 'hltSiPixelRecHitsSoA',
+    topFolderName = 'HLT/HeterogeneousComparisons/PixelRecHits'
+)
+
+hltSiPixelPhase1CompareTracks = siPixelPhase1CompareTracks.clone(
+    pixelTrackReferenceSoA = 'hltPixelTracksSoASerialSync',
+    pixelTrackTargetSoA = 'hltPixelTracksSoA',
+    topFolderName = 'HLT/HeterogeneousComparisons/PixelTracks'
+)
+
+hltSiPixelCompareVertices = siPixelCompareVertices.clone(
+    pixelVertexReferenceSoA = 'hltPixelVerticesSoASerialSync',
+    pixelVertexTargetSoA = 'hltPixelVerticesSoA',
+    beamSpotSrc = 'hltOnlineBeamSpot',
+    topFolderName = 'HLT/HeterogeneousComparisons/PixelVertices'
 )
 
 # Ecal
@@ -76,9 +95,12 @@
 )
 
 HLTHeterogeneousMonitoringSequence = cms.Sequence(
-    hltPfHcalGPUComparisonTask+
-    hltSiPixelPhase1CompareDigiErrors+
-    hltEcalMonitorTask+
+    hltPfHcalGPUComparisonTask +
+    hltSiPixelPhase1CompareDigiErrors +
+    hltSiPixelPhase1CompareRecHits +
+    hltSiPixelPhase1CompareTracks +
+    hltSiPixelCompareVertices +
+    hltEcalMonitorTask +
     hltHcalGPUComparisonTask    
 )