diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py index f525f9d68e3395cb475e8f01d9eb945f68bd5196..7e7beee1babe1f910a1ab22ad28d58fe4cfb22cf 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py @@ -13,25 +13,23 @@ isData = False if globalflags.InputFormat.is_bytestream(): isData = True -InDetCacheCreatorTrigViews= AthViewSeq.InDetCacheCreatorTrigViews +InDetCacheCreatorTrigViews = AthViewSeq.InDetCacheCreatorTrigViews +allViewAlgorithms = None + if viewTest: - viewMaker = CfgMgr.AthViews__RoiCollectionToViews( "viewMaker" ) + allViewAlgorithms = AthViewSeq.allViewAlgorithms + + viewMaker = AthViewSeq.viewMaker viewMaker.ViewBaseName = "testView" - viewMaker.AlgPoolName = svcMgr.ViewAlgPool.name() viewMaker.InputRoICollection = "EMRoIs" + viewMaker.ViewNodeName = allViewAlgorithms.name() viewMaker.OutputRoICollection = "EMViewRoIs" viewMaker.ViewFallThrough = True - topSequence.AthViewSeq += viewMaker from InDetRecExample.InDetKeys import InDetKeys -allViewAlgorithms = None -if viewTest: - allViewAlgorithms = topSequence.allViewAlgorithms - - if TriggerFlags.doID: #workaround to prevent online trigger folders to be enabled @@ -87,8 +85,6 @@ if TriggerFlags.doID: allViewAlgorithms.InDetPixelRawDataProvider.isRoI_Seeded = True allViewAlgorithms.InDetPixelRawDataProvider.RoIs = "EMViewRoIs" allViewAlgorithms.InDetPixelRawDataProvider.RDOCacheKey = InDetCacheCreatorTrigViews.PixRDOCacheKey - svcMgr.ViewAlgPool.TopAlg += [ "InDetPixelRawDataProvider" ] - AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetPixelRawDataProvider" ] else: topSequence += InDetPixelRawDataProvider topSequence.InDetPixelRawDataProvider.isRoI_Seeded = True @@ -124,8 +120,6 @@ if TriggerFlags.doID: allViewAlgorithms.InDetSCTRawDataProvider.isRoI_Seeded = True allViewAlgorithms.InDetSCTRawDataProvider.RoIs = "EMViewRoIs" allViewAlgorithms.InDetSCTRawDataProvider.RDOCacheKey = InDetCacheCreatorTrigViews.SCTRDOCacheKey - svcMgr.ViewAlgPool.TopAlg += [ "InDetSCTRawDataProvider" ] - AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetSCTRawDataProvider" ] else: topSequence += InDetSCTRawDataProvider topSequence.InDetSCTRawDataProvider.isRoI_Seeded = True @@ -162,8 +156,6 @@ if TriggerFlags.doID: allViewAlgorithms += InDetTRTRawDataProvider allViewAlgorithms.InDetTRTRawDataProvider.isRoI_Seeded = True allViewAlgorithms.InDetTRTRawDataProvider.RoIs = "EMViewRoIs" - svcMgr.ViewAlgPool.TopAlg += [ "InDetTRTRawDataProvider" ] - AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetTRTRawDataProvider" ] else: topSequence += InDetTRTRawDataProvider topSequence.InDetTRTRawDataProvider.isRoI_Seeded = True @@ -207,8 +199,6 @@ if TriggerFlags.doID: allViewAlgorithms.InDetPixelClusterization.isRoI_Seeded = True allViewAlgorithms.InDetPixelClusterization.RoIs = "EMViewRoIs" allViewAlgorithms.InDetPixelClusterization.ClusterContainerCacheKey = InDetCacheCreatorTrigViews.Pixel_ClusterKey - svcMgr.ViewAlgPool.TopAlg += [ "InDetPixelClusterization" ] - AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetPixelClusterization" ] else: topSequence += InDetPixelClusterization topSequence.InDetPixelClusterization.isRoI_Seeded = True @@ -241,8 +231,6 @@ if TriggerFlags.doID: allViewAlgorithms.InDetSCT_Clusterization.isRoI_Seeded = True allViewAlgorithms.InDetSCT_Clusterization.RoIs = "EMViewRoIs" allViewAlgorithms.InDetSCT_Clusterization.ClusterContainerCacheKey = InDetCacheCreatorTrigViews.SCT_ClusterKey - svcMgr.ViewAlgPool.TopAlg += [ "InDetSCT_Clusterization" ] - AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetSCT_Clusterization" ] else: topSequence += InDetSCT_Clusterization topSequence.InDetSCT_Clusterization.isRoI_Seeded = True @@ -277,8 +265,6 @@ if TriggerFlags.doID: allViewAlgorithms += theFTF allViewAlgorithms.TrigFastTrackFinder_eGamma.isRoI_Seeded = True allViewAlgorithms.TrigFastTrackFinder_eGamma.RoIs = "EMViewRoIs" - svcMgr.ViewAlgPool.TopAlg += [ "InDetSiTrackerSpacePointFinder", "TrigFastTrackFinder_eGamma" ] - AthViewSeq.viewMaker.AlgorithmNameSequence += [ "InDetSiTrackerSpacePointFinder", "TrigFastTrackFinder_eGamma" ] InDetSiTrackerSpacePointFinder.SpacePointCacheSCT = InDetCacheCreatorTrigViews.SpacePointCacheSCT InDetSiTrackerSpacePointFinder.SpacePointCachePix = InDetCacheCreatorTrigViews.SpacePointCachePix else: @@ -297,8 +283,6 @@ if TriggerFlags.doCalo: if ( viewTest ): algo.RoIs="EMViewRoIs" allViewAlgorithms += algo - svcMgr.ViewAlgPool.TopAlg += [ "testFastAlgo" ] - AthViewSeq.viewMaker.AlgorithmNameSequence += [ "testFastAlgo" ] else: algo.RoIs="EMRoIs" topSequence += algo diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py index 62aea32fb1eddffa3fc94b31ac9301e90658860b..e44ecc166ab75de14ede4b3cc68a912c87a045b1 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py @@ -32,8 +32,10 @@ from AthenaCommon.AlgSequence import AlgSequence topSequence = AlgSequence() AthViewSeq = None if viewTest: - allViewAlgorithms = topSequence.allViewAlgorithms + allViewAlgorithms = topSequence.AthViewSeq.allViewAlgorithms AthViewSeq = topSequence.AthViewSeq + print( dir( AthViewSeq.viewMaker ) ) + AthViewSeq.viewMaker.Enable = False from InDetRecExample.InDetKeys import InDetKeys diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py index 4c775885428186b10a931da5595550d936e5c1e2..68f47d4baed69b33e0b30ab44c2dbd18e4afeed3 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/testHLT_MT.py @@ -339,14 +339,14 @@ else: # ---------------------------------------------------------------- # Setup Views # ---------------------------------------------------------------- -viewSeq = AthSequencer("AthViewSeq", Sequential = True) -topSequence+=viewSeq +viewSeq = AthSequencer("AthViewSeq", Sequential=True, ModeOR=False, StopOverride=False) +topSequence += viewSeq if opt.enableViews: log.info('Setting up Views...') # Make a separate alg pool for the view algs - from GaudiHive.GaudiHiveConf import AlgResourcePool - svcMgr += AlgResourcePool('ViewAlgPool') + from GaudiHive.GaudiHiveConf import AlgResourcePool #BEN + svcMgr += AlgResourcePool('ViewAlgPool') #BEN #Create IdentifiableCaches from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__CacheCreator InDetCacheCreatorTrigViews = InDet__CacheCreator(name = "InDetCacheCreatorTrigViews", @@ -358,22 +358,15 @@ if opt.enableViews: PixRDOCacheKey = "PixRDOCache", OutputLevel=DEBUG) viewSeq += InDetCacheCreatorTrigViews + + # View maker alg + viewSeq += CfgMgr.AthViews__RoiCollectionToViews("viewMaker") # Set of view algs - allViewAlgs = AthSequencer( "allViewAlgorithms" ) - allViewAlgs.ModeOR = False - allViewAlgs.Sequential = True - allViewAlgs.StopOverride = False - topSequence += allViewAlgs + viewSeq += AthSequencer("allViewAlgorithms", Sequential=False, ModeOR=False, StopOverride=False) - # Filter to stop view algs from running on whole event - allViewAlgs += CfgMgr.AthPrescaler( "alwaysFail" ) - allViewAlgs.alwaysFail.PercentPass = 0.0 - # dummy alg that just says you're running in a view - # allViewAlgs += CfgMgr.AthViews__ViewTestAlg( "viewTest" ) - # svcMgr.ViewAlgPool.TopAlg += [ "viewTest" ] - # viewMaker.AlgorithmNameSequence = [ "viewTest" ] #Eventually scheduler will do this + # viewSeq.allViewAlgorithms += CfgMgr.AthViews__ViewTestAlg( "viewTest" ) else: #This is to workaround the problem CondHandle bug, this can be removed once a proper solution is made from InDetPrepRawDataFormation.InDetPrepRawDataFormationConf import InDet__CacheCreator