From ea05c0243eb559c8185ea2e336fc6f349fa80939 Mon Sep 17 00:00:00 2001
From: Benjamin Kerridge <benjamin.kerridge@cern.ch>
Date: Wed, 17 Feb 2021 11:53:34 +0000
Subject: [PATCH 1/6] change case of fullScanLrt to capitalise LRT

---
 .../TrigInDetConfig/python/ConfigSettings.py  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
index aebdf2856031..67e3319a2704 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettings.py
@@ -462,29 +462,29 @@ class _PrecisionTracking():
       return (self._signatureType == signature)
 
 class _EFIDTracking():
-   def __init__( self, signatureType, nameSuffix ) : 
+   def __init__( self, signatureType, nameSuffix ) :
       self._signatureType = signatureType #Steer which cuts,flags to load
       self._config        = getInDetTrigTrackingConfig( signatureType )
       self._suffix        = nameSuffix
-   
+
    #Retrieve trackCollection key
    @makeRecordable #Allows to record collection if doRecord = True
    def trkTracksEFID(self, doRecord=False):
       return 'HLT_IDTrkTrack_{}_EFID'.format( self._suffix )
-   
+
    #Retrieve TrackParticle key
    @makeRecordable #Allows to record collection if doRecord = True
    def tracksEFID(self, doRecord = True):
       return 'HLT_IDTrack_{}_EFID'.format( self._suffix )
-   
-   @property 
+
+   @property
    def setting(self):
       return self._config
-   
+
    def isSignature(self, signature):
       return (self._signatureType == signature)
-   
-   @property 
+
+   @property
    def signatureType(self):
       return self._signatureType
 
@@ -710,7 +710,7 @@ class _Settings_cosmics( _GlobalSettings ):
       self._configFT    = _FastTracking(      signatureType = 'cosmics',  nameSuffix = 'Cosmic' )
       self._configPT    = _PrecisionTracking( signatureType = 'cosmics',  nameSuffix = 'Cosmic' )
       self._configEFID  = _EFIDTracking(      signatureType = 'cosmics',  nameSuffix = 'Cosmic' )
-      self._doRecord    = True 
+      self._doRecord    = True
 
 class _Settings_bmumux( _GlobalSettings ):
    def __init__( self ):
@@ -765,7 +765,7 @@ class _Settings_bjetLRT( _GlobalSettings ):
 class _Settings_fullScanLRT( _GlobalSettings ):
    def __init__( self ):
       _GlobalSettings.__init__(self)
-      self._name     = "fullScanLrt" #To be appended to alg names
+      self._name     = "fullScanLRT" #To be appended to alg names
       self._roi      = "HLT_Roi_FS" #FIXME ATR-22755
       self._configFT = _FastTracking(   signatureType = 'fullScanLRT',  nameSuffix = 'FSLRT' ) #
       self._doRecord = True #record track collections
-- 
GitLab


From 38950ae790d37e612309bb5eff8289c6d8e3c1a3 Mon Sep 17 00:00:00 2001
From: Benjamin Kerridge <benjamin.kerridge@cern.ch>
Date: Thu, 18 Feb 2021 14:25:50 +0000
Subject: [PATCH 2/6] remove vertex alg from lrt

---
 .../python/TrigFastTrackFinder_Config.py       | 18 ++++++++++++++++--
 .../FullScanLRTTrackingConfiguration.py        | 13 ++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 1580a34565b8..ce241d40f3d0 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -53,6 +53,16 @@ class TrigFastTrackFinderMonitoring(GenericMonitoringTool):
             self.defineHistogram('TIME_TrackFitter',          path='EXPERT',type='TH1F',title="Track Fitter time (ms)",      xbins = 200, xmin=0.0, xmax=2000.0)
             if type=='fullScanUTT':
                 self.defineHistogram('TIME_JseedHitDV',       path='EXPERT',type='TH1F',title="Jet-seeded Hit DV (ms)",      xbins = 200, xmin=0.0, xmax=2000.0)
