Merge branch 'idtrig-fix-summarytool-in-CA-jO' into 'master'

Idtrig fix summarytool in CA jobOptions

See merge request atlas/athena!58793

InnerDetector/InDetConfig/python/InDetTrackHoleSearchConfig.py

@@ -33,17 +33,17 @@ def TrigHoleSearchToolCfg(flags, name="InDetTrigHoleSearchTool", **kwargs):
   result = ComponentAccumulator()
 
   if 'Extrapolator' not in kwargs:
-      from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
-      extrapolatorTool = result.popToolsAndMerge( InDetExtrapolatorCfg( flags, name="InDetTrigExtrapolator" ) )
-      result.addPublicTool(extrapolatorTool)
-      kwargs.setdefault("Extrapolator", extrapolatorTool)
+    from TrkConfig.AtlasExtrapolatorConfig import InDetExtrapolatorCfg
+    extrapolator = result.popToolsAndMerge(InDetExtrapolatorCfg(flags, name="InDetTrigExtrapolator"))  
+    result.addPublicTool(extrapolator)
+    kwargs.setdefault("Extrapolator", extrapolator)
 
   from SCT_ConditionsTools.SCT_ConditionsToolsConfig import SCT_ConditionsSummaryToolCfg
   sctCondTool = result.popToolsAndMerge(SCT_ConditionsSummaryToolCfg(flags, withFlaggedCondTool=False, withByteStreamErrorsTool=False))
 
   from InDetConfig.InDetTestPixelLayerConfig import InDetTrigTestPixelLayerToolCfg
   pixelLayerTool = result.popToolsAndMerge(InDetTrigTestPixelLayerToolCfg(flags))
-
+  
   #create InDetTrigBoundaryCheckToolCfg with these settings
   if 'BoundaryCheckTool' not in kwargs:
     from InDetConfig.InDetBoundaryCheckToolConfig import InDetBoundaryCheckToolCfg
@@ -55,6 +55,8 @@ def TrigHoleSearchToolCfg(flags, name="InDetTrigHoleSearchTool", **kwargs):
                                                                           ))
     kwargs.setdefault('BoundaryCheckTool', BoundaryCheckTool)
 
+  kwargs.setdefault("CountDeadModulesAfterLastHit", True)
+
   indet_hole_search_tool = CompFactory.InDet.InDetTrackHoleSearchTool(name, **kwargs)
   result.setPrivateTools(indet_hole_search_tool)
   return result
