diff --git a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/share/BeamspotRefitVertex.py b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/share/BeamspotRefitVertex.py
index f197e7b206da2ebdc03e5d5ebf7ca7c9bd273e30..f6cba7cd3f93e936f252d905146c4c3cf3488920 100644
--- a/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/share/BeamspotRefitVertex.py
+++ b/InnerDetector/InDetCalibAlgs/InDetBeamSpotFinder/share/BeamspotRefitVertex.py
@@ -1,6 +1,6 @@
# Example
-#Reco_tf.py --steering 'doRAWtoALL' --ignoreErrors 'True' --inputBSFile /tmp/amorley/data16_13TeV.00310809.calibration_BeamSpot.merge.RAW/data16_13TeV.00310809.calibration_BeamSpot.merge.RAW._lb0743._SFO-ALL._0001.1 --outputAODFile /tmp/amorley/AOD.pool.root --conditionsTag all:CONDBR2-ES1PA-2016-03 --AMITag 'c1042' --autoConfiguration='everything' --maxEvents '-1' --preInclude 'all:InDetBeamSpotExample/preIncludeRecoForBeamspot.py' --postExec 'all:from IOVDbSvc.CondDB import conddb; conddb.addOverride("/Indet/AlignL1/ID" ,"IndetAlignL1ID-RUN2-BLK-UPD4-02"); conddb.addOverride("/Indet/AlignL2/PIX" ,"IndetAlignL2PIX-RUN2-BLK-UPD4-02"); conddb.addOverride("/Indet/AlignL2/SCT" ,"IndetAlignL2SCT-RUN2-BLK-UPD4-02"); conddb.addOverride("/Indet/AlignL3" ,"IndetAlignL3-RUN2-BLK-UPD4-02"); conddb.addOverride("/Indet/IBLDist" ,"InDetIBLDist-RUN2-BLK-UPD4-01"); conddb.addOverride("/TRT/AlignL1/TRT" ,"TRTAlignL1-RUN2-BLK-UPD4-02"); conddb.addOverride("/TRT/AlignL2" ,"TRTAlignL2-RUN2-BLK-UPD4-02");' --preExec 'all:from InDetRecExample.InDetJobProperties import InDetFlags; InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True); from RecExConfig.RecFlags import rec;rec.UserAlgs.set_Value_and_Lock("InDetBeamSpotFinder/BeamspotRefitVertex.py")' --postInclude 'all:BeamSpotFinder/postInclude.addSCTonlyToAODFile.py' --geometryVersion all:ATLAS-R2-2015-04-00-00 --maxEvents 10
+#Reco_tf.py --steering 'doRAWtoALL' --ignoreErrors 'True' --inputBSFile /tmp/amorley/data16_13TeV.00310809.calibration_BeamSpot.merge.RAW/data16_13TeV.00310809.calibration_BeamSpot.merge.RAW._lb0743._SFO-ALL._0001.1 --outputAODFile /tmp/amorley/AOD.pool.root --conditionsTag all:CONDBR2-ES1PA-2016-03 --AMITag 'c1042' --autoConfiguration='everything' --maxEvents '-1' --preInclude 'all:InDetBeamSpotExample/preIncludeRecoForBeamspot.py' --postExec 'all:from IOVDbSvc.CondDB import conddb; conddb.addOverride("/Indet/AlignL1/ID" ,"IndetAlignL1ID-RUN2-BLK-UPD4-02"); conddb.addOverride("/Indet/AlignL2/PIX" ,"IndetAlignL2PIX-RUN2-BLK-UPD4-02"); conddb.addOverride("/Indet/AlignL2/SCT" ,"IndetAlignL2SCT-RUN2-BLK-UPD4-02"); conddb.addOverride("/Indet/AlignL3" ,"IndetAlignL3-RUN2-BLK-UPD4-02"); conddb.addOverride("/Indet/IBLDist" ,"InDetIBLDist-RUN2-BLK-UPD4-01"); conddb.addOverride("/TRT/AlignL1/TRT" ,"TRTAlignL1-RUN2-BLK-UPD4-02"); conddb.addOverride("/TRT/AlignL2" ,"TRTAlignL2-RUN2-BLK-UPD4-02");' --preExec 'all:from AtlasGeoModel.InDetGMJobProperties import GeometryFlags; GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True); from RecExConfig.RecFlags import rec;rec.UserAlgs.set_Value_and_Lock("InDetBeamSpotFinder/BeamspotRefitVertex.py")' --postInclude 'all:BeamSpotFinder/postInclude.addSCTonlyToAODFile.py' --geometryVersion all:ATLAS-R2-2015-04-00-00 --maxEvents 10
from InDetRecExample.InDetKeys import InDetKeys
containerName= "SCTonlyVertex"
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index f6b98dae6b3d094edb4cdb0c94947ebba78f3c40..e076fa19756ba029169735158f65e06e011515cc 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -420,6 +420,22 @@ class doMonitoringAlignment(InDetFlagsJobProperty):
allowedTypes = ['bool']
StoredValue = False
+class useDynamicAlignFolders(InDetFlagsJobProperty):
+ """ Deprecated property - use GeometryFlags directly to choose the alignment folder scheme """
+ def _do_action( self, *args, **kwds):
+ from AtlasGeoModel.InDetGMJobProperties import GeometryFlags
+ self._log.warning('Deprecated property InDetFlags.useDynamicAlignFolders used to control the alignment scheme - update the code to from AtlasGeoModel.InDetGMJobProperties import GeometryFlags; GeometryFlags.useDynamicAlignFolders.... ')
+ if self.StoredValue != 'none':
+ from AtlasGeoModel.InDetGMJobProperties import GeometryFlags
+ GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(self.StoredValue)
+ self._log.info("GeometryFlags.useDynamicAlignFolders set by InDetFlags: %s" % GeometryFlags.useDynamicAlignFolders)
+ else:
+ self._log.warning("Not setting GeometryFlags.useDynamicAlignFolders by InDetFlags: %s" % self.StoredValue)
+
+ statusOn = True
+ allowedTypes = ['bool']
+ StoredValue = False
+
class doPerfMon(InDetFlagsJobProperty):
""" Use to turn on PerfMon """
statusOn = True
@@ -2540,9 +2556,7 @@ class InDetJobProperties(JobPropertyContainer):
print '* use non-standard SCT DCS based on ~20V HV cut'
if self.useTrtDCS():
print '* use TRT DCS'
-
- from AtlasGeoModel.InDetGMJobProperties import GeometryFlags as geoFlags
- if geoFlags.useDynamicAlignFolders():
+ if self.useDynamicAlignFolders():
print '* use of Dynamic alignment folder scheme enabled'
if not self.doPRDFormation():
@@ -2682,6 +2696,7 @@ _list_InDetJobProperties = [Enabled,
doMonitoringSCT,
doMonitoringTRT,
doMonitoringAlignment,
+ useDynamicAlignFolders,
doPerfMon,
AODall,
useBeamConstraint,
diff --git a/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py b/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
index 98a9d4d17a55816c25a3df6c49049c473a00029c..4502c35674ba7bca5d6de508524cc437d6238746 100755
--- a/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/share/jobOptions_RecExCommon.py
@@ -180,7 +180,8 @@ InDetFlags.doMonitoringTRT.set_Value_and_Lock (False)
InDetFlags.doMonitoringAlignment.set_Value_and_Lock (False)
# --- Make sure new dynamic folder scheme is locked to false for now
-InDetFlags.useDynamicAlignFolders.set_Value_and_Lock (True)
+from AtlasGeoModel.InDetGMJobProperties import GeometryFlags;
+GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock (True)
# activate the print InDetXYZAlgorithm statements
InDetFlags.doPrintConfigurables.set_Value_and_Lock (True)
diff --git a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
index a0f9c9a5146d342aca8b2992020c4370c2282a6a..d8cd4cdbbd3cb4b5c85ee80eb8395947a29be2ba 100644
--- a/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
+++ b/Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf
@@ -112,7 +112,7 @@ test 18
name Reco_tf_physicsV7_savedBS
doc Reco_tf on saved output from HLT_physicsV7
pre_condition if [[ $(find ../HLT_physicsV7/HLT_physicsV7._0001.data -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../HLT_physicsV7/HLT_physicsV7._0001.data ; else test -e non_existing_file ; fi
- athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile ../HLT_physicsV7/HLT_physicsV7._0001.data --maxEvents 2 --autoConfiguration='everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --preExec 'r2e:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --outputESDFile HLT_physicsV7.ESD.pool.root
+ athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile ../HLT_physicsV7/HLT_physicsV7._0001.data --maxEvents 2 --autoConfiguration='everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --preExec 'r2e:from AtlasGeoModel.InDetGMJobProperties import GeometryFlags;GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --outputESDFile HLT_physicsV7.ESD.pool.root
post_command checkFile.py HLT_physicsV7.ESD.pool.root > ESD.txt
post_command perl -i.clean -pe 's/^[\d:]+ //' log.RAWtoESD
post_command cat log.RAWtoESD >> Reco_tf_physicsV7_savedBS_test.log
@@ -223,7 +223,7 @@ test 41
name Trigreco_physicsV7_currentT0
doc Trig_reco_tf with current T0 config
checklog --config checklogTrigP1Test.conf --showexcludestats
- athena_cmd Trig_reco_tf.py --inputBS_RDOFile "root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/data15_13TeV.00272531.physics_Main.daq.RAW._lb0104._SFO-5._0001.data" --precommand "testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True" --maxEvents '15' --outputBSFile "tmp.BS" ; source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile "tmp.BS" --athenaopts=" --perfmon " --outputHISTFile 'myHIST.root' --outputAODFile 'myAOD.pool.root' --outputESDFile 'myESD.pool.root' --outputNTUP_MUONCALIBFile 'myNTUP_MUONCALIB.root' --autoConfiguration='everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --preExec 'r2e:from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --triggerConfig r2e=DATARECO:REPR
+ athena_cmd Trig_reco_tf.py --inputBS_RDOFile "root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/data15_13TeV.00272531.physics_Main.daq.RAW._lb0104._SFO-5._0001.data" --precommand "testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True" --maxEvents '15' --outputBSFile "tmp.BS" ; source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --inputBSFile "tmp.BS" --athenaopts=" --perfmon " --outputHISTFile 'myHIST.root' --outputAODFile 'myAOD.pool.root' --outputESDFile 'myESD.pool.root' --outputNTUP_MUONCALIBFile 'myNTUP_MUONCALIB.root' --autoConfiguration='everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --preExec 'r2e:from AtlasGeoModel.InDetGMJobProperties import GeometryFlags;GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --triggerConfig r2e=DATARECO:REPR
post_command checkFile.py myAOD.pool.root > AOD.txt
@@ -473,7 +473,7 @@ test 80
doc RAWtoESD on output from HLT_physicsV7
checklog --config checklogTrigP1Test.conf --showexcludestats
pre_condition test -e '../HLT_physicsV7/HLT_physicsV7._0001.data'
- athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --preExec 'from InDetRecExample.InDetJobProperties import InDetFlags;InDetFlags.useDynamicAlignFolders.set_Value_and_Lock(True);' --autoConfiguration 'everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --inputBSFile ../HLT_physicsV7/HLT_physicsV7._0001.data --maxEvents 5 --outputESDFile RAWtoESD.pool.root
+ athena_cmd source $AtlasSetup/scripts/asetup.sh latest,Athena,21.0 ; Reco_tf.py --preExec 'from AtlasGeoModel.InDetGMJobProperties import GeometryFlags;GeometryFlags.useDynamicAlignFolders.set_Value_and_Lock(True)' --autoConfiguration 'everything' --conditionsTag "CONDBR2-BLKPA-2017-11" --geometryVersion "ATLAS-R2-2016-01-00-01" --inputBSFile ../HLT_physicsV7/HLT_physicsV7._0001.data --maxEvents 5 --outputESDFile RAWtoESD.pool.root
post_command checkFile.py RAWtoESD.pool.root > ESD.txt
test 81