From 6e459ce4b9dcc013eb9696b8e4cf70d7b6344ee0 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Thu, 26 Mar 2020 16:08:59 +0100
Subject: [PATCH 01/19] Correct TRT names

---
 .../python/InDetTrigConfigRecLoadTools.py                    | 3 ++-
 .../python/InDetTrigConfigRecPreProcessing.py                | 2 +-
 Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py          | 5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index 51a8d9cb9ce9..316f4bd4ebfe 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -753,7 +753,8 @@ if InDetTrigFlags.loadSummaryTool():
 
   InDetTrigTRT_LocalOccupancy = InDet__TRT_LocalOccupancy(name ="InDetTrig_TRT_LocalOccupancy",
                                                           isTrigger = True,
-                                                          TRT_RDOContainerName="TRT_RDOs_EF",
+                                                          TRT_RDOContainerName="TRT_RDOs_TRIG",
+                                                          TRT_DriftCircleCollection="TRT_TrigDriftCircles",
                                                           TRTCalDbTool = InDetTRTCalDbTool,
                                                           TRTStrawStatusSummaryTool = InDetTrigTRTStrawStatusSummaryTool)
   ToolSvc += InDetTrigTRT_LocalOccupancy
diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
index a1d6c04aa3a1..923834ad6c63 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
@@ -19,7 +19,7 @@ from __future__ import print_function
 
 EF_PixRDOKey="PixelRDOs_EF"
 EF_SCTRDOKey="SCT_RDOs_EF"
-EF_TRTRDOKey="TRT_RDOs_EF"
+EF_TRTRDOKey="TRT_RDOs_TRIG"
 from TriggerJobOpts.TriggerFlags import TriggerFlags
 if not TriggerFlags.doTransientByteStream():
    EF_PixRDOKey="PixelRDOs"
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index a159197cab3b..e63efe9614d3 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -173,7 +173,7 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
                 # load the TRTRawDataProvider
                 from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProvider
                 InDetTRTRawDataProvider = TRTRawDataProvider(name         = "%sTRTRawDataProvider%s"%(algNamePrefix, signature),
-                                                             RDOKey       = "TRT_RDOs",
+                                                             RDOKey       = "TRT_RDOs_TRIG",
                                                              ProviderTool = InDetTRTRawDataProviderTool)
                 InDetTRTRawDataProvider.isRoI_Seeded = True
                 InDetTRTRawDataProvider.RoIs = rois
@@ -195,7 +195,7 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
             InDetTrigTRTRIOMaker = InDet__TRT_RIO_Maker( name = "%sTRTDriftCircleMaker%s"%(algNamePrefix, signature),
                                                      #RawDataProvider = InDetTRTRawDataProvider,
                                                      TRTRIOLocation = 'TRT_TrigDriftCircles',
-                                                     TRTRDOLocation = "TRT_RDOs",
+                                                     TRTRDOLocation = "TRT_RDOs_TRIG",
                                                      #EtaHalfWidth = InDetTrigSliceSettings[('etaHalfWidth',signature)],
                                                      #PhiHalfWidth = InDetTrigSliceSettings[('phiHalfWidth',signature)],
                                                      #doFullScan =   InDetTrigSliceSettings[('doFullScan',signature)],
@@ -261,6 +261,7 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
                                                             TrackExtensionTool     = InDetTrigTRTExtensionTool,
                                                             ExtendedTracksLocation = 'ExtendedTrackMap'
                                                              )
+            print(InDetTrigTRTextensionAlg)
             #-----------------------------------------------------------------------------
             #                        TRT processor
 
-- 
GitLab


From 7cc7eb8d3f45b7bc72186b261983ba1c193b3636 Mon Sep 17 00:00:00 2001
From: MatousVozak <matous.vozak@cern.ch>
Date: Thu, 5 Mar 2020 13:27:21 +0100
Subject: [PATCH 02/19] Adding TrigKeys, fixing TRT dependencies, still need to
 fix AssociationTool

---
 .../python/InDetTrigConfigRecLoadTools.py     |  8 +++--
 .../TrigInDetConfig/python/InDetPT.py         | 17 +++++----
 .../TrigInDetConfig/python/InDetSetup.py      |  4 ++-
 .../python/InDetTrigCollectionKeys.py         | 35 +++++++++++++++++++
 .../PrecisionElectronRecoSequences.py         |  3 +-
 5 files changed, 55 insertions(+), 12 deletions(-)
 create mode 100644 Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py

diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index 316f4bd4ebfe..9beed54ee0e4 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -744,17 +744,19 @@ if InDetTrigFlags.loadSummaryTool():
             conddb.folderRequested("/TRT/Onl/Calib/ToT/ToTValue")):
     conddb.addFolderSplitOnline("TRT","/TRT/Onl/Calib/ToT/ToTValue","/TRT/Calib/ToT/ToTValue",className='CondAttrListCollection')
 
-
+  from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys
   from TRT_ElectronPidTools.TRT_ElectronPidToolsConf import InDet__TRT_ElectronPidToolRun2,InDet__TRT_LocalOccupancy,TRT_ToT_dEdx
   from InDetTrigRecExample.InDetTrigConditionsAccess import TRT_ConditionsSetup
   # Calibration DB Tool
   from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
   InDetTRTCalDbTool = TRT_CalDbTool(name = "TRT_CalDbTool")
 
+
+
   InDetTrigTRT_LocalOccupancy = InDet__TRT_LocalOccupancy(name ="InDetTrig_TRT_LocalOccupancy",
                                                           isTrigger = True,
-                                                          TRT_RDOContainerName="TRT_RDOs_TRIG",
-                                                          TRT_DriftCircleCollection="TRT_TrigDriftCircles",
+                                                          TRT_RDOContainerName= TrigTRTKeys.RDOs,
+                                                          TRT_DriftCircleCollection = TrigTRTKeys.DriftCircles,
                                                           TRTCalDbTool = InDetTRTCalDbTool,
                                                           TRTStrawStatusSummaryTool = InDetTrigTRTStrawStatusSummaryTool)
   ToolSvc += InDetTrigTRT_LocalOccupancy
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index e63efe9614d3..703efaf16622 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -13,6 +13,11 @@ from AthenaCommon.Logging import logging
 log = logging.getLogger("InDetPT")
 
 
+#Global keys/names for collections 
+from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys, TrigPixelKeys
+
+
+
 
 #Start using already decided naming conventions
 #TODO: remap might not be needed in the end once this is consistent with FTF configuration
@@ -62,7 +67,7 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
   #If run in views need to check data dependancies!
   #NOTE: this seems necessary only when PT is called from a different view than FTF otherwise causes stalls
   if verifier:
