Merge branch '22.0-TCT-fixes-021222' into '22.0'

Tier0ChainTest cleanup (ATR-24782) and fix for pilot beam data (ATR-26734)

See merge request atlas/athena!58947

Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh

@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI f1287  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00420624.express_express.merge.RAW._lb1054._SFO-ALL._0001.1" \

Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh

@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI f1287  \
 --preExec="all:from RecExConfig.RecFlags import rec; rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig='DB'; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \

Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh

@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI f1287  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_cos.00421739.express_express.merge.RAW._lb0534._SFO-12._0001.1" \

Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh

@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=-1 \
---preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \

Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh

@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=-1 \
---preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_900GeV.00405514.express_express.merge.RAW._lb0123._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \

Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh

@@ -13,7 +13,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=200 \
---preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \

Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh

@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI x701  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00421734.express_express.merge.RAW._lb0021._SFO-ALL._0001.1" \

Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh

@@ -6,10 +6,6 @@
 # art-include: 22.0/Athena
 # art-athena-mt: 8
 
-# There was a database connection problem reported in ATR-24782. Rodney Walker's solution is to use the following export to fix the problem:
-export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle-admin
-
-
 Reco_tf.py  \
 --AMI x701  \
 --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_cos.00421739.express_express.merge.RAW._lb0534._SFO-12._0001.1" \

Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh

@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=-1 \
---preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \

Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh

@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=-1 \
---preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_900GeV.00405514.express_express.merge.RAW._lb0123._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \

Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh

@@ -14,7 +14,7 @@ Reco_tf.py  \
 --geometryVersion=ATLAS-R3S-2021-02-00-00 \
 --autoConfiguration=everything \
 --maxEvents=200 \
---preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
+--preExec="all:from RecExConfig.RecFlags import rec; rec.doExpressProcessing.set_Value_and_Lock(True); rec.doZdc.set_Value_and_Lock(False); from AthenaConfiguration.AllConfigFlags import ConfigFlags; ConfigFlags.Common.doExpressProcessing=True; ConfigFlags.Trigger.triggerConfig= 'DB'; ConfigFlags.Trigger.enableL1MuonPhase1=True; ConfigFlags.Trigger.enableL1CaloPhase1=False; DQMonFlags.useTrigger=False; DQMonFlags.doHLTMon=False;" \
 --inputBSFile=/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data21_comm.00404400.express_express.merge.RAW._lb2497._SFO-ALL._0001.1 \
 --steering=doRAWtoALL \
 --athenaopts="--threads=8" \