DirectIOART: remove obsolete tests and update Sim_tf tests

DirectIOART: remove obsolete tests and update Sim_tf tests

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_davs.sh

-#!/bin/bash
-
-# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:RDO protocol=DAVS
-# art-type: grid
-# art-output: *.pool.root
-# art-include: 21.0/Athena
-# art-athena-mt: 2
-
-set -e
-
-unset ATHENA_PROC_NUMBER; Reco_tf.py --AMI q221 --athenaopts="--nprocs=2 --threads=1" --inputRDOFile davs://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
-
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_DAVS"

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_https.sh

-#!/bin/bash
-
-# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:RDO protocol=HTTPS
-# art-type: grid
-# art-output: *.pool.root
-# art-include: 21.0/Athena
-# art-athena-mt: 2
-
-set -e
-
-
-unset ATHENA_PROC_NUMBER; Reco_tf.py --AMI q221 --athenaopts="--nprocs=2 --threads=1" --inputRDOFile https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
-
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_HTTPS"

Tools/DirectIOART/test/test_directioart_athenamp_recotf_with_rdo_root.sh

-#!/bin/bash
-
-# art-description: DirectIOART AthenaMP Reco_tf.py inputFile:RDO protocol=ROOT
-# art-type: grid
-# art-output: *.pool.root
-# art-include: 21.0/Athena
-# art-athena-mt: 2
-
-set -e
-
-unset ATHENA_PROC_NUMBER; Reco_tf.py --AMI q221 --athenaopts="--nprocs=2 --threads=1" --inputRDOFile root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc16_13TeV/90/96/RDO.11373415._000001.pool.root.1 --outputRDO_TRIGFile art.pool.root
-
-echo "art-result: $? DirectIOART_AthenaMP_RecoTF_inputRDO_protocol_ROOT"

Tools/DirectIOART/test/test_directioart_athenamt_simtf_with_evnt_davs.sh

@@ -3,26 +3,22 @@
 # art-description: DirectIOART AthenaMT Sim_tf.py inputFile:EVNT protocol=DAVS
 # art-type: grid
 # art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
 # art-athena-mt: 2
 
 set -e
 
 Sim_tf.py \
-  --multithreaded="True" \
-  --inputEVNTFile=davs://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc21_13p6TeV/d3/3f/EVNT.29070483._000001.pool.root.1 \
-  --maxEvents=8 \
-  --postInclude "default:PyJobTransforms/UseFrontier.py" \
-  --preInclude "EVNTtoHITS:Campaigns/MC21SimulationMultipleIoV.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py" \
-  --randomSeed=4056 \
-  --DBRelease="all:300.0.4" \
-  --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-05" \
-  --geometryVersion="default:ATLAS-R3S-2021-03-00-00_VALIDATION" \
-  --runNumber=801165 \
-  --AMITag=s3873 \
-  --jobNumber=4056 \
-  --firstEvent=4055001 \
-  --outputHITSFile=hits.pool.root \
-  --simulator=FullG4MT_QS
+    --CA \
+    --multithreaded="True" \
+    --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+    --simulator 'FullG4MT' \
+    --postInclude 'PyJobTransforms.UseFrontier' \
+    --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
+    --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+    --inputEVNTFile=davs://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc21_13p6TeV/d3/3f/EVNT.29070483._000001.pool.root.1 \
+    --outputHITSFile "test.HITS.pool.root" \
+    --maxEvents 8 \
+    --imf False
 
 echo "art-result: $? DirectIOART_AthenaMT_SimTF_inputEVNT_protocol_DAVS"

Tools/DirectIOART/test/test_directioart_athenamt_simtf_with_evnt_https.sh

@@ -3,26 +3,22 @@
 # art-description: DirectIOART AthenaMT Sim_tf.py inputFile:EVNT protocol=HTTPS
 # art-type: grid
 # art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
 # art-athena-mt: 2
 
 set -e
 
 Sim_tf.py \
-  --multithreaded="True" \
-  --inputEVNTFile=https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc21_13p6TeV/d3/3f/EVNT.29070483._000001.pool.root.1 \
-  --maxEvents=8 \
-  --postInclude "default:PyJobTransforms/UseFrontier.py" \
-  --preInclude "EVNTtoHITS:Campaigns/MC21SimulationMultipleIoV.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py" \
-  --randomSeed=4056 \
-  --DBRelease="all:300.0.4" \
-  --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-05" \
-  --geometryVersion="default:ATLAS-R3S-2021-03-00-00_VALIDATION" \
-  --runNumber=801165 \
-  --AMITag=s3873 \
-  --jobNumber=4056 \
-  --firstEvent=4055001 \
-  --outputHITSFile=hits.pool.root \
-  --simulator=FullG4MT_QS
+    --CA \
+    --multithreaded="True" \
+    --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+    --simulator 'FullG4MT' \
+    --postInclude 'PyJobTransforms.UseFrontier' \
+    --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
+    --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+    --inputEVNTFile=https://lcg-lrz-http.grid.lrz.de:443/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc21_13p6TeV/d3/3f/EVNT.29070483._000001.pool.root.1 \
+    --outputHITSFile "test.HITS.pool.root" \
+    --maxEvents 8 \
+    --imf False
 
 echo "art-result: $? DirectIOART_AthenaMT_SimTF_inputEVNT_protocol_HTTPS"

Tools/DirectIOART/test/test_directioart_athenamt_simtf_with_evnt_root.sh

@@ -3,26 +3,22 @@
 # art-description: DirectIOART AthenaMT Sim_tf.py inputFile:EVNT protocol=ROOT
 # art-type: grid
 # art-output: *.pool.root
-# art-include: master/Athena
+# art-include: main/Athena
 # art-athena-mt: 2
 
 set -e
 
 Sim_tf.py \
-  --multithreaded="True" \
-  --inputEVNTFile=root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc21_13p6TeV/d3/3f/EVNT.29070483._000001.pool.root.1 \
-  --maxEvents=8 \
-  --postInclude "default:PyJobTransforms/UseFrontier.py" \
-  --preInclude "EVNTtoHITS:Campaigns/MC21SimulationMultipleIoV.py,SimulationJobOptions/preInclude.ExtraParticles.py,SimulationJobOptions/preInclude.G4ExtraProcesses.py" \
-  --randomSeed=4056 \
-  --DBRelease="all:300.0.4" \
-  --conditionsTag "default:OFLCOND-MC21-SDR-RUN3-05" \
-  --geometryVersion="default:ATLAS-R3S-2021-03-00-00_VALIDATION" \
-  --runNumber=801165 \
-  --AMITag=s3873 \
-  --jobNumber=4056 \
-  --firstEvent=4055001 \
-  --outputHITSFile=hits.pool.root \
-  --simulator=FullG4MT_QS
+    --CA \
+    --multithreaded="True" \
+    --conditionsTag 'default:OFLCOND-MC23-SDR-RUN3-01' \
+    --simulator 'FullG4MT' \
+    --postInclude 'PyJobTransforms.UseFrontier' \
+    --preInclude 'EVNTtoHITS:Campaigns.MC23aSimulationMultipleIoV' \
+    --geometryVersion 'default:ATLAS-R3S-2021-03-02-00' \
+    --inputEVNTFile=root://lcg-lrz-rootd.grid.lrz.de:1094/pnfs/lrz-muenchen.de/data/atlas/dq2/atlasdatadisk/rucio/mc21_13p6TeV/d3/3f/EVNT.29070483._000001.pool.root.1 \
+    --outputHITSFile "test.HITS.pool.root" \
+    --maxEvents 8 \
+    --imf False
 
 echo "art-result: $? DirectIOART_AthenaMT_SimTF_inputEVNT_protocol_ROOT"

Tools/DirectIOART/test/test_directioart_tfileopen.py

@@ -3,15 +3,6 @@
 # art-description: DirectIOART TFile::Open
 # art-type: grid
 # art-include: main/Athena
-# art-include: main/AthSimulation
-# art-include: 21.0/Athena
-# art-include: 21.0/AthSimulation
-# art-include: 21.2/AthAnalysis
-# art-include: 21.2/AthDerivation
-# art-include: 21.2/AnalysisBase
-# art-include: 21.2/AnalysisTop
-# art-include: 21.3/Athena
-# art-include: 21.9/Athena
 
 import ROOT
 import os
@@ -38,4 +29,4 @@ outstr = """<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 
 </POOLFILECATALOG>"""
 with open("PoolFileCatalog.xml", "w") as outfile:
-  outfile.write(outstr)
\ No newline at end of file
+  outfile.write(outstr)

Tools/DirectIOART/test/test_directioart_tfileopen_rucioredirector.py

@@ -3,8 +3,6 @@
 # art-description: DirectIOART TFile::Open RucioRedirector
 # art-type: grid
 # art-include: main/Athena
-# art-include: 21.2/AthAnalysis
-# art-include: 21.2/AnalysisBase
 
 import ROOT
 ROOT.gEnv.SetValue("Davix.Debug", 3.0)