Adding Alpaka DQM to HLT

Author: AdrianoDee

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -1061,8 +1061,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
 upgradeWFs['PatatrackECALOnlyAlpaka'] = PatatrackWorkflow(
     digi = {
         # customize the ECAL Local Reco part of the HLT menu for Alpaka
-        '--procModifiers': 'alpaka',
-        '--customise' : 'HLTrigger/Configuration/customizeHLTforAlpaka.customizeHLTforAlpakaEcalLocalReco'
+        '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka 
     },
     reco = {
         '-s': 'RAW2DIGI:RawToDigi_ecalOnly,RECO:reconstruction_ecalOnly,VALIDATION:@ecalOnlyValidation,DQM:@ecalOnly',
@@ -1540,8 +1539,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
 
 upgradeWFs['PatatrackPixelOnlyAlpaka'] = PatatrackWorkflow(
     digi = {
-        '--procModifiers': 'alpaka',
-        '--customise' : 'HLTrigger/Configuration/customizeHLTforAlpaka.customizeHLTforAlpakaPixelReco'
+        '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka 
     },
     reco = {
         '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,VALIDATION:@pixelTrackingOnlyValidation,DQM:@pixelTrackingOnlyDQM',
@@ -1556,8 +1554,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
 
 upgradeWFs['PatatrackPixelOnlyAlpakaValidation'] = PatatrackWorkflow(
     digi = {
-        '--procModifiers': 'alpaka',
-        '--customise' : 'HLTrigger/Configuration/customizeHLTforAlpaka.customizeHLTforAlpakaPixelReco'
+        '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka 
     },
     reco = {
         '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly,VALIDATION:@pixelTrackingOnlyValidation,DQM:@pixelTrackingOnlyDQM',
@@ -1572,8 +1569,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
 
 upgradeWFs['PatatrackPixelOnlyAlpakaProfiling'] = PatatrackWorkflow(
     digi = {
-        '--procModifiers': 'alpaka',
-        '--customise' : 'HLTrigger/Configuration/customizeHLTforAlpaka.customizeHLTforAlpakaPixelReco'
+        '--procModifiers': 'alpaka', # alpaka modifier activates customiseHLTForAlpaka 
     },
     reco = {
         '-s': 'RAW2DIGI:RawToDigi_pixelOnly,RECO:reconstruction_pixelTrackingOnly',

HLTrigger/Configuration/python/customizeHLTforAlpaka.py

@@ -2,7 +2,6 @@
 
 
 ## Pixel HLT in Alpaka
-
 def customizeHLTforDQMGPUvsCPUPixel(process):
     '''Ad-hoc changes to test HLT config containing only DQM_PixelReconstruction_v and DQMGPUvsCPU stream
        only up to the Pixel Local Reconstruction
@@ -56,14 +55,14 @@ def customizeHLTforDQMGPUvsCPUPixel(process):
 
     # PixelRecHits: monitor of GPU product (Alpaka backend: '')
     process.hltPixelRecHitsSoAMonitorGPU = cms.EDProducer('SiPixelPhase1MonitorRecHitsSoAAlpaka',
-        pixelHitsSrc = cms.InputTag( 'hltSiPixelRecHits' ),
+        pixelHitsSrc = cms.InputTag( 'hltSiPixelRecHitsSoA' ),
         TopFolderName = cms.string( 'SiPixelHeterogeneous/PixelRecHitsGPU' )
     )
 
     # PixelRecHits: 'GPUvsCPU' comparisons
     process.hltPixelRecHitsSoACompareGPUvsCPU = cms.EDProducer('SiPixelPhase1CompareRecHitsSoAAlpaka',
-        pixelHitsSrcCPU = cms.InputTag( 'hltSiPixelRecHitsCPUSerial' ),
-        pixelHitsSrcGPU = cms.InputTag( 'hltSiPixelRecHits' ),
+        pixelHitsSrcHost = cms.InputTag( 'hltSiPixelRecHitsCPUSerial' ),
+        pixelHitsSrcDevice = cms.InputTag( 'hltSiPixelRecHitsSoA' ),
         topFolderName = cms.string( 'SiPixelHeterogeneous/PixelRecHitsCompareGPUvsCPU' ),
         minD2cut = cms.double( 1.0E-4 )
     )
@@ -79,7 +78,7 @@ def customizeHLTforDQMGPUvsCPUPixel(process):
     process.hltPixelTracksSoAMonitorGPU = cms.EDProducer("SiPixelPhase1MonitorTrackSoAAlpaka",
         mightGet = cms.optional.untracked.vstring,
         minQuality = cms.string('loose'),
-        pixelTrackSrc = cms.InputTag('hltPixelTracks'),
+        pixelTrackSrc = cms.InputTag('hltPixelTracksSoA'),
         topFolderName = cms.string('SiPixelHeterogeneous/PixelTrackGPU'),
         useQualityCut = cms.bool(True)
     )
@@ -88,8 +87,8 @@ def customizeHLTforDQMGPUvsCPUPixel(process):
         deltaR2cut = cms.double(0.04),
         mightGet = cms.optional.untracked.vstring,
         minQuality = cms.string('loose'),
-        pixelTrackSrcCPU = cms.InputTag("hltPixelTracksCPUSerial"),
-        pixelTrackSrcGPU = cms.InputTag("hltPixelTracksSoA"),
+        pixelTrackSrcHost = cms.InputTag("hltPixelTracksCPUSerial"),
+        pixelTrackSrcDevice = cms.InputTag("hltPixelTracksSoA"),
         topFolderName = cms.string('SiPixelHeterogeneous/PixelTrackCompareGPUvsCPU'),
         useQualityCut = cms.bool(True)
     )
@@ -112,8 +111,8 @@ def customizeHLTforDQMGPUvsCPUPixel(process):
         beamSpotSrc = cms.InputTag("hltOnlineBeamSpot"),
         dzCut = cms.double(1),
         mightGet = cms.optional.untracked.vstring,
-        pixelVertexSrcCPU = cms.InputTag("hltPixelVerticesCPUSerial"),
-        pixelVertexSrcGPU = cms.InputTag("hltPixelVerticesSoA"),
+        pixelVertexSrcHost = cms.InputTag("hltPixelVerticesCPUSerial"),
+        pixelVertexSrcDevice = cms.InputTag("hltPixelVerticesSoA"),
         topFolderName = cms.string('SiPixelHeterogeneous/PixelVertexCompareGPUvsCPU')
     )
 
@@ -463,6 +462,7 @@ def customizeHLTforAlpakaPixelRecoVertexing(process):
         process.HLTRecoPixelTracksTask,
         process.hltPixelVerticesSoA,
         process.hltPixelVertices,
+        process.hltTrimmedPixelVertices 
     )
 
     process.HLTRecopixelvertexingCPUSerialTask = cms.ConditionalTask(
@@ -540,7 +540,7 @@ def customizeHLTforAlpakaPixelReco(process):
     process = customizeHLTforAlpakaPixelRecoLocal(process)
     process = customizeHLTforAlpakaPixelRecoTracking(process)
     process = customizeHLTforAlpakaPixelRecoVertexing(process)
-    
+    process = customizeHLTforDQMGPUvsCPUPixel(process)    
     process = customizeHLTforAlpakaPixelRecoTheRest(process)
 
     return process

HLTrigger/Configuration/python/customizeHLTforCMSSW.py

@@ -270,16 +270,17 @@ def customizeHLTfor43774(process):
 
     return process
 
-# from Configuration.ProcessModifiers.alpaka_cff import alpaka
-# from HLTTrigger.Configuration.customizeHLTForAlpaka import customizeHLTforAlpaka
-
-# modifyHLTForAlpaka_ = alpaka.makeProcessModifier(customizeHLTforAlpaka)
-
 # CMSSW version specific customizations
 def customizeHLTforCMSSW(process, menuType="GRun"):
 
     process = customiseForOffline(process)
 
+    # Alpaka HLT
+    from Configuration.ProcessModifiers.alpaka_cff import alpaka 
+    from Configuration.Eras.Modifier_run3_common_cff import run3_common
+    from HLTrigger.Configuration.customizeHLTforAlpaka import customizeHLTforAlpaka
+    (alpaka & run3_common).makeProcessModifier(customizeHLTforAlpaka).apply(process)
+
     # add call to action function in proper order: newest last!
     # process = customiseFor12718(process)