From 0f2795fdabac3b67cef85e9fdeb2a56314bb06ab Mon Sep 17 00:00:00 2001
From: Dave Casper <dcasper@uci.edu>
Date: Sun, 31 Oct 2021 16:53:40 -0700
Subject: [PATCH] Fix hard-coding of timing pattern
---
.../python/TrackerPrepRawDataFormationConfig.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/python/TrackerPrepRawDataFormationConfig.py b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/python/TrackerPrepRawDataFormationConfig.py
index 57c9d3ce..4854267d 100644
--- a/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/python/TrackerPrepRawDataFormationConfig.py
+++ b/Tracker/TrackerRecAlgs/TrackerPrepRawDataFormation/python/TrackerPrepRawDataFormationConfig.py
@@ -19,8 +19,9 @@ def FaserSCT_ClusterizationCommonCfg(flags, name="FaserSCT_ClusterizationToolCom
Tracker__TrackerClusterMakerTool,Tracker__FaserSCT_ClusteringTool=CompFactory.getComps("Tracker::TrackerClusterMakerTool", "Tracker::FaserSCT_ClusteringTool")
trackerClusterMakerTool = Tracker__TrackerClusterMakerTool(name = "TrackerClusterMakerTool")
faserSCT_LorentzAngleTool=acc.popToolsAndMerge(FaserSCT_LorentzAngleCfg(flags))
- clusteringTool = Tracker__FaserSCT_ClusteringTool(name, globalPosAlg = trackerClusterMakerTool, FaserSiLorentzAngleTool=faserSCT_LorentzAngleTool)
- clusteringTool.timeBins = "01X"
+ kwargs.setdefault("timeBins", "01X")
+ clusteringTool = Tracker__FaserSCT_ClusteringTool(name, globalPosAlg = trackerClusterMakerTool, FaserSiLorentzAngleTool=faserSCT_LorentzAngleTool, **kwargs)
+ # clusteringTool.timeBins = "01X"
# attach ToolHandles
acc.setPrivateTools(clusteringTool)
return acc
@@ -35,7 +36,13 @@ def FaserSCT_ClusterizationToolCfg(flags, name="FaserSCT_ClusterizationTool", **
def FaserSCT_ClusterizationBasicCfg(flags, **kwargs):
"""Return ComponentAccumulator for FaserSCT Clusterization"""
acc = ComponentAccumulator()
- clusterTool = acc.popToolsAndMerge(FaserSCT_ClusterizationToolCfg(flags))
+ pattern = kwargs.pop("ClusterToolTimingPattern")
+ # print("ClusterToolTimingPattern = ", pattern)
+ if len(pattern) > 0 :
+ clusterTool = acc.popToolsAndMerge(FaserSCT_ClusterizationToolCfg(flags, timeBins = pattern ))
+ else:
+ clusterTool = acc.popToolsAndMerge(FaserSCT_ClusterizationToolCfg(flags))
+
kwargs.setdefault("SCT_ClusteringTool", clusterTool)
kwargs.setdefault("DataObjectName", "SCT_RDOs")
kwargs.setdefault("ClustersName", "SCT_ClusterContainer")
--
GitLab