Skip to content

Commit 0e98d60

Browse files
committed
add harvesting for HLTHeterogeneousMonitoring workflow
1 parent eaef3cd commit 0e98d60

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
13781378
'--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
13791379
},
13801380
harvest = {
1381-
'-s': 'HARVESTING:@ecalOnlyValidation+@ecal'
1381+
'-s': 'HARVESTING:@ecalOnlyValidation+@ecal+@hltGPUvsCPU'
13821382
},
13831383
suffix = 'Patatrack_ECALOnlyAlpaka',
13841384
offset = 0.412,
@@ -1400,7 +1400,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
14001400
'--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
14011401
},
14021402
harvest = {
1403-
'-s': 'HARVESTING:@ecalOnlyValidation+@ecal'
1403+
'-s': 'HARVESTING:@ecalOnlyValidation+@ecal+@hltGPUvsCPU'
14041404
},
14051405
suffix = 'Patatrack_ECALOnlyAlpakaValidation',
14061406
offset = 0.413,
@@ -1419,7 +1419,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
14191419
'--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
14201420
},
14211421
harvest = {
1422-
'-s': 'HARVESTING:@hcalOnlyValidation'
1422+
'-s': 'HARVESTING:@hcalOnlyValidation+@hltGPUvsCPU'
14231423
},
14241424
suffix = 'Patatrack_HCALOnlyAlpaka_Validation',
14251425
offset = 0.422,
@@ -1438,7 +1438,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
14381438
'--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
14391439
},
14401440
harvest = {
1441-
'-s': 'HARVESTING:@hcalOnlyValidation'
1441+
'-s': 'HARVESTING:@hcalOnlyValidation+@hltGPUvsCPU'
14421442
},
14431443
suffix = 'Patatrack_HCALOnlyGPUandAlpaka_Validation',
14441444
offset = 0.423,
@@ -1517,7 +1517,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
15171517
'--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
15181518
},
15191519
harvest = {
1520-
'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
1520+
'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@hltGPUvsCPU'
15211521
},
15221522
suffix = 'Patatrack_PixelOnlyAlpaka',
15231523
offset = 0.402,
@@ -1560,7 +1560,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
15601560
'--customise' : 'HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling',
15611561
},
15621562
harvest = {
1563-
'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM',
1563+
'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@hltGPUvsCPU',
15641564
'--procModifiers': 'alpakaValidation',
15651565
},
15661566
suffix = 'Patatrack_PixelOnlyAlpaka_Validation',
@@ -1599,7 +1599,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
15991599
'--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling'
16001600
},
16011601
harvest = {
1602-
'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
1602+
'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@hltGPUvsCPU'
16031603
},
16041604
suffix = 'Patatrack_PixelOnlyTripletsAlpaka',
16051605
offset = 0.406,
@@ -1620,7 +1620,7 @@ def setup_(self, step, stepName, stepDict, k, properties):
16201620
'--customise' : 'RecoTracker/Configuration/customizePixelTracksForTriplets.customizePixelTracksForTriplets,HeterogeneousCore/AlpakaServices/customiseAlpakaServiceMemoryFilling.customiseAlpakaServiceMemoryFilling'
16211621
},
16221622
harvest = {
1623-
'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM'
1623+
'-s': 'HARVESTING:@trackingOnlyValidation+@pixelTrackingOnlyDQM+@hltGPUvsCPU'
16241624
},
16251625
suffix = 'Patatrack_PixelOnlyTripletsAlpaka_Validation',
16261626
offset = 0.407,

DQMOffline/Configuration/python/DQMOffline_SecondStep_cff.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
from DQMOffline.EGamma.egammaPostProcessing_cff import *
8888
from DQMOffline.HLTScouting.HLTScoutingPostProcessing_cff import *
8989
from DQMOffline.Trigger.DQMOffline_Trigger_Client_cff import *
90+
from DQMOffline.Trigger.HeterogeneousMonitoringClient_cff import *
9091
from DQMOffline.Trigger.DQMOffline_HLT_Client_cff import *
9192
from DQMOffline.RecoB.dqmCollector_cff import *
9293
from DQM.BeamMonitor.AlcaBeamMonitorClient_cff import *
@@ -101,6 +102,9 @@
101102
DQMOffline_SecondStepTrigger = cms.Sequence( triggerOfflineDQMClient *
102103
hltOfflineDQMClient )
103104

105+
# HLT Heterogeneous monitoring sequence
106+
DQMHarvestHLTGPUvsCPU = cms.Sequence( HLTHeterogeneousMonitoringHarvesting )
107+
104108
DQMOffline_SecondStepBTag = cms.Sequence( bTagCollectorSequenceDATA )
105109

106110
DQMOffline_SecondStepBeam = cms.Sequence( alcaBeamMonitorClient )

DQMOffline/Configuration/python/autoDQM.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233

234234
'hltGPUvsCPU' : ['DQMOfflineHLTGPUvsCPU',
235235
'PostDQMOffline',
236-
'dqmHarvesting'],
236+
'DQMHarvestHLTGPUvsCPU'],
237237

238238
'standardDQMExpress': ['DQMOfflineExpress',
239239
'PostDQMOffline',
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import FWCore.ParameterSet.Config as cms
2+
3+
# Tracker
4+
from DQM.SiPixelHeterogeneous.siPixelTrackComparisonHarvester_cfi import *
5+
hltSiPixelTrackComparisonHarvester = siPixelTrackComparisonHarvester.clone(topFolderName = 'HLT/HeterogeneousComparisons/PixelTracks')
6+
7+
HLTHeterogeneousMonitoringHarvesting = cms.Sequence(hltSiPixelTrackComparisonHarvester)

0 commit comments

Comments
 (0)