+        elif type=='fullScanLRT':
+            self.defineHistogram('roi_nSPs, TIME_PattReco',   path='EXPERT',type='TH2F',title="PattReco time; nSPs",    xbins = 200, xmin=0.0, xmax=3000.0, ybins = 100, ymin=0.0, ymax=500.0)
+            self.defineHistogram('roi_nTracks, TIME_PattReco',path='EXPERT',type='TH2F',title="PattReco time; nTracks", xbins = 50,  xmin=0.0, xmax=200.0,  ybins = 100, ymin=0.0, ymax=500.0)
+            self.defineHistogram('TIME_Total',             path='EXPERT',type='TH1F',title="Total time (ms)",           xbins = 200, xmin=0.0, xmax=5000.0)
+            self.defineHistogram('TIME_PattReco',             path='EXPERT',type='TH1F',title="Pure PattReco time (ms)",     xbins = 200, xmin=0.0, xmax=500.0)
+            self.defineHistogram('TIME_SpacePointConversion', path='EXPERT',type='TH1F',title="SP Conversion time (ms)",     xbins = 200, xmin=0.0, xmax=40.0)
+            self.defineHistogram('TIME_ZFinder',              path='EXPERT',type='TH1F',title="ZFinder time (ms)",           xbins = 200, xmin=0.0, xmax=1000.0)
+            self.defineHistogram('TIME_Triplets',             path='EXPERT',type='TH1F',title="Triplets Making time (ms)",   xbins = 200, xmin=0.0, xmax=400.0)
+            self.defineHistogram('TIME_CmbTrack',             path='EXPERT',type='TH1F',title="Combined Tracking time (ms)", xbins = 200, xmin=0.0, xmax=400.0)
+            self.defineHistogram('TIME_TrackFitter',          path='EXPERT',type='TH1F',title="Track Fitter time (ms)",      xbins = 200, xmin=0.0, xmax=200.0)
         else:
             self.defineHistogram('roi_nSPs, TIME_PattReco',   path='EXPERT',type='TH2F',title="PattReco time; nSPs",    xbins = 200, xmin=0.0, xmax=3000.0, ybins = 100, ymin=0.0, ymax=400.0)
             self.defineHistogram('roi_nTracks, TIME_PattReco',path='EXPERT',type='TH2F',title="PattReco time; nTracks", xbins = 50,  xmin=0.0, xmax=200.0,  ybins = 100, ymin=0.0, ymax=400.0)
@@ -67,7 +77,7 @@ class TrigFastTrackFinderMonitoring(GenericMonitoringTool):
 
 
     def addTrackHistograms(self, type):
-        if type=='FS' or type=='JetFS' or type=='FullScan' or type=='fullScan' or type=='fullScanUTT':
+        if type=='FS' or type=='JetFS' or type=='FullScan' or type=='fullScan' or type=='fullScanUTT' or type=='fullScanLRT':
             self.defineHistogram('roi_nSeeds',     path='EXPERT',type='TH1F',title="Number of seeds",xbins = 1000, xmin=-0.5, xmax=99999.5)
             self.defineHistogram('roi_nTracks',    path='EXPERT',type='TH1F',title="Number of Tracks",xbins = 100, xmin=-0.5, xmax=9999.5)
         else:
@@ -90,6 +100,10 @@ class TrigFastTrackFinderMonitoring(GenericMonitoringTool):
             self.defineHistogram('trk_a0',     path='EXPERT',type='TH1F',title="a0",xbins = 100, xmin=-300, xmax=300)
             self.defineHistogram('trk_a0beam', path='EXPERT',type='TH1F',title="a0beam",xbins = 100, xmin=-300, xmax=300)
             self.defineHistogram('trk_z0',     path='EXPERT',type='TH1F',title="z0",xbins = 100, xmin=-800, xmax=800)
+        elif type=='fullScanLRT':
+            self.defineHistogram('trk_a0',     path='EXPERT',type='TH1F',title="a0",xbins = 100, xmin=-300, xmax=300)
+            self.defineHistogram('trk_a0beam', path='EXPERT',type='TH1F',title="a0beam",xbins = 100, xmin=-300, xmax=300)
+            self.defineHistogram('trk_z0',     path='EXPERT',type='TH1F',title="z0",xbins = 100, xmin=-550, xmax=550)
         else:
             self.defineHistogram('trk_a0',     path='EXPERT',type='TH1F',title="a0",xbins = 200, xmin=-10, xmax=10)
             self.defineHistogram('trk_a0beam', path='EXPERT',type='TH1F',title="a0beam",xbins = 200, xmin=-10, xmax=10)
