diff --git a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx index ca80dc3905bded7a2de058f8b19ae22c8cc995b2..c1161f3214ba39e45f353da79a66cfc509edb01d 100644 --- a/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx +++ b/InnerDetector/InDetRecAlgs/InDetPrepRawDataFormation/src/PixelClusterization.cxx @@ -62,7 +62,7 @@ namespace InDet{ "Ambiguity Map container"); declareProperty("RoIs", m_roiCollectionKey = std::string(""), "RoIs to read in"); declareProperty("isRoI_Seeded", m_roiSeeded = false, "Use RoI"); - declareProperty("clusterContainercacheKey", m_clusterContainercacheKey, "Optional External Pixel cluster Cache"); + declareProperty("ClusterContainerCacheKey", m_clusterContainercacheKey, "Optional External Pixel cluster Cache"); // error strategy <-- this is now in the MergedPixelTool // // 0 : broad errors (cluster width/sqrt(12) ) diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py index 86356ffbb74e1365aacc2806e0d51fc245270d0b..dbcc7f92c9891a5fe77685d52a0484441e2227c7 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/IDCalo.py @@ -15,13 +15,13 @@ if viewTest: InDetCacheCreatorTrigViews = InDet__CacheCreator(name = "InDetCacheCreatorTrigViews", Pixel_ClusterKey = "PixelTrigClustersCache", SCT_ClusterKey = "SCT_ClustersCache") - allViewAlgorithms += InDetCacheCreatorTrigViews + topSequence += InDetCacheCreatorTrigViews if TriggerFlags.doID: #workaround to prevent online trigger folders to be enabled from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags InDetTrigFlags.useConditionsClasses.set_Value_and_Lock(False) - + from InDetRecExample.InDetJobProperties import InDetFlags InDetFlags.doCaloSeededBrem = False @@ -183,7 +183,7 @@ if TriggerFlags.doID: allViewAlgorithms += InDetPixelClusterization allViewAlgorithms.InDetPixelClusterization.isRoI_Seeded = True allViewAlgorithms.InDetPixelClusterization.RoIs = "EMViewRoIs" - allViewAlgorithms.InDetPixelClusterization.clusterContainercacheKey = allViewAlgorithms.InDetCacheCreatorTrigViews.Pixel_ClusterKey + allViewAlgorithms.InDetPixelClusterization.ClusterContainerCacheKey = topSequence.InDetCacheCreatorTrigViews.Pixel_ClusterKey svcMgr.ViewAlgPool.TopAlg += [ "InDetPixelClusterization" ] topSequence.viewMaker.AlgorithmNameSequence += [ "InDetPixelClusterization" ] else: @@ -217,7 +217,7 @@ if TriggerFlags.doID: allViewAlgorithms += InDetSCT_Clusterization allViewAlgorithms.InDetSCT_Clusterization.isRoI_Seeded = True allViewAlgorithms.InDetSCT_Clusterization.RoIs = "EMViewRoIs" - allViewAlgorithms.InDetSCT_Clusterization.clusterContainercacheKey = allViewAlgorithms.InDetCacheCreatorTrigViews.SCT_ClusterKey + allViewAlgorithms.InDetSCT_Clusterization.ClusterContainerCacheKey = topSequence.InDetCacheCreatorTrigViews.SCT_ClusterKey svcMgr.ViewAlgPool.TopAlg += [ "InDetSCT_Clusterization" ] topSequence.viewMaker.AlgorithmNameSequence += [ "InDetSCT_Clusterization" ] else: