diff --git a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
index 99cd920a96c6cc834749f6c7f4cf8ca5771b64f6..f9936e3d9c3c2751d6f17eaeed94a8047dc7c388 100644
--- a/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
+++ b/Control/AthenaMonitoring/share/DataQualitySteering_jobOptions.py
@@ -331,7 +331,7 @@ if DQMonFlags.doMonitoring():
elif globalflags.InputFormat() == 'pool':
ConfigFlags.Input.Files=svcMgr.EventSelector.InputCollections
- ConfigFlags.GeoModel.Align.Dynamic=InDetFlags.useDynamicAlignFolders()
+ ConfigFlags.GeoModel.Align.Dynamic=InDetGeometryFlags.useDynamicAlignFolders()
ConfigFlags.Detector.GeometryPixel=DetFlags.pixel_on()
ConfigFlags.Detector.GeometrySCT=DetFlags.SCT_on()
ConfigFlags.Detector.GeometryTRT=DetFlags.TRT_on()
diff --git a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
index 5744bd0b379a968bbe104feab957b8979e7a7ead..da10bac1f39b735a841c197b8b5c92ca7b19b6f6 100755
--- a/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
+++ b/DetectorDescription/GeoModel/AtlasGeoModel/python/InDetGMJobProperties.py
@@ -132,7 +132,7 @@ class useDynamicAlignFolders(JobProperty):
""" Use to turn on dynamic alignment constants folder scheme (first deployed in 2016) """
statusOn = True
allowedTypes = ['bool']
- StoredValue = False
+ StoredValue = True
@@ -155,6 +155,11 @@ class InDetGeometryFlags_JobProperties(JobPropertyContainer):
self.GeoVersionName.set_Value_and_Lock(InDetGeoFlags.getValue("VersionName"))
self.GeoLayout.set_Value_and_Lock(InDetGeoFlags.getValue("Layout"))
+ def setupDynamicAlignFolders(self):
+ from AthenaCommon.GlobalFlags import globalflags
+ if globalflags.DataSource.get_Value() != 'data':
+ self.useDynamicAlignFolders.set_Value_and_Lock(False)
+
def reset(self,geoTagName="none"):
@@ -190,7 +195,7 @@ jobproperties.InDetGeometryFlags_JobProperties.add_JobProperty(useDynamicAlignFo
InDetGeometryFlags = jobproperties.InDetGeometryFlags_JobProperties
InDetGeometryFlags.setupValuesFromDB()
-
+InDetGeometryFlags.setupDynamicAlignFolders()
diff --git a/InnerDetector/InDetConfig/python/InDetConfigFlags.py b/InnerDetector/InDetConfig/python/InDetConfigFlags.py
index f5a76d284f667ea8a767be84787c9bb4b62cabf1..9beed050411380b02e3ab337700a7e30e9ae3f38 100644
--- a/InnerDetector/InDetConfig/python/InDetConfigFlags.py
+++ b/InnerDetector/InDetConfig/python/InDetConfigFlags.py
@@ -63,7 +63,6 @@ def createInDetConfigFlags():
icf.addFlag("InDet.doMonitoringSCT", False) # Use to turn on SCT monitoring
icf.addFlag("InDet.doMonitoringTRT", False) # Use to turn on TRT monitoring
icf.addFlag("InDet.doMonitoringAlignment", False) # Use to turn on alignment monitoring
- icf.addFlag("InDet.useDynamicAlignFolders",False) # Deprecated property - use InDetGeometryFlags directly to choose the alignment folder scheme
icf.addFlag("InDet.doPerfMon", False) # Use to turn on PerfMon
icf.addFlag("InDet.AODall", False)
icf.addFlag("InDet.useBeamConstraint", True) # use beam spot service in new tracking
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index c0cb4fe4ae6eb243b505df39dcd2ccdd09f1112e..5b074a3e5cc7c25d93192f0cae67c29520fe7f17 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -439,21 +439,6 @@ class doMonitoringAlignment(InDetFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = False
-class useDynamicAlignFolders(InDetFlagsJobProperty):
- """ Deprecated property - use InDetGeometryFlags directly to choose the alignment folder scheme """
- def _do_action( self, *args, **kwds):
- self._log.warning('Deprecated property InDetFlags.useDynamicAlignFolders used to control the alignment scheme - update the code to from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags; InDetGeometryFlags.useDynamicAlignFolders.... ')
- if self.StoredValue != 'none':
- from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
- InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(self.StoredValue)
- self._log.info("InDetGeometryFlags.useDynamicAlignFolders set by InDetFlags: %s" % InDetGeometryFlags.useDynamicAlignFolders)
- else:
- self._log.warning("Not setting InDetGeometryFlags.useDynamicAlignFolders by InDetFlags: %s" % self.StoredValue)
-
- statusOn = True
- allowedTypes = ['bool']
- StoredValue = False
-
class doPerfMon(InDetFlagsJobProperty):
""" Use to turn on PerfMon """
statusOn = True
@@ -2522,8 +2507,6 @@ class InDetJobProperties(JobPropertyContainer):
print('* use non-standard SCT DCS based on ~20V HV cut')
if self.useTrtDCS():
print('* use TRT DCS')
- if self.useDynamicAlignFolders():
- print('* use of Dynamic alignment folder scheme enabled')
if not self.doPRDFormation():
print('* PRD Formation is off for all technologies')
@@ -2667,7 +2650,6 @@ _list_InDetJobProperties = [Enabled,
doMonitoringSCT,
doMonitoringTRT,
doMonitoringAlignment,
- useDynamicAlignFolders,
doPerfMon,
AODall,
useBeamConstraint,
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_globalconfig_HI_2018.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_globalconfig_HI_2018.py
index 90c4f3e0592b199d1530004687c07fabe414de57..f11dd030a666ee6dc09d6a523f33617505feb323 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_globalconfig_HI_2018.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_globalconfig_HI_2018.py
@@ -224,15 +224,15 @@ from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doPixelClusterSplitting.set_Value(False) # does not work online
-from AtlasGeoModel.InDetGMJobProperties import GeometryFlags
+from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
if isHI_mode:
## ID alignment to test 2015 HI data
- ## GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(False)
+ ## InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(False)
## ID alignment for 2018 HI data
- GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)
+ InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)
else:
## new ID alignment 26 May 2017
- GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)
+ InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)
# ----------------------------------------------- Online flag
athenaCommonFlags.EvtMax.set_Value_and_Lock(evtMax)
@@ -242,10 +242,6 @@ athenaCommonFlags.isOnlineStateless = isOnlineStateless
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.useBeamConstraint.set_Value_and_Lock(False)
if isHI_mode:
- ## ID alignment to test 2015 HI data
- ## InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(False);
- ## ID alignment to run 2018 HI data
- InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True);
### InDetFlags.cutLevel.set_Value_and_Lock(2);
InDetFlags.cutLevel.set_Value_and_Lock(4); ### (Nov 8th 2018, looser cuts)
diff --git a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_globalconfig_pp_2018.py b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_globalconfig_pp_2018.py
index 6c97c2d045507bd35be4bdfd607f8703ad75d143..6d4bfc357fdb951c9774fd98b6758ee6ebe8b9bc 100644
--- a/Reconstruction/RecExample/RecExOnline/share/RecExOnline_globalconfig_pp_2018.py
+++ b/Reconstruction/RecExample/RecExOnline/share/RecExOnline_globalconfig_pp_2018.py
@@ -211,8 +211,8 @@ from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doPixelClusterSplitting.set_Value(False) # does not work online
## new ID alignment 26 May 2017
-from AtlasGeoModel.InDetGMJobProperties import GeometryFlags
-GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)
+from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags
+InDetGeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)
# ----------------------------------------------- Online flag
athenaCommonFlags.EvtMax.set_Value_and_Lock(evtMax)
diff --git a/Tools/PROCTools/data/master_q431_AOD_digest.ref b/Tools/PROCTools/data/master_q431_AOD_digest.ref
index 5c2599d53951f50c947e3b851bdb5c7aa56cf5f1..292d668ab92fa13f637b6116aeebbf7f22e73aff 100644
--- a/Tools/PROCTools/data/master_q431_AOD_digest.ref
+++ b/Tools/PROCTools/data/master_q431_AOD_digest.ref
@@ -1,26 +1,26 @@
run event nTopo nIdTracks nJets nMuons
330470 1183722158 1 0 0 0
- 330470 1183722342 394 412 18 0
- 330470 1183727953 532 578 11 4
- 330470 1183732647 467 466 12 1
- 330470 1183733040 381 286 6 1
- 330470 1183734651 361 361 14 4
- 330470 1183735332 406 383 9 1
- 330470 1183736475 741 677 13 1
+ 330470 1183722342 394 436 16 0
+ 330470 1183727953 532 604 11 4
+ 330470 1183732647 467 501 12 1
+ 330470 1183733040 381 291 6 1
+ 330470 1183734651 361 373 14 4
+ 330470 1183735332 406 398 9 1
+ 330470 1183736475 741 723 15 1
330470 1183738728 1 0 0 0
- 330470 1183738949 368 430 9 1
- 330470 1183742489 152 123 2 1
- 330470 1183743040 285 310 5 0
- 330470 1183746343 492 462 12 0
+ 330470 1183738949 368 448 9 1
+ 330470 1183742489 152 129 2 1
+ 330470 1183743040 285 332 5 0
+ 330470 1183746343 492 508 12 0
330470 1183746710 6 0 0 0
- 330470 1183751782 239 236 4 0
- 330470 1183752624 347 339 8 3
- 330470 1183753006 357 373 10 3
- 330470 1183754806 470 407 15 0
- 330470 1183769295 342 326 8 2
- 330470 1183769939 348 351 10 3
- 330470 1183773832 307 201 6 0
+ 330470 1183751782 239 253 2 0
+ 330470 1183752624 347 373 7 3
+ 330470 1183753006 357 405 11 3
+ 330470 1183754806 470 432 14 0
+ 330470 1183769295 342 343 7 2
+ 330470 1183769939 348 365 10 3
+ 330470 1183773832 307 209 7 0
330470 1183775209 57 0 0 0
- 330470 1183787124 431 361 9 2
- 330470 1183787946 321 313 5 1
- 330470 1183795329 458 335 18 0
+ 330470 1183787124 431 387 10 2
+ 330470 1183787946 321 331 5 1
+ 330470 1183795329 458 366 18 0