From 1eb52d1e06077e32ae5bc6fe8ad6ab905a22e48b Mon Sep 17 00:00:00 2001
From: FASER Reco <faserrec@lxplus735.cern.ch>
Date: Sun, 1 Jan 2023 19:18:10 +0100
Subject: [PATCH] Read data alignment from CONDBR3
---
.../python/FaserSCT_GeoModelConfig.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/python/FaserSCT_GeoModelConfig.py b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/python/FaserSCT_GeoModelConfig.py
index 038c8c38b..b9a3215b3 100644
--- a/Tracker/TrackerDetDescr/FaserSCT_GeoModel/python/FaserSCT_GeoModelConfig.py
+++ b/Tracker/TrackerDetDescr/FaserSCT_GeoModel/python/FaserSCT_GeoModelConfig.py
@@ -2,7 +2,7 @@
from AthenaConfiguration.ComponentFactory import CompFactory
from AthenaConfiguration.Enums import ProductionStep
-from IOVDbSvc.IOVDbSvcConfig import addFolders, addFoldersSplitOnline
+from IOVDbSvc.IOVDbSvcConfig import addFolders #, addFoldersSplitOnline
def FaserSCT_GeometryCfg( flags ):
from FaserGeoModel.GeoModelConfig import GeoModelCfg
@@ -27,17 +27,20 @@ def FaserSCT_GeometryCfg( flags ):
if flags.GeoModel.Align.Disable:
return acc
+ # Don't specify db= in addFolders calls below
+ # dbname set globally to OFLP200 for MC and CONDBR3 for data
+ # Now have proper data and MC DBs for the alignment
if flags.GeoModel.Align.Dynamic:
# acc.merge(addFoldersSplitOnline(flags,"INDET","/Indet/Onl/AlignL1/ID","/Indet/AlignL1/ID",className="CondAttrListCollection"))
# acc.merge(addFoldersSplitOnline(flags,"INDET","/Indet/Onl/AlignL2/SCT","/Indet/AlignL2/SCT",className="CondAttrListCollection"))
# acc.merge(addFoldersSplitOnline(flags,"INDET","/Indet/Onl/AlignL3","/Indet/AlignL3",className="AlignableTransformContainer"))
print("FaserSCT dynamic align flag is not supported!")
else:
- print("Override Alignment dbname to OFLP200, fix this when alignment available in CONDBR3")
if flags.Common.Project != "AthSimulation" and (flags.Common.ProductionStep != ProductionStep.Simulation or flags.Overlay.DataOverlay):
- acc.merge(addFolders(flags,"/Tracker/Align", "SCT_OFL", className="AlignableTransformContainer", db="OFLP200"))
+ acc.merge(addFolders(flags,"/Tracker/Align", "SCT_OFL", className="AlignableTransformContainer"))
else:
- acc.merge(addFolders(flags, "/Tracker/Align", "SCT_OFL", db="OFLP200"))
+ acc.merge(addFolders(flags, "/Tracker/Align", "SCT_OFL"))
+
if flags.Common.Project != "AthSimulation": # Protection for AthSimulation builds
if flags.Common.ProductionStep != ProductionStep.Simulation or flags.Overlay.DataOverlay:
FaserSCT_AlignCondAlg = CompFactory.FaserSCT_AlignCondAlg
--
GitLab