From 7f76b850ccb51a63db015aab89fdd970c1921699 Mon Sep 17 00:00:00 2001
From: Mark Hodgkinson <m.hodgkinson@sheffield.ac.uk>
Date: Tue, 11 Dec 2018 14:46:34 +0000
Subject: [PATCH] Add required SCT conditions algorithms. Adjust way in which
we add InDet/Align conditions folders, to fix a crash. Update Conditions tag
for the new input file.
Former-commit-id: af243136628b5561bfccf980db15223c12e9eb59
---
Reconstruction/eflowRec/python/PFRun3Config.py | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/Reconstruction/eflowRec/python/PFRun3Config.py b/Reconstruction/eflowRec/python/PFRun3Config.py
index 90f3bf3476f..3ed129b48a9 100644
--- a/Reconstruction/eflowRec/python/PFRun3Config.py
+++ b/Reconstruction/eflowRec/python/PFRun3Config.py
@@ -18,6 +18,12 @@ def PFCfg(inputFlags,**kwargs):
acc, geom_svc = TrackingGeometrySvcCfg(inputFlags)
result.merge(acc)
+ from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_AlignCondAlg
+ result.addCondAlgo(SCT_AlignCondAlg(name = "SCT_AlignCondAlg",UseDynamicAlignFolders = False))
+
+ from SCT_ConditionsAlgorithms.SCT_ConditionsAlgorithmsConf import SCT_DetectorElementCondAlg
+ result.addCondAlgo(SCT_DetectorElementCondAlg(name = "SCT_DetectorElementCondAlg"))
+
from MuonConfig.MuonGeometryConfig import MuonGeoModelCfg
result.merge(MuonGeoModelCfg(inputFlags))
@@ -35,7 +41,7 @@ def PFCfg(inputFlags,**kwargs):
from InDetServMatGeoModel.InDetServMatGeoModelConf import InDetServMatTool
result.getService("GeoModelSvc").DetectorTools += [ InDetServMatTool() ]
- from IOVDbSvc.IOVDbSvcConfig import addFolders,IOVDbSvcCfg
+ from IOVDbSvc.IOVDbSvcConfig import addFolders, addFoldersSplitOnline,IOVDbSvcCfg
result.merge(addFolders(inputFlags,['/GLOBAL/BField/Maps <noover/>'],'GLOBAL_OFL'))
result.merge(addFolders(inputFlags,['/EXT/DCS/MAGNETS/SENSORDATA'],'DCS_OFL'))
@@ -47,14 +53,14 @@ def PFCfg(inputFlags,**kwargs):
result.addService(MagField__AtlasFieldSvc("AtlasFieldSvc",**kwargs))
#load folders needed for Run2 ID alignment
- result.merge(addFolders(inputFlags,['/Indet/Align'],'INDET_OFL'))
+ result.merge(addFoldersSplitOnline(inputFlags,"INDET","/Indet/Onl/Align","/Indet/Align",className="AlignableTransformContainer"))
result.merge(addFolders(inputFlags,['/TRT/Align'],'TRT_OFL'))
-
+
#load folders needed for IBL
result.merge(addFolders(inputFlags,['/Indet/IBLDist'],'INDET_OFL'))
#hard-code MC conditions tag needed for my ESD file - must be a better way? how to auto-configure?
- iovDbSvc.GlobalTag="OFLCOND-MC16-SDR-13"
+ iovDbSvc.GlobalTag="OFLCOND-MC16-SDR-20"
from eflowRec.eflowRecConf import PFLeptonSelector
PFLeptonSelector=PFLeptonSelector("PFLeptonSelector")
--
GitLab