From da003f123ac3b9f08d2c6214ec3e9fa8414aed93 Mon Sep 17 00:00:00 2001 From: Julien Maurer <julien.maurer@cern.ch> Date: Sat, 3 Dec 2022 18:08:47 +0100 Subject: [PATCH] Tier0ChainTest cleanup (ATR-24782) and fix for pilot beam data (ATR-26734) Tier0ChainTest cleanup (ATR-24782) and fix for pilot beam data (ATR-26734) --- .../Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh | 4 ---- Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh | 4 ---- Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh | 4 ---- Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh | 2 +- .../test/test_bulkProcessing_pilotBeam_collisions.sh | 2 +- .../test/test_bulkProcessing_pilotBeam_local.sh | 2 +- Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh | 4 ---- Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh | 4 ---- .../Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh | 2 +- .../test/test_expressProcessing_pilotBeam_collisions.sh | 2 +- .../test/test_expressProcessing_pilotBeam_local.sh | 2 +- 11 files changed, 6 insertions(+), 26 deletions(-) diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh index 9cbe1f48ade..94e138509fd 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh index 8a1a7a47f66..2180c809772 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh +++ b/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;" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh index 43f5bc9138d..5c09a25fd17 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh index 5ac14e3f1c6..fe45e24061e 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh index 2c8a3260c62..48f6fc8956e 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh index 21a8e908131..cb3403c548f 100755 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh index 2963ec5ea3b..2887e691725 100755 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh index 61cb791be68..bc82a1049ce 100755 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh index db870a4299e..f9ae15a46ec 100755 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh index 8a4f31942bf..617a36d9323 100755 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh +++ b/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" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh index c957c2bf108..204fd02020b 100755 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh +++ b/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" \ -- GitLab