Merge branch 'master-directioart_20210225_2' into 'master'

DirectIOART: disable athenamp_recotf_with_rdo and add athenamp_recotf_with_aod

See merge request atlas/athena!41060

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_davs.sh

+#!/bin/bash
+
+# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:AOD protocol=DAVS
+# art-type: grid
+# art-output: *.pool.root
+# art-include: master/Athena
+# art-athena-mt: 2
+
+set -e
+
+unset ATHENA_PROC_NUMBER; Reco_tf.py --athenaopts='--nprocs=2' --athenaMPMergeTargetSize 'DAOD_*:0' --inputAODFile davs://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data18_13TeV/4e/57/data18_13TeV.00349263.physics_Main.merge.AOD.f937_m1972._lb0149._0001.1 --outputDAODFile art.pool.root --reductionConf PHYS --maxEvents 10 --preExec 'from AthenaCommon.DetFlags import DetFlags; DetFlags.detdescr.all_setOff(); DetFlags.BField_setOn(); DetFlags.pileup.all_setOff(); DetFlags.overlay.all_setOff(); from AthenaCommon.AlgSequence import AlgSequence; topSequence = AlgSequence(); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("BTaggingELFixer", Containers = ["BTagging_AntiKt4EMTopoAux."] ); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("JetELFixer", Containers = ["AntiKt4EMTopoJetsAux."] );'
+
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputAOD_protocol_DAVS"

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_https.sh

+#!/bin/bash
+
+# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:AOD protocol=HTTPS
+# art-type: grid
+# art-output: *.pool.root
+# art-include: master/Athena
+# art-athena-mt: 2
+
+set -e
+
+unset ATHENA_PROC_NUMBER; Reco_tf.py --athenaopts='--nprocs=2' --athenaMPMergeTargetSize 'DAOD_*:0' --inputAODFile https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data18_13TeV/4e/57/data18_13TeV.00349263.physics_Main.merge.AOD.f937_m1972._lb0149._0001.1 --outputDAODFile art.pool.root --reductionConf PHYS --maxEvents 10 --preExec 'from AthenaCommon.DetFlags import DetFlags; DetFlags.detdescr.all_setOff(); DetFlags.BField_setOn(); DetFlags.pileup.all_setOff(); DetFlags.overlay.all_setOff(); from AthenaCommon.AlgSequence import AlgSequence; topSequence = AlgSequence(); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("BTaggingELFixer", Containers = ["BTagging_AntiKt4EMTopoAux."] ); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("JetELFixer", Containers = ["AntiKt4EMTopoJetsAux."] );'
+
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputAOD_protocol_HTTPS"

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_aod_root.sh

+#!/bin/bash
+
+# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:AOD protocol=ROOT
+# art-type: grid
+# art-output: *.pool.root
+# art-include: master/Athena
+# art-athena-mt: 2
+
+set -e
+
+unset ATHENA_PROC_NUMBER; Reco_tf.py --athenaopts='--nprocs=2' --athenaMPMergeTargetSize 'DAOD_*:0' --inputAODFile root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/data18_13TeV/4e/57/data18_13TeV.00349263.physics_Main.merge.AOD.f937_m1972._lb0149._0001.1 --outputDAODFile art.pool.root --reductionConf PHYS --maxEvents 10 --preExec 'from AthenaCommon.DetFlags import DetFlags; DetFlags.detdescr.all_setOff(); DetFlags.BField_setOn(); DetFlags.pileup.all_setOff(); DetFlags.overlay.all_setOff(); from AthenaCommon.AlgSequence import AlgSequence; topSequence = AlgSequence(); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("BTaggingELFixer", Containers = ["BTagging_AntiKt4EMTopoAux."] ); topSequence += CfgMgr.xAODMaker__DynVarFixerAlg("JetELFixer", Containers = ["AntiKt4EMTopoJetsAux."] );'
+
+echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputAOD_protocol_ROOT"

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_davs.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-output: *.pool.root
 # art-include: 21.0/Athena
-# art-include: master/Athena
 # art-athena-mt: 2
 
 set -e

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_https.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-output: *.pool.root
 # art-include: 21.0/Athena
-# art-include: master/Athena
 # art-athena-mt: 2
 
 set -e

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_root.sh

@@ -4,7 +4,6 @@
 # art-type: grid
 # art-output: *.pool.root
 # art-include: 21.0/Athena
-# art-include: master/Athena
 # art-athena-mt: 2
 
 set -e