@@ -288,7 +302,7 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
         InDetTrigSiDetElementsRoadMaker_FTF.RoadWidth = 10.0
         if remapped_type=="fullScan":
           InDetTrigSiDetElementsRoadMaker_FTF.RoadWidth = 5.0
-        
+
         if remapped_type=="cosmics":
           from InDetTrigRecExample.InDetTrigConfigRecLoadToolsCosmics import InDetTrigSiDetElementsRoadMakerCosmics
           InDetTrigSiDetElementsRoadMaker_FTF = InDetTrigSiDetElementsRoadMakerCosmics.clone('InDetTrigSiDetElementsRoadMaker_FTF')
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
index b6f0dc26ed63..21a9ae7a27b1 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
@@ -18,24 +18,15 @@ def FullScanLRTTriggerSequence(ConfigFlags):
 
     from TrigEDMConfig.TriggerEDMRun3 import recordable
     from TrigInDetConfig.InDetSetup import makeInDetAlgsNoView, makeInDetAlgs
-    view_algs = makeInDetAlgsNoView( config = fscfg, rois=trkFSRoI, secondStageConfig = lrtcfg)
+    reco_algs = makeInDetAlgsNoView( config = fscfg, rois=trkFSRoI, secondStageConfig = lrtcfg)
 
     from TriggerMenuMT.HLTMenuConfig.Jet.JetMenuSequences import getTrackingInputMaker
     im_alg = getTrackingInputMaker()
 
 
-    from TrigInDetConfig.TrigInDetPriVtxConfig import makeVertices
-
-    verticesname = recordable("HLT_IDVertex_FSLRT")
-    vtxAlgs = makeVertices( "fullScanLRT", lrtcfg.FT.tracksFTF( doRecord = lrtcfg.isRecordable ) , verticesname, lrtcfg )
-    prmVtx = vtxAlgs[-1]
-
-
-    TrkSeq = parOR("UncTrkrecoSeqFSLRT", [im_alg, view_algs, prmVtx])
+    TrkSeq = parOR("UncTrkrecoSeqFSLRT", [im_alg, reco_algs])
     sequenceOut = lrtcfg.FT.tracksFTF( doRecord = lrtcfg.isRecordable )
 
-
-
     return (TrkSeq,im_alg, sequenceOut)
 
 
-- 
GitLab


From cea9103101f0af986fa9fdd6b04a4660438c81e8 Mon Sep 17 00:00:00 2001
From: Benjamin Kerridge <benjamin.kerridge@cern.ch>
Date: Mon, 22 Feb 2021 10:15:30 +0000
Subject: [PATCH 3/6] remove threshold from chain names set 120 -> 0

---
 .../TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
index b4840cd8c1d2..fc21d8096eb7 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/LS2_v1.py
@@ -707,6 +707,6 @@ def setupMenu():
         # ChainProp(name='HLT_xe80_tcpufit_unconvtrk120_isohpttrack_loose_iaggrloose_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['XE50','FSNOSEED'],mergingStrategy='serial'),
 
 
-        ChainProp(name='HLT_unconvtrk120_fslrt_L1All', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']),
-        ChainProp(name='HLT_unconvtrk120_fslrt_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['XE50']),
+        ChainProp(name='HLT_unconvtrk0_fslrt_L1All', groups=SingleMETGroup, l1SeedThresholds=['FSNOSEED']),
+        ChainProp(name='HLT_unconvtrk0_fslrt_L1XE50', groups=SingleMETGroup, l1SeedThresholds=['XE50']),
     ]
-- 
GitLab


From 9ba4e44b6498aa5b953e75ae071d5c47b76453ed Mon Sep 17 00:00:00 2001
From: Benjamin Kerridge <benjamin.kerridge@cern.ch>
Date: Mon, 1 Mar 2021 11:47:13 +0000
Subject: [PATCH 4/6] change chain name in reference counts files

---
 .../TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref   | 4 ++--
 .../TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 60c5e29bbb0d..c65fe721af01 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -4344,13 +4344,13 @@ HLT_tilecalib_laser_TilePEB_L1CALREQ2:
   eventCount: 0
 HLT_timeburner_L1All:
   eventCount: 0
-HLT_unconvtrk120_fslrt_L1All:
+HLT_unconvtrk0_fslrt_L1All:
   eventCount: 20
   stepCounts:
     0: 20
   stepFeatures:
     0: 20
-HLT_unconvtrk120_fslrt_L1XE50:
+HLT_unconvtrk0_fslrt_L1XE50:
   eventCount: 10
   stepCounts:
     0: 10
diff --git a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
index 7c71ac2a2c48..8c1be15d406c 100644
--- a/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TriggerTest/share/ref_data_v1Dev_build.ref
@@ -2851,13 +2851,13 @@ HLT_tilecalib_laser_TilePEB_L1CALREQ2:
     0: 20
 HLT_timeburner_L1All:
   eventCount: 0
-HLT_unconvtrk120_fslrt_L1All:
+HLT_unconvtrk0_fslrt_L1All:
   eventCount: 19
   stepCounts:
     0: 19
   stepFeatures:
     0: 19
-HLT_unconvtrk120_fslrt_L1XE50:
+HLT_unconvtrk0_fslrt_L1XE50:
   eventCount: 19
   stepCounts:
     0: 19
-- 
GitLab


From 595d6ba22d5888a0bcb40b37f8fcad2c12ebf536 Mon Sep 17 00:00:00 2001
From: Benjamin Kerridge <benjamin.kerridge@cern.ch>
Date: Tue, 2 Mar 2021 14:18:37 +0000
Subject: [PATCH 5/6] adjust range for lrt expert monitoring roi_nTracks

---
 .../TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index 16301c36316e..234fa45b32e3 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -77,9 +77,12 @@ class TrigFastTrackFinderMonitoring(GenericMonitoringTool):
 
 
     def addTrackHistograms(self, type):
-        if type=='FS' or type=='JetFS' or type=='FullScan' or type=='fullScan' or type=='fullScanUTT' or type=='fullScanLRT':
+        if type=='FS' or type=='JetFS' or type=='FullScan' or type=='fullScan' or type=='fullScanUTT':
             self.defineHistogram('roi_nSeeds',     path='EXPERT',type='TH1F',title="Number of seeds",xbins = 1000, xmin=-0.5, xmax=99999.5)
             self.defineHistogram('roi_nTracks',    path='EXPERT',type='TH1F',title="Number of Tracks",xbins = 100, xmin=-0.5, xmax=9999.5)
+        elif type=='fullScanLRT':
+            self.defineHistogram('roi_nSeeds',     path='EXPERT',type='TH1F',title="Number of seeds",xbins = 1000, xmin=-0.5, xmax=99999.5)
+            self.defineHistogram('roi_nTracks',    path='EXPERT',type='TH1F',title="Number of Tracks",xbins = 100, xmin=-0.5, xmax=5000.5)
         else:
             self.defineHistogram('roi_nSeeds',     path='EXPERT',type='TH1F',title="Number of seeds",xbins =  100, xmin=-0.5, xmax=4999.5)
             self.defineHistogram('roi_nTracks',    path='EXPERT',type='TH1F',title="Number of Tracks",xbins =  50, xmin=-0.5, xmax=199.5)
-- 
GitLab


From 3074b8f0c3296ee375bd5497f1481231057aa64d Mon Sep 17 00:00:00 2001
From: Benjamin Kerridge <benjamin.kerridge@cern.ch>
Date: Tue, 2 Mar 2021 17:28:11 +0000
Subject: [PATCH 6/6] remove unused import (resolves compile warning)

---
 .../UnconventionalTracking/FullScanLRTTrackingConfiguration.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
index 272eab1c9869..f35648ecf454 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/UnconventionalTracking/FullScanLRTTrackingConfiguration.py
@@ -13,9 +13,6 @@ def FullScanLRTTriggerSequence(ConfigFlags):
     fscfg = getInDetTrigConfig("jet")
     lrtcfg = getInDetTrigConfig( 'fullScanLRT' )
 
-
-    from TrigEDMConfig.TriggerEDMRun3 import recordable
-    
     from TrigInDetConfig.InDetSetup import makeInDetAlgsNoView
     reco_algs = makeInDetAlgsNoView( config = fscfg, rois=trkFSRoI, secondStageConfig = lrtcfg)
 
-- 
GitLab