diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
index 9ab1a387af76b3c467c1a9963e705d104b437513..6863c93168f2e0bd4c29d6a4d969f6b0e99e9435 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py
@@ -8,6 +8,10 @@ viewTest = opt.enableViews # from testHLT_MT.py
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
+isData = False
+if globalflags.InputFormat.is_bytestream():
+ isData = True
+
if viewTest:
viewMaker = CfgMgr.AthViews__RoiCollectionToViews( "viewMaker" )
viewMaker.ViewBaseName = "testView"
@@ -21,18 +25,6 @@ if viewTest:
from InDetRecExample.InDetKeys import InDetKeys
-# if ( viewTest ):
-# allViewAlgorithms += InDetPixelRawDataProvider
-# allViewAlgorithms.InDetPixelRawDataProvider.isRoI_Seeded = True
-# allViewAlgorithms.InDetPixelRawDataProvider.RoIs = "EMViewRoIs"
-# svcMgr.ViewAlgPool.TopAlg += [ "InDetPixelRawDataProvider" ]
-# topSequence.viewMaker.AlgorithmNameSequence += [ "InDetPixelRawDataProvider" ]
-# else:
-# topSequence += InDetPixelRawDataProvider
-# topSequence.InDetPixelRawDataProvider.isRoI_Seeded = True
-# topSequence.InDetPixelRawDataProvider.RoIs = "EMRoIs"
-
-
allViewAlgorithms = None
if viewTest:
allViewAlgorithms = topSequence.allViewAlgorithms
@@ -64,112 +56,114 @@ if TriggerFlags.doID:
from InDetRecExample.InDetKeys import InDetKeys
- #Pixel
-
- from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRodDecoder
- InDetPixelRodDecoder = PixelRodDecoder(name = "InDetPixelRodDecoder")
- ToolSvc += InDetPixelRodDecoder
-
- from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawDataProviderTool
- InDetPixelRawDataProviderTool = PixelRawDataProviderTool(name = "InDetPixelRawDataProviderTool",
- Decoder = InDetPixelRodDecoder)
- ToolSvc += InDetPixelRawDataProviderTool
- if (InDetFlags.doPrintConfigurables()):
- print InDetPixelRawDataProviderTool
-
- # load the PixelRawDataProvider
- from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawDataProvider
- InDetPixelRawDataProvider = PixelRawDataProvider(name = "InDetPixelRawDataProvider",
- RDOKey = InDetKeys.PixelRDOs(),
- ProviderTool = InDetPixelRawDataProviderTool,
- OutputLevel = INFO)
-
- if ( viewTest ):
- allViewAlgorithms += InDetPixelRawDataProvider
- allViewAlgorithms.InDetPixelRawDataProvider.isRoI_Seeded = True
- allViewAlgorithms.InDetPixelRawDataProvider.RoIs = "EMViewRoIs"
- allViewAlgorithms.InDetPixelRawDataProvider.RDOCacheKey = topSequence.InDetCacheCreatorTrigViews.PixRDOCacheKey
- svcMgr.ViewAlgPool.TopAlg += [ "InDetPixelRawDataProvider" ]
- topSequence.viewMaker.AlgorithmNameSequence += [ "InDetPixelRawDataProvider" ]
- else:
- topSequence += InDetPixelRawDataProvider
- topSequence.InDetPixelRawDataProvider.isRoI_Seeded = True
- topSequence.InDetPixelRawDataProvider.RoIs = "EMRoIs"
-
-
- if (InDetFlags.doPrintConfigurables()):
- print InDetPixelRawDataProvider
-
-
- #SCT
- from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCT_RodDecoder
- InDetSCTRodDecoder = SCT_RodDecoder(name = "InDetSCTRodDecoder",
- TriggerMode = False, OutputLevel = INFO)
- ToolSvc += InDetSCTRodDecoder
-
- from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCTRawDataProviderTool
- InDetSCTRawDataProviderTool = SCTRawDataProviderTool(name = "InDetSCTRawDataProviderTool",
- Decoder = InDetSCTRodDecoder)
- ToolSvc += InDetSCTRawDataProviderTool
- if (InDetFlags.doPrintConfigurables()):
- print InDetSCTRawDataProviderTool
-
- # load the SCTRawDataProvider
- from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCTRawDataProvider
- InDetSCTRawDataProvider = SCTRawDataProvider(name = "InDetSCTRawDataProvider",
- RDOKey = InDetKeys.SCT_RDOs(),
- ProviderTool = InDetSCTRawDataProviderTool,
- OutputLevel = INFO)
-
- if ( viewTest ):
- allViewAlgorithms += InDetSCTRawDataProvider
- allViewAlgorithms.InDetSCTRawDataProvider.isRoI_Seeded = True
- allViewAlgorithms.InDetSCTRawDataProvider.RoIs = "EMViewRoIs"
- allViewAlgorithms.InDetSCTRawDataProvider.RDOCacheKey = topSequence.InDetCacheCreatorTrigViews.SCTRDOCacheKey
- svcMgr.ViewAlgPool.TopAlg += [ "InDetSCTRawDataProvider" ]
- topSequence.viewMaker.AlgorithmNameSequence += [ "InDetSCTRawDataProvider" ]
- else:
- topSequence += InDetSCTRawDataProvider
- topSequence.InDetSCTRawDataProvider.isRoI_Seeded = True
- topSequence.InDetSCTRawDataProvider.RoIs = "EMRoIs"
-
-
- #TRT
- from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
- InDetTRTCalDbSvc = TRT_CalDbSvc()
- ServiceMgr += InDetTRTCalDbSvc
-
- from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummarySvc
- InDetTRTStrawStatusSummarySvc = TRT_StrawStatusSummarySvc(name = "InDetTRTStrawStatusSummarySvc")
- ServiceMgr += InDetTRTStrawStatusSummarySvc
-
- from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRT_RodDecoder
- InDetTRTRodDecoder = TRT_RodDecoder(name = "InDetTRTRodDecoder",
- LoadCompressTableDB = True)#(globalflags.DataSource() != 'geant4'))
- ToolSvc += InDetTRTRodDecoder
+ #Only add raw data decoders to AlgSeq if we're running over raw data
+ if isData:
+ #Pixel
- from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProviderTool
- InDetTRTRawDataProviderTool = TRTRawDataProviderTool(name = "InDetTRTRawDataProviderTool",
- Decoder = InDetTRTRodDecoder)
- ToolSvc += InDetTRTRawDataProviderTool
-
+ from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRodDecoder
+ InDetPixelRodDecoder = PixelRodDecoder(name = "InDetPixelRodDecoder")
+ ToolSvc += InDetPixelRodDecoder
- # load the TRTRawDataProvider
- from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProvider
- InDetTRTRawDataProvider = TRTRawDataProvider(name = "InDetTRTRawDataProvider",
- RDOKey = "TRT_RDOs",
- ProviderTool = InDetTRTRawDataProviderTool)
-
- if ( viewTest ):
- allViewAlgorithms += InDetTRTRawDataProvider
- allViewAlgorithms.InDetTRTRawDataProvider.isRoI_Seeded = True
- allViewAlgorithms.InDetTRTRawDataProvider.RoIs = "EMViewRoIs"
- svcMgr.ViewAlgPool.TopAlg += [ "InDetTRTRawDataProvider" ]
- topSequence.viewMaker.AlgorithmNameSequence += [ "InDetTRTRawDataProvider" ]
- else:
- topSequence += InDetTRTRawDataProvider
- topSequence.InDetTRTRawDataProvider.isRoI_Seeded = True
- topSequence.InDetTRTRawDataProvider.RoIs = "EMRoIs"
+ from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawDataProviderTool
+ InDetPixelRawDataProviderTool = PixelRawDataProviderTool(name = "InDetPixelRawDataProviderTool",
+ Decoder = InDetPixelRodDecoder)
+ ToolSvc += InDetPixelRawDataProviderTool
+ if (InDetFlags.doPrintConfigurables()):
+ print InDetPixelRawDataProviderTool
+
+ # load the PixelRawDataProvider
+ from PixelRawDataByteStreamCnv.PixelRawDataByteStreamCnvConf import PixelRawDataProvider
+ InDetPixelRawDataProvider = PixelRawDataProvider(name = "InDetPixelRawDataProvider",
+ RDOKey = InDetKeys.PixelRDOs(),
+ ProviderTool = InDetPixelRawDataProviderTool,
+ OutputLevel = INFO)
+
+ if ( viewTest ):
+ allViewAlgorithms += InDetPixelRawDataProvider
+ allViewAlgorithms.InDetPixelRawDataProvider.isRoI_Seeded = True
+ allViewAlgorithms.InDetPixelRawDataProvider.RoIs = "EMViewRoIs"
+ allViewAlgorithms.InDetPixelRawDataProvider.RDOCacheKey = topSequence.InDetCacheCreatorTrigViews.PixRDOCacheKey
+ svcMgr.ViewAlgPool.TopAlg += [ "InDetPixelRawDataProvider" ]
+ topSequence.viewMaker.AlgorithmNameSequence += [ "InDetPixelRawDataProvider" ]
+ else:
+ topSequence += InDetPixelRawDataProvider
+ topSequence.InDetPixelRawDataProvider.isRoI_Seeded = True
+ topSequence.InDetPixelRawDataProvider.RoIs = "EMRoIs"
+
+
+ if (InDetFlags.doPrintConfigurables()):
+ print InDetPixelRawDataProvider
+
+
+ #SCT
+ from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCT_RodDecoder
+ InDetSCTRodDecoder = SCT_RodDecoder(name = "InDetSCTRodDecoder",
+ TriggerMode = False, OutputLevel = INFO)
+ ToolSvc += InDetSCTRodDecoder
+
+ from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCTRawDataProviderTool
+ InDetSCTRawDataProviderTool = SCTRawDataProviderTool(name = "InDetSCTRawDataProviderTool",
+ Decoder = InDetSCTRodDecoder)
+ ToolSvc += InDetSCTRawDataProviderTool
+ if (InDetFlags.doPrintConfigurables()):
+ print InDetSCTRawDataProviderTool
+
+ # load the SCTRawDataProvider
+ from SCT_RawDataByteStreamCnv.SCT_RawDataByteStreamCnvConf import SCTRawDataProvider
+ InDetSCTRawDataProvider = SCTRawDataProvider(name = "InDetSCTRawDataProvider",
+ RDOKey = InDetKeys.SCT_RDOs(),
+ ProviderTool = InDetSCTRawDataProviderTool,
+ OutputLevel = INFO)
+
+ if ( viewTest ):
+ allViewAlgorithms += InDetSCTRawDataProvider
+ allViewAlgorithms.InDetSCTRawDataProvider.isRoI_Seeded = True
+ allViewAlgorithms.InDetSCTRawDataProvider.RoIs = "EMViewRoIs"
+ allViewAlgorithms.InDetSCTRawDataProvider.RDOCacheKey = topSequence.InDetCacheCreatorTrigViews.SCTRDOCacheKey
+ svcMgr.ViewAlgPool.TopAlg += [ "InDetSCTRawDataProvider" ]
+ topSequence.viewMaker.AlgorithmNameSequence += [ "InDetSCTRawDataProvider" ]
+ else:
+ topSequence += InDetSCTRawDataProvider
+ topSequence.InDetSCTRawDataProvider.isRoI_Seeded = True
+ topSequence.InDetSCTRawDataProvider.RoIs = "EMRoIs"
+
+
+ #TRT
+ from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_CalDbSvc
+ InDetTRTCalDbSvc = TRT_CalDbSvc()
+ ServiceMgr += InDetTRTCalDbSvc
+
+ from TRT_ConditionsServices.TRT_ConditionsServicesConf import TRT_StrawStatusSummarySvc
+ InDetTRTStrawStatusSummarySvc = TRT_StrawStatusSummarySvc(name = "InDetTRTStrawStatusSummarySvc")
+ ServiceMgr += InDetTRTStrawStatusSummarySvc
+
+ from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRT_RodDecoder
+ InDetTRTRodDecoder = TRT_RodDecoder(name = "InDetTRTRodDecoder",
+ LoadCompressTableDB = True)#(globalflags.DataSource() != 'geant4'))
+ ToolSvc += InDetTRTRodDecoder
+
+ from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProviderTool
+ InDetTRTRawDataProviderTool = TRTRawDataProviderTool(name = "InDetTRTRawDataProviderTool",
+ Decoder = InDetTRTRodDecoder)
+ ToolSvc += InDetTRTRawDataProviderTool
+
+
+ # load the TRTRawDataProvider
+ from TRT_RawDataByteStreamCnv.TRT_RawDataByteStreamCnvConf import TRTRawDataProvider
+ InDetTRTRawDataProvider = TRTRawDataProvider(name = "InDetTRTRawDataProvider",
+ RDOKey = "TRT_RDOs",
+ ProviderTool = InDetTRTRawDataProviderTool)
+
+ if ( viewTest ):
+ allViewAlgorithms += InDetTRTRawDataProvider
+ allViewAlgorithms.InDetTRTRawDataProvider.isRoI_Seeded = True
+ allViewAlgorithms.InDetTRTRawDataProvider.RoIs = "EMViewRoIs"
+ svcMgr.ViewAlgPool.TopAlg += [ "InDetTRTRawDataProvider" ]
+ topSequence.viewMaker.AlgorithmNameSequence += [ "InDetTRTRawDataProvider" ]
+ else:
+ topSequence += InDetTRTRawDataProvider
+ topSequence.InDetTRTRawDataProvider.isRoI_Seeded = True
+ topSequence.InDetTRTRawDataProvider.RoIs = "EMRoIs"
#Pixel clusterisation