Fix Views Workflow

InnerDetector/InDetEventCnv/PixelRawDataByteStreamCnv/src/PixelRawDataProvider.cxx

@@ -110,6 +110,7 @@ StatusCode PixelRawDataProvider::execute() {
   if(!ExternalCacheMode) rdoContainer = std::make_unique<PixelRDO_Container>(m_pixel_id->wafer_hash_max()); 
   else{
     SG::UpdateHandle<PixelRDO_Cache> updateh(m_rdoCacheKey);
+    if(!updateh.isValid()) ATH_MSG_FATAL("Failure to retrieve cache " << m_rdoCacheKey.key());
     rdoContainer = std::make_unique<PixelRDO_Container>(updateh.ptr());
     ATH_MSG_DEBUG("Created container " << m_rdoContainerKey.key() << " using external cache " << m_rdoCacheKey.key());
   }

Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py

@@ -7,11 +7,13 @@ include("TrigUpgradeTest/testHLT_MT.py")
 viewTest = opt.enableViews   # from testHLT_MT.py
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
+AthViewSeq = topSequence.AthViewSeq
 
 isData = False
 if globalflags.InputFormat.is_bytestream():
   isData = True
 
+InDetCacheCreatorTrigViews= AthViewSeq.InDetCacheCreatorTrigViews
 if viewTest:
   viewMaker = CfgMgr.AthViews__RoiCollectionToViews( "viewMaker" )
   viewMaker.ViewBaseName = "testView"
@@ -19,7 +21,7 @@ if viewTest:
   viewMaker.InputRoICollection = "EMRoIs"
   viewMaker.OutputRoICollection = "EMViewRoIs"
   viewMaker.ViewFallThrough = True
-  topSequence += viewMaker
+  topSequence.AthViewSeq += viewMaker
 
 
 from InDetRecExample.InDetKeys import InDetKeys
@@ -29,6 +31,8 @@ allViewAlgorithms = None
 if viewTest:
   allViewAlgorithms = topSequence.allViewAlgorithms
 
+
+
 if TriggerFlags.doID:
   #workaround to prevent online trigger folders to be enabled
   from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
@@ -82,9 +86,9 @@ if TriggerFlags.doID:
       allViewAlgorithms += InDetPixelRawDataProvider
       allViewAlgorithms.InDetPixelRawDataProvider.isRoI_Seeded = True
       allViewAlgorithms.InDetPixelRawDataProvider.RoIs = "EMViewRoIs"
-      allViewAlgorithms.InDetPixelRawDataProvider.RDOCacheKey = topSequence.InDetCacheCreatorTrigViews.PixRDOCacheKey
+      allViewAlgorithms.InDetPixelRawDataProvider.RDOCacheKey = InDetCacheCreatorTrigViews.PixRDOCacheKey
       svcMgr.ViewAlgPool.TopAlg += [ "InDetPixelRawDataProvider" ]
-      topSequence.viewMaker.AlgorithmNameSequence += [ "InDetPixelRawDataProvider" ]
+      AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetPixelRawDataProvider" ]
     else:
       topSequence += InDetPixelRawDataProvider
       topSequence.InDetPixelRawDataProvider.isRoI_Seeded = True
@@ -119,9 +123,9 @@ if TriggerFlags.doID:
       allViewAlgorithms += InDetSCTRawDataProvider
       allViewAlgorithms.InDetSCTRawDataProvider.isRoI_Seeded = True
       allViewAlgorithms.InDetSCTRawDataProvider.RoIs = "EMViewRoIs"
-      allViewAlgorithms.InDetSCTRawDataProvider.RDOCacheKey = topSequence.InDetCacheCreatorTrigViews.SCTRDOCacheKey
+      allViewAlgorithms.InDetSCTRawDataProvider.RDOCacheKey = InDetCacheCreatorTrigViews.SCTRDOCacheKey
       svcMgr.ViewAlgPool.TopAlg += [ "InDetSCTRawDataProvider" ]
-      topSequence.viewMaker.AlgorithmNameSequence += [ "InDetSCTRawDataProvider" ]
+      AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetSCTRawDataProvider" ]
     else:
       topSequence += InDetSCTRawDataProvider
       topSequence.InDetSCTRawDataProvider.isRoI_Seeded = True
@@ -159,7 +163,7 @@ if TriggerFlags.doID:
       allViewAlgorithms.InDetTRTRawDataProvider.isRoI_Seeded = True
       allViewAlgorithms.InDetTRTRawDataProvider.RoIs = "EMViewRoIs"
       svcMgr.ViewAlgPool.TopAlg += [ "InDetTRTRawDataProvider" ]
-      topSequence.viewMaker.AlgorithmNameSequence += [ "InDetTRTRawDataProvider" ]
+      AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetTRTRawDataProvider" ]
     else:
       topSequence += InDetTRTRawDataProvider
       topSequence.InDetTRTRawDataProvider.isRoI_Seeded = True
@@ -202,9 +206,9 @@ if TriggerFlags.doID:
     allViewAlgorithms += InDetPixelClusterization
     allViewAlgorithms.InDetPixelClusterization.isRoI_Seeded = True
     allViewAlgorithms.InDetPixelClusterization.RoIs = "EMViewRoIs"
-    allViewAlgorithms.InDetPixelClusterization.ClusterContainerCacheKey = topSequence.InDetCacheCreatorTrigViews.Pixel_ClusterKey 
+    allViewAlgorithms.InDetPixelClusterization.ClusterContainerCacheKey = InDetCacheCreatorTrigViews.Pixel_ClusterKey 
     svcMgr.ViewAlgPool.TopAlg += [ "InDetPixelClusterization" ]
-    topSequence.viewMaker.AlgorithmNameSequence += [ "InDetPixelClusterization" ]
+    AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetPixelClusterization" ]
   else:
     topSequence += InDetPixelClusterization
     topSequence.InDetPixelClusterization.isRoI_Seeded = True
@@ -236,9 +240,9 @@ if TriggerFlags.doID:
     allViewAlgorithms += InDetSCT_Clusterization
     allViewAlgorithms.InDetSCT_Clusterization.isRoI_Seeded = True
     allViewAlgorithms.InDetSCT_Clusterization.RoIs = "EMViewRoIs"
-    allViewAlgorithms.InDetSCT_Clusterization.ClusterContainerCacheKey = topSequence.InDetCacheCreatorTrigViews.SCT_ClusterKey 
+    allViewAlgorithms.InDetSCT_Clusterization.ClusterContainerCacheKey = InDetCacheCreatorTrigViews.SCT_ClusterKey 
     svcMgr.ViewAlgPool.TopAlg += [ "InDetSCT_Clusterization" ]
-    topSequence.viewMaker.AlgorithmNameSequence += [ "InDetSCT_Clusterization" ]
+    AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetSCT_Clusterization" ]
   else:
     topSequence += InDetSCT_Clusterization
     topSequence.InDetSCT_Clusterization.isRoI_Seeded = True
@@ -274,9 +278,9 @@ if TriggerFlags.doID:
     allViewAlgorithms.TrigFastTrackFinder_eGamma.isRoI_Seeded = True
     allViewAlgorithms.TrigFastTrackFinder_eGamma.RoIs = "EMViewRoIs"
     svcMgr.ViewAlgPool.TopAlg += [ "InDetSiTrackerSpacePointFinder", "TrigFastTrackFinder_eGamma" ]
-    topSequence.viewMaker.AlgorithmNameSequence += [ "InDetSiTrackerSpacePointFinder", "TrigFastTrackFinder_eGamma" ]
-    InDetSiTrackerSpacePointFinder.SpacePointCacheSCT = topSequence.InDetCacheCreatorTrigViews.SpacePointCacheSCT
-    InDetSiTrackerSpacePointFinder.SpacePointCachePix = topSequence.InDetCacheCreatorTrigViews.SpacePointCachePix
+    AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetSiTrackerSpacePointFinder", "TrigFastTrackFinder_eGamma" ]
+    InDetSiTrackerSpacePointFinder.SpacePointCacheSCT = InDetCacheCreatorTrigViews.SpacePointCacheSCT
+    InDetSiTrackerSpacePointFinder.SpacePointCachePix = InDetCacheCreatorTrigViews.SpacePointCachePix
   else:
     topSequence += InDetSiTrackerSpacePointFinder
     theFTF.RoIs = "EMRoIs"
@@ -294,7 +298,7 @@ if TriggerFlags.doCalo:
     algo.RoIs="EMViewRoIs"
     allViewAlgorithms += algo
     svcMgr.ViewAlgPool.TopAlg += [ "testFastAlgo" ]
-    topSequence.viewMaker.AlgorithmNameSequence += [ "testFastAlgo" ]
+    AthViewSeq.viewMaker.AlgorithmNameSequence += [ "testFastAlgo" ]
   else:
     algo.RoIs="EMRoIs"
     topSequence += algo

Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py

@@ -30,15 +30,17 @@ include("InDetRecExample/InDetRecConditionsAccess.py")
 viewTest = opt.enableViews   # from testHLT_MT.py
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
+AthViewSeq = None
 if viewTest:
   allViewAlgorithms = topSequence.allViewAlgorithms
+  AthViewSeq = topSequence.AthViewSeq
 
 from InDetRecExample.InDetKeys import InDetKeys
 
 # provide a minimal menu information
-
-topSequence.L1DecoderTest.ctpUnpacker.OutputLevel=DEBUG
-topSequence.L1DecoderTest.roiUnpackers[0].OutputLevel=DEBUG
+if globalflags.InputFormat.is_bytestream():
+   topSequence.L1DecoderTest.ctpUnpacker.OutputLevel=DEBUG
+   topSequence.L1DecoderTest.roiUnpackers[0].OutputLevel=DEBUG
 testChains = ["HLT_e3_etcut", "HLT_e5_etcut", "HLT_e7_etcut", "HLT_2e3_etcut", "HLT_e3e5_etcut"]
 
 
@@ -97,7 +99,7 @@ else:
   topSequence += theFastCaloAlgo
 
 
-
+InDetCacheCreatorTrigViews = topSequence.AthViewSeq.InDetCacheCreatorTrigViews
 
 #Pixel
 
@@ -117,7 +119,7 @@ from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawData
 InDetPixelRawDataProvider = PixelRawDataProvider(name         = "InDetPixelRawDataProvider",
                                                  RDOKey       = InDetKeys.PixelRDOs(),
                                                  ProviderTool = InDetPixelRawDataProviderTool,
-                                                 RDOCacheKey  = topSequence.InDetCacheCreatorTrigViews.PixRDOCacheKey,
+                                                 RDOCacheKey  = InDetCacheCreatorTrigViews.PixRDOCacheKey,
                                                  isRoI_Seeded = True,
                                                  OutputLevel = INFO )
 
@@ -141,7 +143,7 @@ InDetSCTRawDataProvider = SCTRawDataProvider(name         = "InDetSCTRawDataProv
                                              ProviderTool = InDetSCTRawDataProviderTool,
                                              isRoI_Seeded = True )
 
-InDetSCTRawDataProvider.RDOCacheKey = topSequence.InDetCacheCreatorTrigViews.SCTRDOCacheKey
+InDetSCTRawDataProvider.RDOCacheKey = InDetCacheCreatorTrigViews.SCTRDOCacheKey
 
 #TRT
 from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
@@ -208,7 +210,7 @@ InDetPixelClusterization = InDet__PixelClusterization(name                    =
                                                       isRoI_Seeded            = True)
 
 if viewTest:
-   InDetPixelClusterization.ClusterContainerCacheKey = topSequence.InDetCacheCreatorTrigViews.Pixel_ClusterKey
+   InDetPixelClusterization.ClusterContainerCacheKey = InDetCacheCreatorTrigViews.Pixel_ClusterKey
 
 #
 # --- SCT_ClusteringTool (public)
@@ -232,7 +234,7 @@ InDetSCT_Clusterization = InDet__SCT_Clusterization(name                    = "I
                                                     isRoI_Seeded            = True )
 
 if viewTest:
-   InDetSCT_Clusterization.ClusterContainerCacheKey = topSequence.InDetCacheCreatorTrigViews.SCT_ClusterKey
+   InDetSCT_Clusterization.ClusterContainerCacheKey = InDetCacheCreatorTrigViews.SCT_ClusterKey
 
 #Space points and FTF
 
@@ -253,8 +255,8 @@ InDetSiTrackerSpacePointFinder = InDet__SiTrackerSpacePointFinder(name
                                                                   ProcessOverlaps        = DetFlags.haveRIO.SCT_on(),
                                                                   OutputLevel=DEBUG)
 if viewTest:
-   InDetSiTrackerSpacePointFinder.SpacePointCacheSCT = topSequence.InDetCacheCreatorTrigViews.SpacePointCacheSCT
-   InDetSiTrackerSpacePointFinder.SpacePointCachePix = topSequence.InDetCacheCreatorTrigViews.SpacePointCachePix
+   InDetSiTrackerSpacePointFinder.SpacePointCacheSCT = InDetCacheCreatorTrigViews.SpacePointCacheSCT
+   InDetSiTrackerSpacePointFinder.SpacePointCachePix = InDetCacheCreatorTrigViews.SpacePointCachePix
 
 from TrigFastTrackFinder.TrigFastTrackFinder_Config import TrigFastTrackFinder_eGamma
 theFTF = TrigFastTrackFinder_eGamma()

Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py

@@ -339,6 +339,9 @@ else:
 # ----------------------------------------------------------------
 # Setup Views
 # ----------------------------------------------------------------
+viewSeq = AthSequencer("AthViewSeq", Sequential = True)
+topSequence+=viewSeq
+
 if opt.enableViews:
     log.info('Setting up Views...')
     # Make a separate alg pool for the view algs
@@ -354,7 +357,7 @@ if opt.enableViews:
                                         SCTRDOCacheKey       = "SctRDOCache",
                                         PixRDOCacheKey = "PixRDOCache",
                                         OutputLevel=DEBUG)
-    topSequence += InDetCacheCreatorTrigViews    
+    viewSeq += InDetCacheCreatorTrigViews    
     
     # Set of view algs
     allViewAlgs = AthSequencer( "allViewAlgorithms" )
@@ -380,7 +383,7 @@ else:
                                         SpacePointCachePix = "",
                                         SpacePointCacheSCT   = "",
                                         OutputLevel=INFO)
-    topSequence += InDetCacheCreatorTrigViews    
+    viewSeq += InDetCacheCreatorTrigViews    
 # ---------------------------------------------------------------
 # Monitoring
 # ---------------------------------------------------------------