@@ -114,4 +116,4 @@ def CombinedMuonIDHoleSearchCfg(flags, name = 'CombinedMuonIDHoleSearch', **kwar
     kwargs.setdefault('BoundaryCheckTool', BoundaryCheckTool)
   result.setPrivateTools(result.popToolsAndMerge(InDetTrackHoleSearchToolCfg(flags, name, **kwargs)))
   return result
- 
\ No newline at end of file
+

InnerDetector/InDetConfig/python/InDetTrackSummaryHelperToolConfig.py

@@ -65,7 +65,7 @@ def TrigTrackSummaryHelperToolCfg(flags, name="InDetTrigSummaryHelper", **kwargs
   #can always set HoleSearchTool - the actual search is controlled by TrackSummaryTool cfg
   if "HoleSearch" not in kwargs:
     from InDetConfig.InDetTrackHoleSearchConfig import TrigHoleSearchToolCfg
-    holeSearchTool = result.popToolsAndMerge( TrigHoleSearchToolCfg(flags) )
+    holeSearchTool = result.popToolsAndMerge( TrigHoleSearchToolCfg(flags))
     result.addPublicTool(holeSearchTool)
     kwargs.setdefault("HoleSearch", holeSearchTool)
 
@@ -74,7 +74,7 @@ def TrigTrackSummaryHelperToolCfg(flags, name="InDetTrigSummaryHelper", **kwargs
     from TRT_ConditionsServices.TRT_ConditionsServicesConfig import TRT_StrawStatusSummaryToolCfg
     TRT_StrawStatusSummaryTool = result.popToolsAndMerge( TRT_StrawStatusSummaryToolCfg(flags) )
     kwargs.setdefault("TRTStrawSummarySvc", TRT_StrawStatusSummaryTool)
-
+      
   kwargs.setdefault("usePixel", flags.Detector.EnablePixel)
   kwargs.setdefault("useSCT", flags.Detector.EnableSCT)
 

InnerDetector/InDetRecTools/InDetTrackHoleSearch/InDetTrackHoleSearch/InDetTrackHoleSearchTool.h

@@ -12,6 +12,7 @@
 #include "AthenaBaseComps/AthAlgTool.h"
 #include "GaudiKernel/ToolHandle.h"
 #include "GaudiKernel/EventContext.h"
+#include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkToolInterfaces/ITrackHoleSearchTool.h"
 #include "TrkToolInterfaces/IBoundaryCheckTool.h"
 #include "TrkEventPrimitives/ParticleHypothesis.h"
@@ -26,8 +27,7 @@ class AtlasID;
 namespace InDet {class IInDetTestPixelLayerTool; }
 class IGeoModelSvc;
 
-namespace Trk { class RIO_OnTrack; class TrackStateOnSurface; class Track;}
-namespace Trk { class IExtrapolator;}
+namespace Trk { class RIO_OnTrack; class TrackStateOnSurface; class Track; }
 
 namespace InDetDD { class SiDetectorElement; }
 

InnerDetector/InDetRecTools/InDetTrackHoleSearch/src/InDetTrackHoleSearchTool.cxx

@@ -16,7 +16,6 @@
 #include "TrkTrackSummary/TrackSummary.h"
 #include "TrkMeasurementBase/MeasurementBase.h"
 #include "TrkEventUtils/TrackStateOnSurfaceComparisonFunction.h"
-#include "TrkExInterfaces/IExtrapolator.h"
 #include "TrkGeometry/TrackingGeometry.h"
 #include "TrkDetDescrUtils/SharedObject.h"
 #include "TrkGeometry/TrackingVolume.h"
@@ -35,7 +34,7 @@ InDet::InDetTrackHoleSearchTool::InDetTrackHoleSearchTool(const std::string& t,
                                                           const IInterface*  p) :
   AthAlgTool(t,n,p),
   m_atlasId(nullptr),
-  m_extrapolator("Trk::Extrapolator"),
+  m_extrapolator("Trk::Extrapolator/InDetExtrapolator"),
   m_extendedListOfHoles(false),
   m_cosmic(false),
   m_warning(0) {
@@ -59,8 +58,8 @@ StatusCode InDet::InDetTrackHoleSearchTool::initialize() {
   ATH_CHECK(detStore()->retrieve(m_atlasId, "AtlasID"));
 
   // Get TrkExtrapolator from ToolService
+  ATH_MSG_INFO("Retrieving tool " << m_extrapolator);
   ATH_CHECK(m_extrapolator.retrieve());
-  ATH_MSG_INFO("Retrieved tool " << m_extrapolator);
 
   if (m_extendedListOfHoles) ATH_MSG_INFO("Search for extended list of holes ");
 

Tracking/TrkConfig/python/TrkParticleCreatorConfig.py

@@ -88,8 +88,8 @@ def InDetTrigParticleCreatorToolFTFCfg(flags, name="InDetTrigParticleCreatorTool
         kwargs.setdefault("TrackToVertex", result.popToolsAndMerge(TrackToVertexCfg(flags)))
 
     if "TrackSummaryTool" not in kwargs:
-        from TrkConfig.TrkTrackSummaryToolConfig import InDetTrigTrackSummaryToolCfg
-        TrackSummaryTool = result.popToolsAndMerge( InDetTrigTrackSummaryToolCfg(flags, name="InDetTrigFastTrackSummaryTool") )
+        from TrkConfig.TrkTrackSummaryToolConfig import InDetTrigFastTrackSummaryToolCfg
+        TrackSummaryTool = result.popToolsAndMerge( InDetTrigFastTrackSummaryToolCfg(flags) )
         result.addPublicTool(TrackSummaryTool)
         kwargs.setdefault("TrackSummaryTool", TrackSummaryTool)
 

Trigger/TrigTools/TrigInDetConfig/python/TrigInDetConfig.py

@@ -103,6 +103,7 @@ def pixelDataPrepCfg(flags, roisKey, signature):
                                                      isRoI_Seeded = True,
                                                      RoIs         = roisKey,
                                                      RDOCacheKey  = InDetCacheNames.PixRDOCacheKey,
+                                                     BSErrorsCacheKey = InDetCacheNames.PixBSErrCacheKey,
                                                      RegSelTool   = RegSelTool_Pixel)
 
     acc.addEventAlgo(InDetPixelRawDataProvider)
@@ -124,6 +125,7 @@ def sctDataPrepCfg(flags, roisKey, signature):
     sctProviderArgs["isRoI_Seeded"] = True
     sctProviderArgs["RoIs"] = roisKey
     sctProviderArgs["RDOCacheKey"] = InDetCacheNames.SCTRDOCacheKey
+    sctProviderArgs["BSErrCacheKey"] = InDetCacheNames.SCTBSErrCacheKey
     sctProviderArgs["RegSelTool"] = RegSelTool_SCT
     acc.merge(SCTRawDataProviderCfg(flags, suffix=signature, **sctProviderArgs))
     # load the SCTEventFlagWriter
@@ -173,8 +175,8 @@ def trtDataPrep(flags, roisKey, signature):
 def ftfCfg(flags, roisKey, signature, signatureName):
   acc = ComponentAccumulator()
 
-  from TrkConfig.TrkTrackSummaryToolConfig import InDetTrigTrackSummaryToolCfg
-  TrackSummaryTool = acc.popToolsAndMerge( InDetTrigTrackSummaryToolCfg(flags, name="InDetTrigFastTrackSummaryTool") )
+  from TrkConfig.TrkTrackSummaryToolConfig import InDetTrigFastTrackSummaryToolCfg
+  TrackSummaryTool = acc.popToolsAndMerge( InDetTrigFastTrackSummaryToolCfg(flags) )
   acc.addPublicTool(TrackSummaryTool)
 
   from InDetConfig.SiTrackMakerConfig import TrigSiTrackMaker_xkCfg
@@ -284,15 +286,15 @@ def trigInDetFastTrackingCfg( inflags, roisKey="EMRoIs", signatureName='', in_vi
   if in_view:
     verifier = CompFactory.AthViews.ViewDataVerifier( name = 'VDVInDetFTF'+signature,
                                                       DataObjects= [('xAOD::EventInfo', 'StoreGateSvc+EventInfo'),
-                                                                    ('InDet::PixelClusterContainerCache', 'PixelTrigClustersCache'),
-                                                                    ('PixelRDO_Cache', 'PixRDOCache'),
-                                                                    ('InDet::SCT_ClusterContainerCache', 'SCT_ClustersCache'),
-                                                                    ('SCT_RDO_Cache', 'SctRDOCache'),
+                                                                    ('InDet::PixelClusterContainerCache', InDetCacheNames.Pixel_ClusterKey),
+                                                                    ('PixelRDO_Cache', InDetCacheNames.PixRDOCacheKey),
+                                                                    ('InDet::SCT_ClusterContainerCache', InDetCacheNames.SCT_ClusterKey),
+                                                                    ('SCT_RDO_Cache', InDetCacheNames.SCTRDOCacheKey),
+                                                                    ('SpacePointCache', InDetCacheNames.SpacePointCachePix),
+                                                                    ('SpacePointCache', InDetCacheNames.SpacePointCacheSCT),
                                                                     ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.PixBSErrCacheKey ),
                                                                     ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTBSErrCacheKey ),
                                                                     ( 'IDCInDetBSErrContainer_Cache' , InDetCacheNames.SCTFlaggedCondCacheKey ),
-                                                                    ('SpacePointCache', 'PixelSpacePointCache'),
-                                                                    ('SpacePointCache', 'SctSpacePointCache'),
                                                                     ('xAOD::EventInfo', 'EventInfo'),
                                                                     ('TrigRoiDescriptorCollection', str(roisKey)),
                                                                     ( 'TagInfo' , 'DetectorStore+ProcessingTags' )] )