From 78f776304b8a951573ba37fff057dd71e93c4e79 Mon Sep 17 00:00:00 2001 From: Peter Berta <peter.berta@cern.ch> Date: Wed, 18 May 2022 16:46:06 +0200 Subject: [PATCH] TCT: Updating express and bulk processing tests (conditions, newer runs, new tests, adding art-include option to run in 22.0) TCT: Updating express and bulk processing tests (conditions, newer runs, new tests, adding art-include option to run in 22.0) --- .../test/test_bulkProcessing_M11_calib.sh | 3 +- .../test/test_bulkProcessing_M11_cosmic.sh | 3 +- .../test/test_bulkProcessing_beamSplashes.sh | 5 +-- .../test/test_bulkProcessing_calib.sh | 34 +++++++++++++++++++ ...alib2.sh => test_bulkProcessing_cosmic.sh} | 5 +-- .../test/test_bulkProcessing_pilotBeam.sh | 1 + ...est_bulkProcessing_pilotBeam_collisions.sh | 33 ++++++++++++++++++ .../test_bulkProcessing_pilotBeam_local.sh | 1 + .../test/test_data18PHYSLITE_mp.sh | 1 + .../test/test_data18PHYSLITE_mt.sh | 0 .../test/test_data18PHYSLITE_serial.sh | 1 + .../test/test_data18PHYSVAL_mp.sh | 0 .../test/test_data18PHYSVAL_mt.sh | 0 .../test/test_data18PHYSVAL_serial.sh | 0 .../test/test_data18PHYS_mp.sh | 1 + .../test/test_data18PHYS_mt.sh | 1 + .../test/test_data18PHYS_serial.sh | 1 + .../test/test_expressProcessing_M11_calib.sh | 3 +- .../test/test_expressProcessing_M11_cosmic.sh | 3 +- .../test_expressProcessing_beamSplashes.sh | 5 +-- .../test/test_expressProcessing_calib.sh | 34 +++++++++++++++++++ ...b2.sh => test_expressProcessing_cosmic.sh} | 5 +-- .../test/test_expressProcessing_pilotBeam.sh | 1 + ..._expressProcessing_pilotBeam_collisions.sh | 34 +++++++++++++++++++ .../test_expressProcessing_pilotBeam_local.sh | 1 + .../test/test_expressstream_collisions_1.sh | 1 + ...est_expressstream_collisions_1_rawtoall.sh | 1 + .../test/test_expressstream_collisions_2.sh | 1 + .../test/test_expressstream_collisions_3.sh | 1 + .../test/test_expressstream_collisions_4.sh | 1 + .../test_mainstream_run357750_collisions.sh | 1 + ...stream_run357750_collisions_withouthist.sh | 1 + .../test/test_mc20PHYSLITE_mp.sh | 1 + .../test/test_mc20PHYSLITE_mt.sh | 0 .../test/test_mc20PHYSLITE_serial.sh | 1 + .../test/test_mc20PHYSVAL_mp.sh | 1 + .../test/test_mc20PHYSVAL_mt.sh | 0 .../test/test_mc20PHYSVAL_serial.sh | 1 + .../Tier0ChainTests/test/test_mc20PHYS_mp.sh | 1 + .../Tier0ChainTests/test/test_mc20PHYS_mt.sh | 0 .../test/test_mc20PHYS_serial.sh | 1 + Tools/Tier0ChainTests/test/test_q220.sh | 1 + Tools/Tier0ChainTests/test/test_q220_mp.sh | 1 + Tools/Tier0ChainTests/test/test_q220_mt1.sh | 0 Tools/Tier0ChainTests/test/test_q222.sh | 0 Tools/Tier0ChainTests/test/test_q222_mp.sh | 0 Tools/Tier0ChainTests/test/test_q223.sh | 1 + Tools/Tier0ChainTests/test/test_q223_mp.sh | 1 + Tools/Tier0ChainTests/test/test_q223_mt1.sh | 0 Tools/Tier0ChainTests/test/test_q431.sh | 1 + Tools/Tier0ChainTests/test/test_q431_mp.sh | 1 + Tools/Tier0ChainTests/test/test_q431_mt1.sh | 0 Tools/Tier0ChainTests/test/test_q442.sh | 1 + Tools/Tier0ChainTests/test/test_q442_mp.sh | 1 + Tools/Tier0ChainTests/test/test_q443.sh | 1 + .../Tier0ChainTests/test/test_q443_serial.sh | 1 + Tools/Tier0ChainTests/test/test_q444.sh | 1 + .../Tier0ChainTests/test/test_q444_serial.sh | 1 + Tools/Tier0ChainTests/test/test_reco_mc16e.sh | 1 + .../test/test_reco_with_derived_outputs.sh | 1 + .../test/test_reco_with_derived_outputs_2.sh | 1 + .../test_reprocessing_with_derived_outputs.sh | 1 + .../test/test_valid1PHYS_mp.sh | 1 + 63 files changed, 194 insertions(+), 12 deletions(-) mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_bulkProcessing_M11_cosmic.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh create mode 100644 Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh rename Tools/Tier0ChainTests/test/{test_expressProcessing_M11_calib2.sh => test_bulkProcessing_cosmic.sh} (85%) mode change 100755 => 100644 mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh create mode 100644 Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYSLITE_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYSLITE_mt.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYSLITE_serial.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYSVAL_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYSVAL_mt.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYSVAL_serial.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressProcessing_M11_cosmic.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh create mode 100644 Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh rename Tools/Tier0ChainTests/test/{test_bulkProcessing_M11_calib2.sh => test_expressProcessing_cosmic.sh} (86%) mode change 100755 => 100644 mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh create mode 100644 Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYSLITE_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYSLITE_mt.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYSLITE_serial.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mt.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYS_mt.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q220.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q220_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q220_mt1.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q222.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q222_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q223.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q223_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q223_mt1.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q431.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q431_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q431_mt1.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q442.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q442_mp.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q443.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q443_serial.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q444.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_q444_serial.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_reco_mc16e.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh mode change 100755 => 100644 Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib.sh old mode 100755 new mode 100644 index 1ffdaf78d2ef..491e2e8c5993 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: @@ -10,7 +11,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle- Reco_tf.py \ ---AMI f1206 \ +--AMI f1210 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00412340.physics_CosmicCalo.daq.RAW._lb0018._SFO-14._0001.data" \ --outputAODFile="AOD.root" \ --outputESDFile="ESD.pool.root" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_cosmic.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_cosmic.sh old mode 100755 new mode 100644 index 5cafc51a4d1b..e55ba1cd6d36 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_cosmic.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_cosmic.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: @@ -10,7 +11,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle- Reco_tf.py \ ---AMI f1206 \ +--AMI f1210 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_cos.00412343.physics_Main.daq.RAW._lb0840._SFO-13._0001.data" \ --outputAODFile="AOD.root" \ --outputESDFile="ESD.pool.root" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh old mode 100755 new mode 100644 index e66839fa0834..c05c4d4ae5fd --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_beamSplashes.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: @@ -10,8 +11,8 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle- Reco_tf.py \ ---AMI f1206 \ ---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00417320.express_express.merge.RAW._lb0108._SFO-ALL._0001.1" \ +--AMI f1210 \ +--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" \ --outputAODFile="AOD.root" \ --outputESDFile="ESD.pool.root" \ --outputDAOD_L1CALO2File="L1CALO2.pool.root" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh new file mode 100644 index 000000000000..1c04c6f3ddfd --- /dev/null +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_calib.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# +# art-description: Express processing at Tier0 +# art-type: grid +# art-include: master/Athena +# 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 f1210 \ +--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" \ +--outputAODFile="AOD.root" \ +--outputESDFile="ESD.pool.root" \ +--outputDAOD_L1CALO2File="L1CALO2.pool.root" \ +--outputHISTFile="HIST.root" \ +--imf False + +rc1=$? +echo "art-result: $rc1 Reco" + +rc2=-9999 +if [ ${rc1} -eq 0 ] +then + ArtPackage=$1 + ArtJobName=$2 + art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool + rc2=$? +fi +echo "art-result: ${rc2} Diff" + diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib2.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh old mode 100755 new mode 100644 similarity index 85% rename from Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib2.sh rename to Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh index 105d5844524b..b4aeabd8b317 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib2.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_cosmic.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: @@ -10,8 +11,8 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle- Reco_tf.py \ ---AMI x627 \ ---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00412340.express_express.daq.RAW._lb0015._SFO-15._0002.data" \ +--AMI f1210 \ +--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" \ --outputAODFile="AOD.root" \ --outputESDFile="ESD.pool.root" \ --outputDAOD_L1CALO2File="L1CALO2.pool.root" \ diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh old mode 100755 new mode 100644 index 66862a3b1658..4032586cc97f --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# 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: diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh new file mode 100644 index 000000000000..88ccb428bad7 --- /dev/null +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_collisions.sh @@ -0,0 +1,33 @@ +#!/bin/sh +# +# art-description: RecoTrf +# art-type: grid +# art-include: master/Athena +# 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 f1211 \ +--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" \ +--outputAODFile="AOD.root" \ +--outputESDFile="ESD.pool.root" \ +--outputDAOD_L1CALO2File="L1CALO2.pool.root" \ +--outputHISTFile="HIST.root" \ +--imf False + +rc1=$? +echo "art-result: $rc1 Reco" + +rc2=-9999 +if [ ${rc1} -eq 0 ] +then + ArtPackage=$1 + ArtJobName=$2 + art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool + rc2=$? +fi +echo "art-result: ${rc2} Diff" + diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh old mode 100755 new mode 100644 index b643fb6bde3c..6c8891026278 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh +++ b/Tools/Tier0ChainTests/test/test_bulkProcessing_pilotBeam_local.sh @@ -3,6 +3,7 @@ # art-description: Test for bulk processing at Tier0 # art-type: local # art-include: master/Athena +# art-include: 22.0/Athena # 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 diff --git a/Tools/Tier0ChainTests/test/test_data18PHYSLITE_mp.sh b/Tools/Tier0ChainTests/test/test_data18PHYSLITE_mp.sh old mode 100755 new mode 100644 index ed00681b5b7e..56e2f857722c --- a/Tools/Tier0ChainTests/test/test_data18PHYSLITE_mp.sh +++ b/Tools/Tier0ChainTests/test/test_data18PHYSLITE_mp.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYSLITE data18 MP # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_data18PHYSLITE_mt.sh b/Tools/Tier0ChainTests/test/test_data18PHYSLITE_mt.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_data18PHYSLITE_serial.sh b/Tools/Tier0ChainTests/test/test_data18PHYSLITE_serial.sh old mode 100755 new mode 100644 index 51cbf7b52de9..4b74bb05dd37 --- a/Tools/Tier0ChainTests/test/test_data18PHYSLITE_serial.sh +++ b/Tools/Tier0ChainTests/test/test_data18PHYSLITE_serial.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYSLITE data18 # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_data18PHYSVAL_mp.sh b/Tools/Tier0ChainTests/test/test_data18PHYSVAL_mp.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_data18PHYSVAL_mt.sh b/Tools/Tier0ChainTests/test/test_data18PHYSVAL_mt.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_data18PHYSVAL_serial.sh b/Tools/Tier0ChainTests/test/test_data18PHYSVAL_serial.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh b/Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh old mode 100755 new mode 100644 index b416d9ba611c..c5aaad4a1541 --- a/Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh +++ b/Tools/Tier0ChainTests/test/test_data18PHYS_mp.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYS data18 MP # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh b/Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh old mode 100755 new mode 100644 index 8801962e10b3..a052b05d6f54 --- a/Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh +++ b/Tools/Tier0ChainTests/test/test_data18PHYS_mt.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYS data18 MT # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh b/Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh old mode 100755 new mode 100644 index 1336da8a250d..8a99b20b8050 --- a/Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh +++ b/Tools/Tier0ChainTests/test/test_data18PHYS_serial.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYS data18 # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib.sh old mode 100755 new mode 100644 index 6c4448ae7b1f..4d25eb34f436 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib.sh +++ b/Tools/Tier0ChainTests/test/test_expressProcessing_M11_calib.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: @@ -10,7 +11,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle- Reco_tf.py \ ---AMI x627 \ +--AMI x638 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00412340.physics_CosmicCalo.daq.RAW._lb0018._SFO-14._0001.data" \ --outputAODFile="AOD.root" \ --outputESDFile="ESD.pool.root" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_M11_cosmic.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_M11_cosmic.sh old mode 100755 new mode 100644 index 1387d3cb0505..feba709a9e4f --- a/Tools/Tier0ChainTests/test/test_expressProcessing_M11_cosmic.sh +++ b/Tools/Tier0ChainTests/test/test_expressProcessing_M11_cosmic.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: @@ -10,7 +11,7 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle- Reco_tf.py \ ---AMI x627 \ +--AMI x638 \ --inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_cos.00412343.physics_Main.daq.RAW._lb0840._SFO-13._0001.data" \ --outputAODFile="AOD.root" \ --outputESDFile="ESD.pool.root" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh old mode 100755 new mode 100644 index 9a2fd1cc5fbb..ed1a5bb0b650 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh +++ b/Tools/Tier0ChainTests/test/test_expressProcessing_beamSplashes.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: @@ -10,8 +11,8 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle- Reco_tf.py \ ---AMI x627 \ ---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_comm.00417320.express_express.merge.RAW._lb0108._SFO-ALL._0001.1" \ +--AMI x638 \ +--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" \ --outputAODFile="AOD.root" \ --outputESDFile="ESD.pool.root" \ --outputDAOD_L1CALO2File="L1CALO2.pool.root" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh new file mode 100644 index 000000000000..483b497a8de6 --- /dev/null +++ b/Tools/Tier0ChainTests/test/test_expressProcessing_calib.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# +# art-description: Express processing at Tier0 +# art-type: grid +# art-include: master/Athena +# 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 x638 \ +--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" \ +--outputAODFile="AOD.root" \ +--outputESDFile="ESD.pool.root" \ +--outputDAOD_L1CALO2File="L1CALO2.pool.root" \ +--outputHISTFile="HIST.root" \ +--imf False + +rc1=$? +echo "art-result: $rc1 Reco" + +rc2=-9999 +if [ ${rc1} -eq 0 ] +then + ArtPackage=$1 + ArtJobName=$2 + art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool + rc2=$? +fi +echo "art-result: ${rc2} Diff" + diff --git a/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib2.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh old mode 100755 new mode 100644 similarity index 86% rename from Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib2.sh rename to Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh index fc828bc57471..60182bbe5220 --- a/Tools/Tier0ChainTests/test/test_bulkProcessing_M11_calib2.sh +++ b/Tools/Tier0ChainTests/test/test_expressProcessing_cosmic.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: @@ -10,8 +11,8 @@ export TNS_ADMIN=/cvmfs/atlas.cern.ch/repo/sw/database/DBRelease/current/oracle- Reco_tf.py \ ---AMI f1206 \ ---inputBSFile="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/Tier0ChainTests/TCT_Run3/data22_calib.00412340.express_express.daq.RAW._lb0015._SFO-15._0002.data" \ +--AMI x638 \ +--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" \ --outputAODFile="AOD.root" \ --outputESDFile="ESD.pool.root" \ --outputDAOD_L1CALO2File="L1CALO2.pool.root" \ diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh old mode 100755 new mode 100644 index 680554d7c8e1..057de924305b --- a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh +++ b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam.sh @@ -3,6 +3,7 @@ # art-description: Express processing at Tier0 # art-type: grid # art-include: master/Athena +# 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: diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh new file mode 100644 index 000000000000..0003c71fd7c5 --- /dev/null +++ b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_collisions.sh @@ -0,0 +1,34 @@ +#!/bin/sh +# +# art-description: Express processing at Tier0 +# art-type: grid +# art-include: master/Athena +# 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 x641 \ +--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" \ +--outputAODFile="AOD.root" \ +--outputESDFile="ESD.pool.root" \ +--outputDAOD_L1CALO2File="L1CALO2.pool.root" \ +--outputHISTFile="HIST.root" \ +--imf False + +rc1=$? +echo "art-result: $rc1 Reco" + +rc2=-9999 +if [ ${rc1} -eq 0 ] +then + ArtPackage=$1 + ArtJobName=$2 + art.py compare grid --entries 30 ${ArtPackage} ${ArtJobName} --mode=semi-detailed --order-trees --ignore-exit-code diff-pool + rc2=$? +fi +echo "art-result: ${rc2} Diff" + diff --git a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh old mode 100755 new mode 100644 index 508a74ee0dd1..61de45648074 --- a/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh +++ b/Tools/Tier0ChainTests/test/test_expressProcessing_pilotBeam_local.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: local # art-include: master/Athena +# art-include: 22.0/Athena # 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 diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh old mode 100755 new mode 100644 index 6dae7a2162bc..16efa7e2870f --- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh +++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_1.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh old mode 100755 new mode 100644 index 9986f046236b..2e51324efe03 --- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh +++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_1_rawtoall.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh old mode 100755 new mode 100644 index 6748549c1a27..41a0607ae28c --- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh +++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_2.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh old mode 100755 new mode 100644 index d703a41a1b65..5b21e3d4a1a4 --- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh +++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_3.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh b/Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh old mode 100755 new mode 100644 index d01cd889aaff..fb843406878e --- a/Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh +++ b/Tools/Tier0ChainTests/test/test_expressstream_collisions_4.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh b/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh old mode 100755 new mode 100644 index c38df5ba7b75..48e1c324e1cf --- a/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh +++ b/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh b/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh old mode 100755 new mode 100644 index 2369b7e35720..6b2afcdaa86d --- a/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh +++ b/Tools/Tier0ChainTests/test/test_mainstream_run357750_collisions_withouthist.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_mp.sh b/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_mp.sh old mode 100755 new mode 100644 index 6601d4a4430c..6d90db7e155f --- a/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_mp.sh +++ b/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_mp.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYSLITE mc20 MP # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_mt.sh b/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_mt.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_serial.sh b/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_serial.sh old mode 100755 new mode 100644 index 10f763ef1c39..6e2e1c09e098 --- a/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_serial.sh +++ b/Tools/Tier0ChainTests/test/test_mc20PHYSLITE_serial.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYSLITE mc20 # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh old mode 100755 new mode 100644 index 4c3857b626c1..45fd7d986072 --- a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh +++ b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mp.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYSVAL mc20 MP # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mt.sh b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_mt.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh old mode 100755 new mode 100644 index fdfd4234008e..ce782c7633d5 --- a/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh +++ b/Tools/Tier0ChainTests/test/test_mc20PHYSVAL_serial.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYSVAL mc20 # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh b/Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh old mode 100755 new mode 100644 index 985612b9820f..ab3a0b542722 --- a/Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh +++ b/Tools/Tier0ChainTests/test/test_mc20PHYS_mp.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYS mc20 MP # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYS_mt.sh b/Tools/Tier0ChainTests/test/test_mc20PHYS_mt.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh b/Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh old mode 100755 new mode 100644 index 2f9e8ccc46a9..28fe9498119e --- a/Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh +++ b/Tools/Tier0ChainTests/test/test_mc20PHYS_serial.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYS mc20 # art-type: grid diff --git a/Tools/Tier0ChainTests/test/test_q220.sh b/Tools/Tier0ChainTests/test/test_q220.sh old mode 100755 new mode 100644 index ab0ef3216ea1..bc7159e8eb19 --- a/Tools/Tier0ChainTests/test/test_q220.sh +++ b/Tools/Tier0ChainTests/test/test_q220.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_q220_mp.sh b/Tools/Tier0ChainTests/test/test_q220_mp.sh old mode 100755 new mode 100644 index 0c3eb68e72f0..05f1485ea8f7 --- a/Tools/Tier0ChainTests/test/test_q220_mp.sh +++ b/Tools/Tier0ChainTests/test/test_q220_mp.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_q220_mt1.sh b/Tools/Tier0ChainTests/test/test_q220_mt1.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_q222.sh b/Tools/Tier0ChainTests/test/test_q222.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_q222_mp.sh b/Tools/Tier0ChainTests/test/test_q222_mp.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_q223.sh b/Tools/Tier0ChainTests/test/test_q223.sh old mode 100755 new mode 100644 index 150db3347e33..ced1fb332dab --- a/Tools/Tier0ChainTests/test/test_q223.sh +++ b/Tools/Tier0ChainTests/test/test_q223.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_q223_mp.sh b/Tools/Tier0ChainTests/test/test_q223_mp.sh old mode 100755 new mode 100644 index 7d4e80d6b26e..91fd3a21cb52 --- a/Tools/Tier0ChainTests/test/test_q223_mp.sh +++ b/Tools/Tier0ChainTests/test/test_q223_mp.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_q223_mt1.sh b/Tools/Tier0ChainTests/test/test_q223_mt1.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_q431.sh b/Tools/Tier0ChainTests/test/test_q431.sh old mode 100755 new mode 100644 index 2db560847843..e842a42ee86a --- a/Tools/Tier0ChainTests/test/test_q431.sh +++ b/Tools/Tier0ChainTests/test/test_q431.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_q431_mp.sh b/Tools/Tier0ChainTests/test/test_q431_mp.sh old mode 100755 new mode 100644 index 57345da8d2dc..eefda55882ea --- a/Tools/Tier0ChainTests/test/test_q431_mp.sh +++ b/Tools/Tier0ChainTests/test/test_q431_mp.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_q431_mt1.sh b/Tools/Tier0ChainTests/test/test_q431_mt1.sh old mode 100755 new mode 100644 diff --git a/Tools/Tier0ChainTests/test/test_q442.sh b/Tools/Tier0ChainTests/test/test_q442.sh old mode 100755 new mode 100644 index 8d06ba66467c..15116eaeeb96 --- a/Tools/Tier0ChainTests/test/test_q442.sh +++ b/Tools/Tier0ChainTests/test/test_q442.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_q442_mp.sh b/Tools/Tier0ChainTests/test/test_q442_mp.sh old mode 100755 new mode 100644 index 69db671c42cb..8fb79efb1f58 --- a/Tools/Tier0ChainTests/test/test_q442_mp.sh +++ b/Tools/Tier0ChainTests/test/test_q442_mp.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_q443.sh b/Tools/Tier0ChainTests/test/test_q443.sh old mode 100755 new mode 100644 index d5ab8504f12e..a87370bebfa5 --- a/Tools/Tier0ChainTests/test/test_q443.sh +++ b/Tools/Tier0ChainTests/test/test_q443.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_q443_serial.sh b/Tools/Tier0ChainTests/test/test_q443_serial.sh old mode 100755 new mode 100644 index 373aec0a6dfa..fd795ce7182c --- a/Tools/Tier0ChainTests/test/test_q443_serial.sh +++ b/Tools/Tier0ChainTests/test/test_q443_serial.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena Reco_tf.py \ diff --git a/Tools/Tier0ChainTests/test/test_q444.sh b/Tools/Tier0ChainTests/test/test_q444.sh old mode 100755 new mode 100644 index 08bb243e6bce..338987ff70cf --- a/Tools/Tier0ChainTests/test/test_q444.sh +++ b/Tools/Tier0ChainTests/test/test_q444.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-athena-mt: 8 diff --git a/Tools/Tier0ChainTests/test/test_q444_serial.sh b/Tools/Tier0ChainTests/test/test_q444_serial.sh old mode 100755 new mode 100644 index 26655d8bb46b..58bd501b9c4c --- a/Tools/Tier0ChainTests/test/test_q444_serial.sh +++ b/Tools/Tier0ChainTests/test/test_q444_serial.sh @@ -3,6 +3,7 @@ # art-description: RecoTrf # art-type: grid # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena Reco_tf.py \ diff --git a/Tools/Tier0ChainTests/test/test_reco_mc16e.sh b/Tools/Tier0ChainTests/test/test_reco_mc16e.sh old mode 100755 new mode 100644 index dbe26e5e3f1f..778a5f90d1c1 --- a/Tools/Tier0ChainTests/test/test_reco_mc16e.sh +++ b/Tools/Tier0ChainTests/test/test_reco_mc16e.sh @@ -4,6 +4,7 @@ # art-type: grid # art-include: 21.0/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh old mode 100755 new mode 100644 index 7c300cd2067a..71f8e10b79f4 --- a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh +++ b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh old mode 100755 new mode 100644 index 51029a190c81..5c178b9e3b2e --- a/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh +++ b/Tools/Tier0ChainTests/test/test_reco_with_derived_outputs_2.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh b/Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh old mode 100755 new mode 100644 index 86df7e60afe0..04cfd6f9f961 --- a/Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh +++ b/Tools/Tier0ChainTests/test/test_reprocessing_with_derived_outputs.sh @@ -5,6 +5,7 @@ # art-include: 21.0/Athena # art-include: 21.0-TrigMC/Athena # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-include: 21.3/Athena # art-include: 21.9/Athena diff --git a/Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh b/Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh old mode 100755 new mode 100644 index cbb02c77a0d4..eab6c53eae29 --- a/Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh +++ b/Tools/Tier0ChainTests/test/test_valid1PHYS_mp.sh @@ -1,6 +1,7 @@ #!/bin/sh # art-include: master/Athena +# art-include: 22.0/Athena # art-include: 22.0-mc20/Athena # art-description: DAOD building PHYS valid1 MP # art-type: grid -- GitLab