Merge branch 'cherry-pick-782983e9-21.0' into '21.0'

Sweeping !22721 from 21.3 to 21.0.
Add new test in TrigAnalysisTest for RDO->RDO_FTK (ATR-19672)

See merge request atlas/athena!22778

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh

@@ -3,8 +3,8 @@
 # art-description: Test of Trigger NTUP_PHYSVAL 
 # art-type: grid
 # art-include: 21.3/Athena
+# art-include: 21.0/Athena
 # art-include: master/Athena
-# art-include: master/AthenaP1
 # art-output: *check*
 # art-output: *.log
 # art-output: log.*
@@ -53,5 +53,9 @@ done
 echo  "art-result: $? web"
 
 
+echo "ls PHYSVAL_WEB"
+ls PHYSVAL_WEB
+
+
 
 

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_rdo_to_rdoftk_grid.sh

+#!/bin/bash
+
+# art-description: Test of Trigger FTK RDO->RDO_FTK 
+# art-type: grid
+# art-include: 21.3/Athena
+# art-include: 21.0/Athena
+# art-include: master/Athena
+# art-output: *check*
+# art-output: *.log
+# art-output: log.*
+# art-output: *.root
+# art-output: *.pmon.gz
+# art-output: TotalEventsProcessed.txt
+
+
+export NAME="mc_rdo_to_rdoftk_grid"
+export JOB_LOG="athena.log"
+export TEST="TrigAnalysisTest"
+export NEVT=100
+#export DS='/eos/atlas/atlascerngroupdisk/data-art/grid-input/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11234/RDO.17071942._000179.pool.root.1'
+export DS='/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11234/RDO.17071942._000179.pool.root.1'
+
+TrigFTKTM64SM1Un_tf.py --inputRDOFile=${DS} --runNumber="410000"  --outputRDO_FTKFile="RDO_FTK.pool.root" --CachedBank="True" --Clustering="False" --SctClustering="0" --ConstantsDir="/cvmfs/atlas.cern.ch/repo/sw/database/GroupData/FTK" --FTKSetupTag="64Tower2018.v1.ECFix" --FitConstantsVersion="ftk.64tower.2016.mc16.v2" --PatternsVersion="ftk.64tower.2016.mc16.v2"  --maxEvents="10" --postExec "RDOFTKCreator:from AthenaCommon.AlgSequence import AlgSequence;AlgSequence().FTK_RDO_CreatorAlgo.TrainingBeamspotX=-0.5;AlgSequence().FTK_RDO_CreatorAlgo.TrainingBeamspotY=-0.5;AlgSequence().FTK_RDO_CreatorAlgo.ReverseIBLlocX=True" --preExec "RAWtoESD:rec.doCalo=False;rec.doInDet=True;rec.doMuon=False;rec.doJetMissingETTag=False;rec.doEgamma=False;rec.doMuonCombined=False;rec.doTau=False;rec.doTrigger=False;rec.UserAlgs=[\"FastTrackSimWrap/FastTrackSimRegionalWrap_64TowersIBL3D_HWModeID2_jobOptions.py\"]" --skipEvents="0" > output.log
+
+echo "art-result: $? athena"
+
+
+