Merge branch 'cherry-pick-2954ac6e2a-master' into 'master'

Sweeping !21300 from 21.3 to master.
Update TrigAnalysisTest ART tests

See merge request atlas/athena!21378

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_ntup_physval_grid.sh

+#!/bin/bash
+
+# art-description: Test of Trigger NTUP_PHYSVAL 
+# art-type: grid
+# art-include: 21.3/Athena
+# art-include: master/Athena
+# art-include: master/AthenaP1
+# art-output: *check*
+# art-output: *.log
+# art-output: log.*
+# art-output: *.root
+# art-output: *.pmon.gz
+# art-output: TotalEventsProcessed.txt
+# art-output: PHYSVAL_WEB
+
+export NAME="mc_ntup_physval_grid"
+export JOB_LOG="athena.log"
+export TEST="TrigAnalysisTest"
+export NEVT=10
+export DS='/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_MC_pp_v7_chain/AOD.pool.root'
+
+Reco_tf.py --inputAODFile=${DS}  --preExec "all:from InDetPhysValMonitoring.InDetPhysValJobProperties import InDetPhysValFlags; InDetPhysValFlags.doValidateTightPrimaryTracks.set_Value_and_Lock(True);" --skipEvents="0" --maxEvents=${NEVT} --valid="True"  --jobNumber="1" --validationFlags doExample,doMET,doPFlow,doEgamma,doInDet,doTau,doJet,doBtag,doZee,doMuon,doTrigEgamma,doTrigBphys,doTrigMET,doTrigJet,doTrigMuon,doTrigHLTResult,doTrigCalo,doTrigMinBias,doTrigTau,doTrigIDtrk,doTrigBjet --outputNTUP_PHYSVALFile="NTUP_PHYSVAL.pool.root" > output.log 
+
+echo "art-result: $? PhysVal"
+
+
+
+# We need to place a reference file on cvmfs
+#physval_make_web_display.py --ratio  --reffile Ref:PHYSVAL_all.root --title Test PHYSVAL_all.root --outdir PHYSVAL_WEB
+mkdir PHYSVAL_WEB
+#domains="BTag Ele Gam IDTrk Jets Muons MET PFlow TopoClusters"
+###domains="BTag Electron IDPerformanceMon Jets MET Muons PFlow Photon Summary Tau TopoClusters"
+###doTrigEgamma,doTrigBphys,doTrigMET,doTrigJet,doTrigMuon,doTrigHLTResult,doTrigCalo,doTrigMinBias,doTrigTau,doTrigIDtrk,doTrigBjet
+#for slice in ${domains}
+#do 
+#      physval_make_web_display.py --ratio --reffile Ref:/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/DerivationFrameworkPhysicsValidation/PHYSVAL_all_reference.root --title Test PHYSVAL_all.root --outdir PHYSVAL_WEB/${slice} --startpath ${slice}
+      physval_make_web_display.py --ratio --drawopt HISTPE --refdrawopt HIST --reffile Ref:NTUP_PHYSVAL.pool.root --title Test  --outdir PHYSVAL_WEB --startpath run_1/HLT NTUP_PHYSVAL.pool.root
+#done
+echo  "art-result: $? web"
+
+
+
+#ArtPackage=$1
+#ArtJobName=$2
+#art.py compare grid --entries 10 ${ArtPackage} ${ArtJobName}
+#echo "art-result: $? Diff"

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_build.sh

+#!/bin/bash
+
+# art-description: Trigger MC pp v7 RDO to AOD test FTK
+# art-type: build
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-output: *check*
+# art-output: HLTChain.txt
+# art-output: HLTTE.txt
+# art-output: L1AV.txt
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
+# art-output: *.log
+# art-output: *.root
+# art-output: ntuple.pmon.gz
+# art-output: *perfmon*
+# art-output: TotalEventsProcessed.txt
+# art-output: AOD.pool.root.checkFile0
+# art-output: AOD.pool.root.checkFiletrigSize.txt
+# art-output: *.regtest.new
+
+export NAME="mc_pp_v7_ftk_rdotoaod_build"
+export INPUT="ftk"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="MC_pp_v7"
+export EVENTS="3"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
+export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoaod_grid.sh

+#!/bin/bash
+
+# art-description: Trigger MC pp v7 RDO to AOD test with FTK
+# art-type: grid
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-output: *check*
+# art-output: HLTChain.txt
+# art-output: HLTTE.txt
+# art-output: L1AV.txt
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
+# art-output: *.log
+# art-output: *.root
+# art-output: ntuple.pmon.gz
+# art-output: *perfmon*
+# art-output: TotalEventsProcessed.txt
+# art-output: AOD.pool.root.checkFile0
+# art-output: AOD.pool.root.checkFiletrigSize.txt
+# art-output: *.regtest.new
+
+export NAME="mc_pp_v7_ftk_rdotoaod_grid"
+export INPUT="ftk"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="MC_pp_v7"
+export EVENTS="100"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
+export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_build.sh

 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files. With FTK
 # art-type: build
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
@@ -22,13 +22,14 @@
 # art-output: TotalEventsProcessed.txt
 # art-output: *.regtest
 
-export NAME="mc_pp_v7_rdotoesdaod_build"
+export NAME="mc_pp_v7_ftk_rdotoesdaod_build"
 export INPUT="ftk"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
 export MENU="MC_pp_v7"
 export EVENTS="3"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
+export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
 
 source exec_athena_art_trigger_validation.sh
 source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_ftk_rdotoesdaod_grid.sh

 #!/bin/bash
 
-# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files. With FTK
 # art-type: grid
 # art-include: 21.0/Athena
 # art-include: 21.3/Athena
@@ -25,13 +25,14 @@
 # art-output: *.regtest
 
 
-export NAME="mc_pp_v7_rdotoesdaod_grid"
+export NAME="mc_pp_v7_ftk_rdotoesdaod_grid"
 export INPUT="ftk"
 export COST_MONITORING="False"
 export TEST="TrigAnalysisTest"
 export MENU="MC_pp_v7"
 export EVENTS="100"
 export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
+export EXTRA="from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True;from RecExConfig.RecFlags import rec;rec.doFTK.set_Value_and_Lock(True);"
 
 source exec_athena_art_trigger_validation.sh
 source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_build.sh

+#!/bin/bash
+
+# art-description: Trigger MC pp v7 RDO to AOD test
+# art-type: build
+# art-include: 21.0/Athena
+# art-include: 21.3/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-output: *check*
+# art-output: HLTChain.txt
+# art-output: HLTTE.txt
+# art-output: L1AV.txt
+# art-output: HLTconfig*.xml
+# art-output: L1Topoconfig*.xml
+# art-output: LVL1config*.xml
+# art-output: *.log
+# art-output: *.root
+# art-output: ntuple.pmon.gz
+# art-output: *perfmon*
+# art-output: TotalEventsProcessed.txt
+# art-output: AOD.pool.root.checkFile0
+# art-output: AOD.pool.root.checkFiletrigSize.txt
+# art-output: *.regtest.new
+
+export NAME="mc_pp_v7_rdotoaod_build"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="MC_pp_v7"
+export EVENTS="3"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh