Addition of HLT workflows for testing LST on CPU vs. GPU and updates to the offline corresponding workflow

Author: VourMa

Configuration/EventContent/python/EventContent_cff.py

@@ -281,7 +281,9 @@ def SwapKeepAndDrop(l):
 from Configuration.Eras.Modifier_phase2_timing_layer_cff import phase2_timing_layer
 from Configuration.Eras.Modifier_run2_GEM_2017_cff import run2_GEM_2017
 from Configuration.Eras.Modifier_run3_GEM_cff import run3_GEM
+from Configuration.ProcessModifiers.alpakaValidationLST_cff import alpakaValidationLST
 from Configuration.ProcessModifiers.pp_on_AA_cff import pp_on_AA
+from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
 from RecoLocalFastTime.Configuration.RecoLocalFastTime_EventContent_cff import *
 from RecoMTD.Configuration.RecoMTD_EventContent_cff import *
 
@@ -718,6 +720,11 @@ def SwapKeepAndDrop(l):
                             'keep *_hltInitialStepTracksT4T5TCLST_*_*',
                             'keep *_hltOfflinePrimaryVertices_*_*',
                         ])
+(trackingLST & alpakaValidationLST).toModify(FEVTDEBUGHLTEventContent,
+    outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[
+         'keep *_hltInitialStepTracks_*_*',
+         'keep *_hltInitialStepTracksSerialSync_*_*',
+    ])
 
 phase2_common.toModify(FEVTDEBUGHLTEventContent,
                        outputCommands = FEVTDEBUGHLTEventContent.outputCommands+[

Configuration/ProcessModifiers/python/alpakaValidationLST_cff.py

@@ -0,0 +1,5 @@
+import FWCore.ParameterSet.Config as cms
+
+# This modifier performs the host/device validation for the LST algorithm
+alpakaValidationLST = cms.Modifier()
+

Configuration/ProcessModifiers/python/alpakaValidation_cff.py

@@ -2,12 +2,14 @@
 
 from Configuration.ProcessModifiers.alpaka_cff import *
 from Configuration.ProcessModifiers.alpakaValidationEcal_cff import *
+from Configuration.ProcessModifiers.alpakaValidationLST_cff import *
 from Configuration.ProcessModifiers.alpakaValidationPixel_cff import *
 
 # This modifier chain is for turning on DQM modules used for alpaka device/host validation
 
 alpakaValidation =  cms.ModifierChain(
     alpaka,
     alpakaValidationEcal,
+    alpakaValidationLST,
     alpakaValidationPixel
 )

Configuration/PyReleaseValidation/README.md

@@ -53,20 +53,23 @@ The offsets currently in use are:
 * 0.702: trackingMkFit modifier for Phase-2 (initialStep only)
 * 0.703: LST tracking (Phase-2 only), initialStep+HighPtTripletStep only, on CPU
 * 0.704: LST tracking (Phase-2 only), initialStep+HighPtTripletStep only, on GPU (if available)
+* 0.7041: LST tracking (Phase-2 only), initialStep+HighPtTripletStep only, on GPU (if available), CPU vs. GPU
 * 0.75: HLT phase-2 timing menu
 * 0.7501: HLT phase-2 tracking-only menu
 * 0.751: HLT phase-2 timing menu Alpaka variant
 * 0.7511: HLT phase-2 timing menu, with PixelTracks CA Extension
 * 0.752: HLT phase-2 timing menu ticl_v5 variant
 * 0.753: HLT phase-2 timing menu Alpaka, single tracking iteration variant
 * 0.754: HLT phase-2 timing menu Alpaka, single tracking iteration, LST building variant
+* 0.7541: HLT phase-2 timing menu single tracking iteration, LST building variant, CPU vs. GPU
 * 0.755: HLT phase-2 timing menu Alpaka, LST building variant
 * 0.756 HLT phase-2 timing menu trimmed tracking
 * 0.7561 HLT phase-2 timing menu Alpaka, trimmed tracking
 * 0.7562 HLT phase-2 timing menu Alpaka, trimmed tracking, single tracking iteration variant
 * 0.757: HLT phase-2 timing menu Alpaka, single tracking iteration, LST seeding + CKF building variant
 * 0.7571: HLT phase-2 timing menu Alpaka, single tracking iteration, Phase2CAExtension+LST seeding + mkFit building variant
 * 0.7572: HLT phase-2 timing menu Alpaka, single tracking iteration, Phase2CAExtension+LST seeding + mkFit building and fitting variant
+* 0.7573: HLT phase-2 timing menu single tracking iteration, Phase2CAExtension+LST seeding + mkFit building variant, CPU vs. GPU
 * 0.758 HLT phase-2 timing menu ticl_barrel variant
 * 0.759: HLT phase-2 timing menu, with NANO:@Phase2HLT
 * 0.76: HLT phase-2 reduced menu, with DIGI step

Configuration/PyReleaseValidation/python/relval_Run4.py

@@ -60,13 +60,15 @@
 numWFIB.extend([prefixDet+34.7521])# HLTTiming75e33, ticl_v5, ticlv5TrackLinkingGNN
 numWFIB.extend([prefixDet+34.753]) # HLTTiming75e33, alpaka,singleIterPatatrack
 numWFIB.extend([prefixDet+34.754]) # HLTTiming75e33, alpaka,singleIterPatatrack,trackingLST
+numWFIB.extend([prefixDet+34.7541]) # HLTTiming75e33, alpakaValidationLST,singleIterPatatrack,trackingLST
 numWFIB.extend([prefixDet+34.755]) # HLTTiming75e33, alpaka,trackingLST
 numWFIB.extend([prefixDet+34.756]) # HLTTiming75e33, phase2_hlt_vertexTrimming
 numWFIB.extend([prefixDet+34.7561])# HLTTiming75e33, alpaka,phase2_hlt_vertexTrimming
 numWFIB.extend([prefixDet+34.7562])# HLTTiming75e33, alpaka,phase2_hlt_vertexTrimming,singleIterPatatrack
 numWFIB.extend([prefixDet+34.757]) # HLTTiming75e33, alpaka,singleIterPatatrack,trackingLST,seedingLST
 numWFIB.extend([prefixDet+34.7571]) # HLTTiming75e33, alpaka,singleIterPatatrack,Phase2CAExtension,trackingLST,seedingLST,buildingMkFit
 numWFIB.extend([prefixDet+34.7572]) # HLTTiming75e33, alpaka,singleIterPatatrack,Phase2CAExtension,trackingLST,seedingLST,buildingMkFit,fittingMkFit
+numWFIB.extend([prefixDet+34.7573]) # HLTTiming75e33, alpakaValidationLST,singleIterPatatrack,Phase2CAExtension,trackingLST,seedingLST,buildingMkFit
 numWFIB.extend([prefixDet+34.758]) # HLTTiming75e33, ticl_barrel
 numWFIB.extend([prefixDet+34.759]) # HLTTiming75e33 + NANO
 numWFIB.extend([prefixDet+34.77])  # NGTScouting

Configuration/PyReleaseValidation/python/upgradeWorkflowComponents.py

@@ -560,6 +560,16 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '--procModifiers': 'trackingIters01,trackingLST',
 }
 
+# LST on GPU (if available), initialStep+highPtTripletStep-only tracking-only, CPU vs. GPU comparison
+class UpgradeWorkflow_lstOnGPUIters01TrackingOnlyAlpakaValidationLST(UpgradeWorkflow_lstOnGPUIters01TrackingOnly):
+    pass
+upgradeWFs['lstOnGPUIters01TrackingOnlyAlpakaValidationLST'] = deepcopy(upgradeWFs['lstOnGPUIters01TrackingOnly'])
+upgradeWFs['lstOnGPUIters01TrackingOnlyAlpakaValidationLST'].suffix = '_lstOnGPUIters01TrackingOnlyAlpakaValidationLST'
+upgradeWFs['lstOnGPUIters01TrackingOnlyAlpakaValidationLST'].offset = 0.7041
+upgradeWFs['lstOnGPUIters01TrackingOnlyAlpakaValidationLST'].step3 = upgradeWFs['trackingOnly'].step3 | {
+    '--procModifiers': 'alpakaValidationLST,trackingIters01,trackingLST',
+}
+
 #DeepCore seeding for JetCore iteration workflow
 class UpgradeWorkflow_seedingDeepCore(UpgradeWorkflow):
     def setup_(self, step, stepName, stepDict, k, properties):
@@ -1996,6 +2006,20 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '-s':'HARVESTING:@hltValidation'
 }
 