-         verifier.DataObjects += [  ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+TrigPixelClusterAmbiguitiesMap' ),
+         verifier.DataObjects += [  ( 'InDet::PixelGangedClusterAmbiguities' , 'StoreGateSvc+' + TrigPixelKeys.PixelClusterAmbiguitiesMap ),
                                   ( 'TrackCollection' , 'StoreGateSvc+' + inputFTFtracks ) ] 
       
   
@@ -173,7 +178,7 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
                 # load the TRTRawDataProvider
                 from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProvider
                 InDetTRTRawDataProvider = TRTRawDataProvider(name         = "%sTRTRawDataProvider%s"%(algNamePrefix, signature),
-                                                             RDOKey       = "TRT_RDOs_TRIG",
+                                                             RDOKey       = TrigTRTKeys.RDOs,
                                                              ProviderTool = InDetTRTRawDataProviderTool)
                 InDetTRTRawDataProvider.isRoI_Seeded = True
                 InDetTRTRawDataProvider.RoIs = rois
@@ -194,8 +199,8 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
             from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__TRT_RIO_Maker
             InDetTrigTRTRIOMaker = InDet__TRT_RIO_Maker( name = "%sTRTDriftCircleMaker%s"%(algNamePrefix, signature),
                                                      #RawDataProvider = InDetTRTRawDataProvider,
-                                                     TRTRIOLocation = 'TRT_TrigDriftCircles',
-                                                     TRTRDOLocation = "TRT_RDOs_TRIG",
+                                                     TRTRIOLocation = TrigTRTKeys.DriftCircles,
+                                                     TRTRDOLocation = TrigTRTKeys.RDOs,
                                                      #EtaHalfWidth = InDetTrigSliceSettings[('etaHalfWidth',signature)],
                                                      #PhiHalfWidth = InDetTrigSliceSettings[('phiHalfWidth',signature)],
                                                      #doFullScan =   InDetTrigSliceSettings[('doFullScan',signature)],
@@ -228,13 +233,12 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
 
             ToolSvc += InDetTrigTRTDetElementsRoadMaker
 
-
              #TODO implement new configuration of circle cut
             from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigTRTDriftCircleCut
             from TRT_TrackExtensionTool_xk.TRT_TrackExtensionTool_xkConf import InDet__TRT_TrackExtensionTool_xk
             InDetTrigTRTExtensionTool = InDet__TRT_TrackExtensionTool_xk ( name = "%sTrackExtensionTool%s"%(algNamePrefix,signature),
                                                                            MagneticFieldMode     = 'MapSolenoid',      # default
-                                                                           TRT_ClustersContainer = 'TRT_TrigDriftCircles', # default
+                                                                           TRT_ClustersContainer = TrigTRTKeys.DriftCircles, # default
                                                                            TrtManagerLocation    = 'TRT',              # default
                                                                            PropagatorTool = InDetTrigPatternPropagator,
                                                                            UpdatorTool    = InDetTrigPatternUpdator,
@@ -261,7 +265,6 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
                                                             TrackExtensionTool     = InDetTrigTRTExtensionTool,
                                                             ExtendedTracksLocation = 'ExtendedTrackMap'
                                                              )
-            print(InDetTrigTRTextensionAlg)
             #-----------------------------------------------------------------------------
             #                        TRT processor
 
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
index 20cdcf7f98ad..955f5c8a3e05 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
@@ -129,12 +129,14 @@ def makeInDetAlgs( whichSignature='', separateTrackParticleCreator='', rois = 'E
   InDetPixelGangedAmbiguitiesFinder = InDet__PixelGangedAmbiguitiesFinder(name = "InDetPixelGangedAmbiguitiesFinder" + signature)
   ToolSvc += InDetPixelGangedAmbiguitiesFinder
 
+  #Global keys/names for collections 
+  from TrigInDetConfig.InDetTrigCollectionKeys import TrigTRTKeys, TrigPixelKeys
   from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__PixelClusterization
   InDetPixelClusterization = InDet__PixelClusterization(name                    = "InDetPixelClusterization" + signature,
                                                         clusteringTool          = InDetMergedPixelsTool,
                                                         gangedAmbiguitiesFinder = InDetPixelGangedAmbiguitiesFinder,
                                                         DataObjectName          = InDetKeys.PixelRDOs(),
-                                                        AmbiguitiesMap          = 'TrigPixelClusterAmbiguitiesMap',
+                                                        AmbiguitiesMap          = TrigPixelKeys.PixelClusterAmbiguitiesMap,
                                                         ClustersName            = "PixelTrigClusters")
 
   InDetPixelClusterization.isRoI_Seeded = True
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py
new file mode 100644
index 000000000000..19266585d844
--- /dev/null
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py
@@ -0,0 +1,35 @@
+#
+#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+
+#----------------------------------------------------------------------------------------------------------
+#
+#           This file contains names of the collections used across the Inner detector Trigger SW
+#     
+
+
+class IDTrigTRTKeys:
+   """ Keys for the Transition Radiation Tracker """
+   def __init__ (self):
+      #Created by TRTRawDataProvider 
+      self.RDOs         = "TRT_RDOs_TRIG" #Raw data objects
+
+      #Created by RIO_MAKER
+      self.DriftCircles = "TRT_TrigDriftCircles" 
+
+
+class IDTrigPixelKeys:
+   """ Keys for the Pixel """
+   def __init__ (self):
+      self.PixelClusterAmbiguitiesMap = 'TrigPixelClusterAmbiguitiesMap'
+
+
+
+
+
+
+TrigTRTKeys   = IDTrigTRTKeys( )
+TrigPixelKeys = IDTrigPixelKeys( )
+
+
+
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
index b4f166741558..a723076c8f5a 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
@@ -38,7 +38,8 @@ def precisionElectronRecoSequence(RoIs):
     ViewVerifyTrk.DataObjects = [('TrackCollection','StoreGateSvc+'+TrackCollection),
                                  ('xAOD::CaloClusterContainer' , precisionCaloMenuDefs.precisionCaloClusters),
                                  ('CaloCellContainer' , 'StoreGateSvc+CaloCells'),
-                                 ('SCT_FlaggedCondData','StoreGateSvc+SCT_FlaggedCondData_TRIG')]
+                                 ('SCT_FlaggedCondData','StoreGateSvc+SCT_FlaggedCondData_TRIG'),
+                                 ]
     
     if globalflags.InputFormat.is_bytestream():
        ViewVerifyTrk.DataObjects += [( 'InDetBSErrContainer' , 'StoreGateSvc+PixelByteStreamErrs' ),
-- 
GitLab


From 59fa4da4faf4443b9928d6aa49e74d129341c199 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Thu, 9 Apr 2020 16:29:46 +0200
Subject: [PATCH 03/19] Set precisionTrackingInElectrons to concurrent, fix
 crash

---
 .../HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
index a723076c8f5a..caa7ffc1482b 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
@@ -54,7 +54,7 @@ def precisionElectronRecoSequence(RoIs):
     from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking
 
     PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking("electron", ViewVerifyTrk, inputFTFtracks= TrackCollection, rois= RoIs)
-    PTSeq = seqAND("precisionTrackingInElectrons", PTAlgs)
+    PTSeq = parOR("precisionTrackingInElectrons", PTAlgs)
     #electronPrecisionTrack += PTSeq
     trackParticles = PTTrackParticles[-1]
     
-- 
GitLab


From 1eca85cb0f74fbf252f09f5fc113bd33fd61d4d0 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Thu, 9 Apr 2020 23:48:54 +0200
Subject: [PATCH 04/19] Fix unused import

---
 .../HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
index caa7ffc1482b..bdfc76514e46 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
@@ -2,7 +2,7 @@
 #  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 
-from AthenaCommon.CFElements import parOR, seqAND
+from AthenaCommon.CFElements import parOR
 from AthenaCommon.GlobalFlags import globalflags
 
 #logging
-- 
GitLab


From 4ea28879c68b767035aceb222bd9970525388fd1 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Tue, 14 Apr 2020 15:54:08 +0200
Subject: [PATCH 05/19] Fix RoI seeding for TRT_RIO_Maker

---
 .../InDetPrepRawDataFormation/TRT_RIO_Maker.h               | 4 ++--
 .../InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx         | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
index bd5a8753d683..ac547b88d070 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
@@ -70,8 +70,8 @@ namespace InDet{
     int                            m_mode_rio_production;
     bool                           m_trtBadChannels;
 
-    bool m_roiSeeded;                                //!< detector manager name in StoreGate
-    SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey;
+    SG::ReadHandleKey<TrigRoiDescriptorCollection> m_roiCollectionKey{this, "RoIs", "", "RoIs to read in"};
+    BooleanProperty m_roiSeeded{this, "isRoI_Seeded", false, "Use RoI"};
     ServiceHandle<IRegSelSvc>     m_regionSelector;     //!< region selector service
     SG::UpdateHandleKey<InDet::TRT_DriftCircleContainerCache> m_rioContainerCacheKey;
 
diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
index d748ab1fd837..c4851c807a51 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
@@ -34,8 +34,6 @@ namespace InDet {
   m_rioContainerKey("TRT_DriftCircles"),
   m_mode_rio_production(0),
   m_trtBadChannels(0),
-  m_roiSeeded(false),
-  m_roiCollectionKey(""),
   m_regionSelector("RegSelSvc", name),
   m_rioContainerCacheKey("")
   {
@@ -57,6 +55,10 @@ namespace InDet {
     // Get TRT_DriftCircle tool
     ATH_CHECK(m_driftcircle_tool.retrieve());
     ATH_CHECK(detStore()->retrieve(m_pTRTHelper,"TRT_ID"));
+    if (m_roiSeeded.value()) {
+      ATH_CHECK(m_roiCollectionKey.initialize());
+      ATH_CHECK(m_regionSelector.retrieve());
+    }
 
     ATH_CHECK( m_rdoContainerKey.initialize() );
     ATH_CHECK( m_rioContainerKey.initialize() );
-- 
GitLab


From c4f33bdbe1aa2b0fcd2787c9d25a4bca420c124d Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Tue, 14 Apr 2020 15:55:26 +0200
Subject: [PATCH 06/19] Fix RoI seeding, and set to read TRT_RDOs from input
 file on MC

---
 .../python/InDetTrigConfigRecLoadTools.py                  | 7 +++++--
 Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py        | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index 9beed54ee0e4..ef1ccc1e80ab 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -751,11 +751,14 @@ if InDetTrigFlags.loadSummaryTool():
   from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbTool
   InDetTRTCalDbTool = TRT_CalDbTool(name = "TRT_CalDbTool")
 
-
+  TRT_RDO_Key = "TRT_RDOs"
+  if globalflags.DataSource == 'data':
+      TRT_RDO_Key = TrigTRTKeys.RDOs
+      
 
   InDetTrigTRT_LocalOccupancy = InDet__TRT_LocalOccupancy(name ="InDetTrig_TRT_LocalOccupancy",
                                                           isTrigger = True,
-                                                          TRT_RDOContainerName= TrigTRTKeys.RDOs,
+                                                          TRT_RDOContainerName = TRT_RDO_Key,
                                                           TRT_DriftCircleCollection = TrigTRTKeys.DriftCircles,
                                                           TRTCalDbTool = InDetTRTCalDbTool,
                                                           TRTStrawStatusSummaryTool = InDetTrigTRTStrawStatusSummaryTool)
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index 703efaf16622..f116aaeb2880 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -156,7 +156,9 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
             from AthenaCommon.AppMgr import ServiceMgr
             from AthenaCommon.GlobalFlags import globalflags
             #Only add raw data decoders if we're running over raw data
+            TRT_RDO_Key = "TRT_RDOs"
             if globalflags.InputFormat.is_bytestream():
+                TRT_RDO_Key = TrigTRTKeys.RDOs
                 from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
                 InDetTRTCalDbSvc = TRT_CalDbSvc()
                 ServiceMgr += InDetTRTCalDbSvc
@@ -198,13 +200,14 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
             from InDetTrigRecExample.InDetTrigSliceSettings import InDetTrigSliceSettings
             from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__TRT_RIO_Maker
             InDetTrigTRTRIOMaker = InDet__TRT_RIO_Maker( name = "%sTRTDriftCircleMaker%s"%(algNamePrefix, signature),
-                                                     #RawDataProvider = InDetTRTRawDataProvider,
                                                      TRTRIOLocation = TrigTRTKeys.DriftCircles,
-                                                     TRTRDOLocation = TrigTRTKeys.RDOs,
+                                                     TRTRDOLocation = TRT_RDO_Key,
                                                      #EtaHalfWidth = InDetTrigSliceSettings[('etaHalfWidth',signature)],
                                                      #PhiHalfWidth = InDetTrigSliceSettings[('phiHalfWidth',signature)],
                                                      #doFullScan =   InDetTrigSliceSettings[('doFullScan',signature)],
                                                      TRT_DriftCircleTool = InDetTrigTRT_DriftCircleTool )
+            InDetTrigTRTRIOMaker.isRoI_Seeded = True
+            InDetTrigTRTRIOMaker.RoIs = rois
  
  
             from InDetTrigRecExample.InDetTrigConfigRecLoadTools import InDetTrigPatternPropagator, InDetTrigPatternUpdator
-- 
GitLab


From 1856f3562e8ff5e37cc576b4ddf07879833995e5 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Tue, 14 Apr 2020 15:57:14 +0200
Subject: [PATCH 07/19] Reference changes from correctly working TRT extension

---
 .../TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
index 02fe9ebae47a..a5e542c83ea5 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_mt1_build.ref
@@ -71,8 +71,8 @@ TrigSignatureMoniMT                                INFO HLT_e26_etcut_L1EM22VHI
 TrigSignatureMoniMT                                INFO -- #1703681121 Events         6          6          6          6          6          -          -          6
 TrigSignatureMoniMT                                INFO -- #1703681121 Features                             7          131        7          -          -
 TrigSignatureMoniMT                                INFO HLT_e26_lhtight_L1EM24VHI #3494457106
-TrigSignatureMoniMT                                INFO -- #3494457106 Events         6          6          5          5          5          4          -          4
-TrigSignatureMoniMT                                INFO -- #3494457106 Features                             5          63         8          4          -
+TrigSignatureMoniMT                                INFO -- #3494457106 Events         6          6          5          5          5          3          -          3
+TrigSignatureMoniMT                                INFO -- #3494457106 Features                             5          63         8          3          -
 TrigSignatureMoniMT                                INFO HLT_e300_etcut_L1EM24VHI #3481091923
 TrigSignatureMoniMT                                INFO -- #3481091923 Events         6          6          0          0          0          -          -          0
 TrigSignatureMoniMT                                INFO -- #3481091923 Features                             0          0          0          -          -
@@ -92,8 +92,8 @@ TrigSignatureMoniMT                                INFO HLT_e5_lhmedium_noringer
 TrigSignatureMoniMT                                INFO -- #176627878 Events          20         20         16         16         16         4          -          4
 TrigSignatureMoniMT                                INFO -- #176627878 Features                              48         531        93         5          -
 TrigSignatureMoniMT                                INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT                                INFO -- #2758326765 Events         20         20         16         16         16         4          -          4
-TrigSignatureMoniMT                                INFO -- #2758326765 Features                             45         513        84         4          -
+TrigSignatureMoniMT                                INFO -- #2758326765 Events         20         20         16         16         16         3          -          3
+TrigSignatureMoniMT                                INFO -- #2758326765 Features                             45         513        84         3          -
 TrigSignatureMoniMT                                INFO HLT_e60_lhmedium_L1EM24VHI #713054523
 TrigSignatureMoniMT                                INFO -- #713054523 Events          6          6          2          2          2          2          -          2
 TrigSignatureMoniMT                                INFO -- #713054523 Features                              2          32         4          2          -
-- 
GitLab


From fc47a5c8b1f93cb9a88c480a0394aabc52cb0963 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Tue, 14 Apr 2020 23:22:39 +0200
Subject: [PATCH 08/19] Fix for removed TRT service

---
 Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index 1984fd53f7cb..10ac61321fcd 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -159,10 +159,6 @@ def makeInDetPrecisionTracking( whichSignature, verifier = False, inputFTFtracks
             TRT_RDO_Key = "TRT_RDOs"
             if globalflags.InputFormat.is_bytestream():
                 TRT_RDO_Key = TrigTRTKeys.RDOs
-                from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
-                InDetTRTCalDbSvc = TRT_CalDbSvc()
-                ServiceMgr += InDetTRTCalDbSvc
-             
                 from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRT_RodDecoder
                 InDetTRTRodDecoder = TRT_RodDecoder(name = "%sTRTRodDecoder%s" %(algNamePrefix, signature),
                                                     LoadCompressTableDB = True)#(globalflags.DataSource() != 'geant4'))
-- 
GitLab


From 690e96f3a6c27d0033745437fd62b153efc3d6ec Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Wed, 15 Apr 2020 08:48:21 +0000
Subject: [PATCH 09/19] copyright update

---
 .../InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
index c4851c807a51..f4dda209ddc4 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/TRT_RIO_Maker.cxx
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
-- 
GitLab


From 5caa257fba01f3c2eb797cbe8f23bb53a40e5c7e Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Wed, 15 Apr 2020 08:55:07 +0000
Subject: [PATCH 10/19] Update InDetTrigConfigRecLoadTools.py

---
 .../InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
index ef1ccc1e80ab..487189bfc193 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecLoadTools.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 
 from __future__ import print_function
-- 
GitLab


From cc858370b9924538548f4c8bf27d677c64fd646a Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Wed, 15 Apr 2020 08:56:49 +0000
Subject: [PATCH 11/19] Update InDetTrigConfigRecPreProcessing.py

---
 .../python/InDetTrigConfigRecPreProcessing.py                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
index 923834ad6c63..422959bc8289 100755
--- a/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
+++ b/InnerDetector/InDetExample/InDetTrigRecExample/python/InDetTrigConfigRecPreProcessing.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from __future__ import print_function
 
-- 
GitLab


From e5a4e896e0576bb344d0d05d7848b5fb7fdfe179 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Wed, 15 Apr 2020 08:57:36 +0000
Subject: [PATCH 12/19] Update TRT_RIO_Maker.h

---
 .../InDetPrepRawDataFormation/TRT_RIO_Maker.h                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
index ac547b88d070..db0c7def4a38 100644
--- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
+++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/InDetPrepRawDataFormation/TRT_RIO_Maker.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 /**
-- 
GitLab


From c49af61a99de20e4c06de3a81b7171a957d7e15e Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Wed, 15 Apr 2020 08:58:10 +0000
Subject: [PATCH 13/19] Update InDetPT.py

---
 Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index 10ac61321fcd..c2ee4e7ce818 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -1,4 +1,4 @@
-#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 #           Setup of precision tracking
 
-- 
GitLab


From 3290563879385096760d3c4f788a1bf90fe6e7dc Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Wed, 15 Apr 2020 08:59:07 +0000
Subject: [PATCH 14/19] Update InDetSetup.py

---
 Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
index 532ac7015357..66c26cb24164 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetSetup.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaCommon.Include import include
-- 
GitLab


From 9e5384e00ddddef5e1e1dcb412d53587e75f0522 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Wed, 15 Apr 2020 08:59:41 +0000
Subject: [PATCH 15/19] Update InDetTrigCollectionKeys.py

---
 .../TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py
index 19266585d844..23e3c1506a13 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetTrigCollectionKeys.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
 #----------------------------------------------------------------------------------------------------------
-- 
GitLab


From 686be9928a22d96ea392601b83b1cd4708be2fb6 Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch>
Date: Wed, 15 Apr 2020 09:00:32 +0000
Subject: [PATCH 16/19] Update PrecisionElectronRecoSequences.py

---
 .../HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
index bdfc76514e46..aba42d585d80 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Electron/PrecisionElectronRecoSequences.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 #
 
 from AthenaCommon.CFElements import parOR
-- 
GitLab


From dd2c038dd87dfbfffda4cc703fc54f742a706dec Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Thu, 16 Apr 2020 16:57:24 +0200
Subject: [PATCH 17/19] Add taus into TRT extension

---
 Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
index 4a3af1d692b0..a8877d432fe3 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/InDetPT.py
@@ -77,8 +77,10 @@ def makeInDetPrecisionTracking( whichSignature,
   outPTTrackParticles     = "%sTrack_%s_%s"            %(outputTrackPrefixName, remapSuffix( whichSignature ), 'IDTrig')
 
 
-  # disable the TRT extension at the moment for bjets and muons
-  if "electron" in whichSignature : 
+#  # disable the TRT extension at the moment for bjets and muons
+  if "electron" in whichSignature :
+      doTRTextension = True
+  elif "tau" in whichSignature :
       doTRTextension = True
   else : 
       doTRTextension = False
-- 
GitLab


From 79899ae3247e948db4a75dc751beb41091d5038f Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Thu, 16 Apr 2020 16:58:01 +0200
Subject: [PATCH 18/19] Fix TRT extension (even for slices where this is
 disabled, b-jets and muon)

---
 .../Bjet/BjetTrackingConfiguration.py         |  6 +++---
 .../python/HLTMenuConfig/Muon/MuonSetup.py    | 19 +++++++++----------
 .../HLTMenuConfig/Tau/TauRecoSequences.py     |  4 ++--
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py
index 2dd7b646b333..a0f95d98d7dc 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Bjet/BjetTrackingConfiguration.py
@@ -1,5 +1,5 @@
 
-from AthenaCommon.CFElements import parOR
+from AthenaCommon.CFElements import seqAND
 #from AthenaCommon.Constants import DEBUG
 
 def getSecondStageBjetTracking( inputRoI ):
@@ -9,12 +9,12 @@ def getSecondStageBjetTracking( inputRoI ):
     from TrigInDetConfig.InDetSetup import makeInDetAlgs
     viewAlgs = makeInDetAlgs( whichSignature='Jet',separateTrackParticleCreator="_Bjet", rois=inputRoI )
 
-    algSequence.append( parOR("SecondStageFastTrackingSequence",viewAlgs) )
+    algSequence.append( seqAND("SecondStageFastTrackingSequence",viewAlgs) )
 
     # Precision Tracking
     from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking
 
-    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "bjet", inputFTFtracks="TrigFastTrackFinder_Tracks_Bjet" )
+    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "bjet", rois=inputRoI, inputFTFtracks="TrigFastTrackFinder_Tracks_Bjet" )
     algSequence += PTAlgs
 
     return [ algSequence, PTTracks, PTTrackParticles ]
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index 44e1869783db..cbdc0a709938 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -533,11 +533,11 @@ def muEFCBRecoSequence( RoIs, name ):
   #Pass verifier as an argument and it will automatically append necessary DataObjects
   #@NOTE: Don't provide any verifier if loaded in the same view as FTF
   if 'FS' in name:
-    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonFS", inputFTFtracks=TrackCollection)
-    PTSeq = seqAND("precisionTrackingInMuonsFS", PTAlgs  )
+    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonFS", rois = RoIs, verifier = False, inputFTFtracks=TrackCollection)
+    PTSeq = parOR("precisionTrackingInMuonsFS", PTAlgs  )
   else:
-    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muon",  ViewVerifyTrk, inputFTFtracks= TrackCollection)
-    PTSeq = seqAND("precisionTrackingInMuons", PTAlgs  )
+    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muon", rois = RoIs,  verifier = ViewVerifyTrk, inputFTFtracks= TrackCollection)
+    PTSeq = parOR("precisionTrackingInMuons", PTAlgs  )
   #Get last tracks from the list as input for other alg
 
   muEFCBRecoSequence += PTSeq
@@ -630,8 +630,8 @@ def muEFInsideOutRecoSequence(RoIs, name):
 
     from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking
     #When run in a different view than FTF some data dependencies needs to be loaded through verifier
-    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonLate",  inputFTFtracks= TrackCollection)
-    PTSeq = seqAND("precisionTrackingInLateMuons", PTAlgs  )
+    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonLate", rois=RoIs, inputFTFtracks= TrackCollection)
+    PTSeq = parOR("precisionTrackingInLateMuons", PTAlgs  )
 
     efmuInsideOutRecoSequence += PTSeq
     trackParticles = PTTrackParticles[-1]
@@ -689,8 +689,7 @@ def efmuisoRecoSequence( RoIs, Muons ):
 
   # ATR-20453
   # Until such time as FS and RoI collections do not interfere, a hacky fix
-  #from AthenaCommon.CFElements import parOR
-  from AthenaCommon.CFElements import seqAND
+  from AthenaCommon.CFElements import seqAND,parOR
 
   # ATR-20453
   # Until such time as FS and RoI collections do not interfere, a hacky fix
@@ -713,9 +712,9 @@ def efmuisoRecoSequence( RoIs, Muons ):
   PTTrackParticles = [] #List of TrackParticleKeys
   
   from TrigInDetConfig.InDetPT import makeInDetPrecisionTracking
-  PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonIso", inputFTFtracks=TrackCollection)
+  PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( "muonIso", rois=RoIs, inputFTFtracks=TrackCollection)
 
-  PTSeq = seqAND("precisionTrackingInMuonsIso", PTAlgs  )
+  PTSeq = parOR("precisionTrackingInMuonsIso", PTAlgs  )
   efmuisoRecoSequence += PTSeq
 
   # set up algs
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
index fb1e6c239bb3..f7bc9acb4092 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Tau/TauRecoSequences.py
@@ -232,8 +232,8 @@ def tauIdTrackSequence( RoIs , name):
     elif "EF" in name:
       precName = 'tauEF'
 
-    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( precName,  False, inputFTFtracks= TrackCollection )
-    PTSeq = seqAND("precisionTrackingIn"+precName, PTAlgs  )
+    PTTracks, PTTrackParticles, PTAlgs = makeInDetPrecisionTracking( precName,  verifier = False, rois = RoIs, inputFTFtracks= TrackCollection )
+    PTSeq = parOR("precisionTrackingIn"+precName, PTAlgs  )
 
     #Get last tracks from the list as input for other alg       
     tauIdTrackSequence += PTSeq
-- 
GitLab


From 8e6d756025c3b91d3cfd28382e1d3c2e7b81ef3a Mon Sep 17 00:00:00 2001
From: Stewart Martin-Haugh <smh@cern.ch>
Date: Thu, 16 Apr 2020 17:33:11 +0200
Subject: [PATCH 19/19] Remove unused import

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

diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index cbdc0a709938..bf472ceee613 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -482,7 +482,7 @@ def muEFCBRecoSequence( RoIs, name ):
   global TrackParticlesName
 
   from AthenaCommon import CfgMgr
-  from AthenaCommon.CFElements import parOR, seqAND
+  from AthenaCommon.CFElements import parOR
   from MuonCombinedRecExample.MuonCombinedAlgs import MuonCombinedInDetCandidateAlg, MuonCombinedAlg, MuonCreatorAlg
   from MuonCombinedAlgs.MuonCombinedAlgsMonitoring import MuonCreatorAlgMonitoring
 
@@ -590,7 +590,7 @@ def muEFCBRecoSequence( RoIs, name ):
 
 def muEFInsideOutRecoSequence(RoIs, name):
 
-  from AthenaCommon.CFElements import parOR, seqAND
+  from AthenaCommon.CFElements import parOR
   from AthenaCommon import CfgMgr
 
   from MuonRecExample.MuonStandalone import MooSegmentFinderAlg
-- 
GitLab