+upgradeWFs['HLTTiming75e33SingleIterLSTAlpakaValidationLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33SingleIterLSTAlpakaValidationLST'].suffix = '_HLT75e33TimingSingleIterLSTAlpakaValidationLST'
+upgradeWFs['HLTTiming75e33SingleIterLSTAlpakaValidationLST'].offset = 0.7541
+upgradeWFs['HLTTiming75e33SingleIterLSTAlpakaValidationLST'].step2 = {
+    # This workflow is meant to and only works for the tracking validation
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:hltMultiTrackValidation',
+    '--procModifiers': 'alpakaValidationLST,singleIterPatatrack,trackingLST',
+    '--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
+    '--eventcontent':'FEVTDEBUGHLT,DQMIO'
+}
+upgradeWFs['HLTTiming75e33SingleIterLSTAlpakaValidationLST'].step3 = {
+    '-s':'HARVESTING:@hltValidation'
+}
+
 upgradeWFs['HLTTiming75e33AlpakaLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
 upgradeWFs['HLTTiming75e33AlpakaLST'].suffix = '_HLT75e33TimingAlpakaLST'
 upgradeWFs['HLTTiming75e33AlpakaLST'].offset = 0.755
@@ -2078,6 +2102,20 @@ def condition(self, fragment, stepList, key, hasHarvest):
     '-s':'HARVESTING:@hltValidation'
 }
 
+upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingAlpakaValidationLST'] = deepcopy(upgradeWFs['HLTTiming75e33'])
+upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingAlpakaValidationLST'].suffix = '_HLT75e33TimingSingleIterCAExtLSTSeedingMkFitBuildingAlpakaValidationLST'
+upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingAlpakaValidationLST'].offset = 0.7573
+upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingAlpakaValidationLST'].step2 = {
+    # This workflow is meant to and only works for the tracking validation
+    '-s':'DIGI:pdigi_valid,L1TrackTrigger,L1,L1P2GT,DIGI2RAW,HLT:75e33_timing,VALIDATION:hltMultiTrackValidation',
+    '--procModifiers': 'alpakaValidationLST,singleIterPatatrack,phase2CAExtension,trackingLST,seedingLST,trackingMkFitCommon,hltTrackingMkFitInitialStep',
+    '--datatier':'GEN-SIM-DIGI-RAW,DQMIO',
+    '--eventcontent':'FEVTDEBUGHLT,DQMIO'
+}
+upgradeWFs['HLTTiming75e33SingleIterCAExtLSTSeedingMkFitBuildingAlpakaValidationLST'].step3 = {
+    '-s':'HARVESTING:@hltValidation'
+}
+
 upgradeWFs['HLTTiming75e33TiclBarrel'] = deepcopy(upgradeWFs['HLTTiming75e33'])
 upgradeWFs['HLTTiming75e33TiclBarrel'].suffix = '_HLT75e33TimingTiclBarrel'
 upgradeWFs['HLTTiming75e33TiclBarrel'].offset = 0.758

DQM/TrackingMonitorClient/python/TrackingClientConfig_Tier0_cff.py

@@ -98,8 +98,9 @@
 trackToTrackCPUAnalyzer = cms.Sequence()
 _trackToTrackCPUAnalyzer_trackingLST = cms.Sequence(highPtTripletStepTrackToTrackSerialSyncAnalyzer)
 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
+from Configuration.ProcessModifiers.alpakaValidationLST_cff import alpakaValidationLST
 from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
-(trackingPhase2PU140 & trackingLST).toReplaceWith(trackToTrackCPUAnalyzer, _trackToTrackCPUAnalyzer_trackingLST)
+(trackingPhase2PU140 & alpakaValidationLST & trackingLST).toReplaceWith(trackToTrackCPUAnalyzer, _trackToTrackCPUAnalyzer_trackingLST)
 
 
 TrackingOfflineDQMClient = cms.Sequence(trackingQTester*trackingOfflineAnalyser*trackingEffFromHitPattern*voMonitoringClientSequence*primaryVertexResolutionClient*TrackEffClient*foldedMapClientSeq*trackToTrackCPUAnalyzer)

DQM/TrackingMonitorSource/interface/TrackToTrackComparisonHists.h

@@ -110,6 +110,7 @@ class TrackToTrackComparisonHists : public DQMEDAnalyzer {
   double dxyCutForPlateau_;
   double dzWRTPvCut_;
   bool requireValidHLTPaths_;
+  bool ignoreLumiPUPlots_;
   bool hltPathsAreValid_ = false;
   std::unique_ptr<GenericTriggerEventFlag> genTriggerEventFlag_;
 

DQM/TrackingMonitorSource/python/trackToTrackCPU_cff.py

@@ -17,5 +17,6 @@
 _trackToTrackCPUTask_trackingLST += highPtTripletStepTrackToTrackSerialSync
 
 from Configuration.Eras.Modifier_trackingPhase2PU140_cff import trackingPhase2PU140
+from Configuration.ProcessModifiers.alpakaValidationLST_cff import alpakaValidationLST
 from Configuration.ProcessModifiers.trackingLST_cff import trackingLST
-(trackingPhase2PU140 & trackingLST).toReplaceWith(trackToTrackCPUSequence, _trackToTrackCPUTask_trackingLST)
+(trackingPhase2PU140 & alpakaValidationLST & trackingLST).toReplaceWith(trackToTrackCPUSequence, _trackToTrackCPUTask_trackingLST)

DQM/TrackingMonitorSource/src/TrackToTrackComparisonHists.cc

@@ -24,6 +24,7 @@ TrackToTrackComparisonHists::TrackToTrackComparisonHists(const edm::ParameterSet
       dxyCutForPlateau_(iConfig.getParameter<double>("dxyCutForPlateau")),
       dzWRTPvCut_(iConfig.getParameter<double>("dzWRTPvCut")),
       requireValidHLTPaths_(iConfig.getParameter<bool>("requireValidHLTPaths")),
+      ignoreLumiPUPlots_(iConfig.getParameter<bool>("ignoreLumiPUPlots")),
       genTriggerEventFlag_(new GenericTriggerEventFlag(
           iConfig.getParameter<edm::ParameterSet>("genericTriggerEventPSet"), consumesCollector(), *this))
 
@@ -94,8 +95,13 @@ void TrackToTrackComparisonHists::analyze(const edm::Event& iEvent, const edm::E
     onlinelumi = scalit->instantLumi();
     PU = scalit->pileup();
   } else {
-    edm::LogError("TrackToTrackComparisonHists") << "lumiScalersHandle not found or empty, skipping event";
-    return;
+    // When ignoring lumi and PU plots, keep their initial values to -1 and continue.
+    if (ignoreLumiPUPlots_) {
+      edm::LogInfo("TrackToTrackComparisonHists") << "ignoring lumi and PU plots";
+    } else {
+      edm::LogError("TrackToTrackComparisonHists") << "lumiScalersHandle not found or empty, skipping event";
+      return;
+    }
   }
 
   //
@@ -315,6 +321,7 @@ void TrackToTrackComparisonHists::fillDescriptions(edm::ConfigurationDescription
   edm::ParameterSetDescription desc;
 
   desc.add<bool>("requireValidHLTPaths", true);
+  desc.add<bool>("ignoreLumiPUPlots", false);
   desc.add<bool>("isCosmics", false);
 
   desc.add<edm::InputTag>("monitoredTrack", edm::InputTag("hltMergedTracks"));
@@ -428,13 +435,15 @@ void TrackToTrackComparisonHists::book_generic_tracks_histos(DQMStore::IBooker&
   // counts of tracks vs lumi
   // for this moment, xmin,xmax and binning are hardcoded, maybe in future in a config file!
   // have to add (declare) this in the .h file as well
-  (mes.h_onlinelumi) = ibooker.book1D(label + "_onlinelumi",
-                                      "number of tracks vs onlinelumi",
-                                      onlinelumi_nbin,
-                                      onlinelumi_rangeMin,
-                                      onlinelumi_rangeMax);
-  (mes.h_ls) = ibooker.book1D(label + "_ls", "number of tracks vs ls", ls_nbin, ls_rangeMin, ls_rangeMax);
-  (mes.h_PU) = ibooker.book1D(label + "_PU", "number of tracks vs PU", PU_nbin, PU_rangeMin, PU_rangeMax);
+  if (!ignoreLumiPUPlots_) {
+    (mes.h_onlinelumi) = ibooker.book1D(label + "_onlinelumi",
+                                        "number of tracks vs onlinelumi",
+                                        onlinelumi_nbin,
+                                        onlinelumi_rangeMin,
+                                        onlinelumi_rangeMax);
+    (mes.h_ls) = ibooker.book1D(label + "_ls", "number of tracks vs ls", ls_nbin, ls_rangeMin, ls_rangeMax);
+    (mes.h_PU) = ibooker.book1D(label + "_PU", "number of tracks vs PU", PU_nbin, PU_rangeMin, PU_rangeMax);
+  }
 }
 
 void TrackToTrackComparisonHists::book_matching_tracks_histos(DQMStore::IBooker& ibooker,
@@ -524,9 +533,11 @@ void TrackToTrackComparisonHists::fill_generic_tracks_histos(generalME& mes,
     (mes.h_dzWRTpv)->Fill(dzWRTpv);
     (mes.h_charge)->Fill(charge);
     (mes.h_hits)->Fill(nhits);
-    (mes.h_onlinelumi)->Fill(onlinelumi);
-    (mes.h_ls)->Fill(ls);
-    (mes.h_PU)->Fill(PU);
+    if (!ignoreLumiPUPlots_) {
+      (mes.h_onlinelumi)->Fill(onlinelumi);
+      (mes.h_ls)->Fill(ls);
+      (mes.h_PU)->Fill(PU);
+    }
   }
 
   if (pTOnPlateau || !requirePlateau) {