Merge branch 'tamartin_13_Mar_TrigP1Test_21.0-mc16a' into '21.0-mc16a'

Sync TriggerValidation between 21.0 and 21.0-mc16a with pseduo-merge.

See merge request atlas/athena!9694

Former-commit-id: e314e166fc6ab95979e42fe10f575abb9c3b0118

Trigger/TrigValidation/TrigAnalysisTest/CMakeLists.txt

@@ -73,4 +73,4 @@ endif()
 atlas_install_python_modules( python/__init__.py python/PassedTriggerFilter.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/*.xml share/*py Testing/*.conf )
-atlas_install_scripts( Testing/*.sh bin/*.py )
+atlas_install_scripts( Testing/*.sh bin/*.py test/exec*.sh test/test*.sh )

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAODtoAOD_TrigNavSlimming.py

@@ -19,11 +19,14 @@ rec.doWriteAOD.set_Value_and_Lock(True)
 if not acf.EvtMax.is_locked():
     acf.EvtMax = 10
 
-
-if not ('athenaCommonFlags.PoolAODInput' in dir()):
-  acf.PoolAODInput = ['../AthenaTrigRDOtoAOD_MC/AOD.pool.root']
-#if not ('athenaCommonFlags.PoolAODOutput' in dir()):
-  #acf.PoolAODOutput='AOD.pool.root'
+if not ('PoolAODInput' in dir()):
+    acf.PoolAODInput = ['AOD.pool.root']
+else:
+    acf.PoolAODInput = PoolAODInput
+if not ('PoolAODOutput' in dir()):
+    acf.PoolAODOutput = 'AODSlim.pool.root'
+else:
+    acf.PoolAODOutput = PoolAODOutput
 
 acf.FilesInput=acf.PoolAODInput()
 

Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh

+#!/bin/bash
+
+echo $(date "+%FT%H:%M %Z")"     Execute TrigAnalysisTest post processing for test ${NAME}"
+
+### DEFAULTS
+
+if [ -z ${JOB_LOG} ]; then
+  export JOB_LOG="athena.log"
+fi
+
+if [ -z ${TEST} ]; then
+  export TEST="TrigAnalysisTest"
+fi
+
+if [ -z ${REF_FOLDER} ]; then
+  export REF_FOLDER="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/${TEST}/ref/${AtlasBuildBranch}/${NAME}"
+fi
+
+###
+echo "##############################"
+echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigAOD_TrigDecTool"
+export TDT_LOG=${JOB_LOG%%.*}.TrigDecTool.${JOB_LOG#*.}
+athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_TrigDecTool.py | tee ${TDT_LOG}
+echo "art-result: ${PIPESTATUS[0]} ${TDT_LOG%.*}"
+echo $(date "+%FT%H:%M %Z")"     Running checklog"
+timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${TDT_LOG} | tee checklog.TrigDecTool.log
+echo "art-result: ${PIPESTATUS[0]} ${TDT_LOG%.*}.CheckLog"
+
+echo "##############################"
+echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigAOD_TrigEDMCheck"
+export EDM_LOG=${JOB_LOG%%.*}.TrigEDMCheck.${JOB_LOG#*.}
+athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_TrigEDMCheck.py | tee ${EDM_LOG}
+echo "art-result: ${PIPESTATUS[0]} ${EDM_LOG%.*}"
+echo $(date "+%FT%H:%M %Z")"     Running checklog"
+timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${EDM_LOG} | tee checklog.TrigEDMCheck.log
+echo "art-result: ${PIPESTATUS[0]} ${EDM_LOG%.*}.CheckLog"
+
+echo "##############################"
+echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigAOD_TrigEDMAuxCheck"
+export EDMAUX_LOG=${JOB_LOG%%.*}.TrigEDMAuxCheck.${JOB_LOG#*.}
+athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_TrigEDMAuxCheck.py | tee ${EDMAUX_LOG}
+echo "art-result: ${PIPESTATUS[0]} ${EDMAUX_LOG%.*}"
+echo $(date "+%FT%H:%M %Z")"     Running checklog"
+timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${EDMAUX_LOG} | tee checklog.TrigEDMAuxCheck.log
+echo "art-result: ${PIPESTATUS[0]} ${EDMAUX_LOG%.*}.CheckLog"
+
+echo "################################"
+echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigAOD_TrigHLTMon"
+export TRIGHLTMON_LOG=${JOB_LOG%%.*}.TrigHLTMon.${JOB_LOG#*.}
+TrigHLTMon_tf.py --inputAODFile  AOD.pool.root --outputHISTFile myHIST.root | tee ${TRIGHLTMON_LOG}
+echo "art-result: ${PIPESTATUS[0]} ${TRIGHLTMON_LOG%.*}"
+echo $(date "+%FT%H:%M %Z")"     Running checklog"
+timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${TRIGHLTMON_LOG} | tee checklog.TrigHLTMon.log
+echo "art-result: ${PIPESTATUS[0]} ${TRIGHLTMON_LOG%.*}.CheckLog"
+
+echo "################################"
+echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigESD_HLTMonitoring"
+export HLTMON_LOG=${JOB_LOG%%.*}.HLTMonitoring.${JOB_LOG#*.}
+athena.py -c 'fileList=["ESD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigESD_HLTMonitoring.py | tee ${HLTMON_LOG}
+echo "art-result: ${PIPESTATUS[0]} ${HLTMON_LOG%.*}"
+echo $(date "+%FT%H:%M %Z")"     Running checklog"
+timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${HLTMON_LOG} | tee checklog.HLTMonitoring.log
+echo "art-result: ${PIPESTATUS[0]} ${HLTMON_LOG%.*}.CheckLog"
+mv histo.root expert-monitoring.root 
+if [ -f ${REF_FOLDER}/expert-monitoring.root ]; then
+  echo $(date "+%FT%H:%M %Z")"     Running rootcomp"
+  timeout 10m rootcomp.py ${REF_FOLDER}/expert-monitoring.root | tee rootcompout.HLTMonitoring.log
+  echo "art-result: ${PIPESTATUS[0]} ${HLTMON_LOG%.*}.RootComp"
+else
+  echo $(date "+%FT%H:%M %Z")"     No reference expert-monitoring.root found in ${REF_FOLDER}"
+fi
+
+echo "#######################################"
+echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigAODtoAOD_TrigNavSlimming"
+export SLIM_LOG=${JOB_LOG%%.*}.TrigNavSlimming.${JOB_LOG#*.}
+athena.py -c 'TestType="RSegamma";useCONDBR2=False;' -b TrigAnalysisTest/testAthenaTrigAODtoAOD_TrigNavSlimming.py | tee ${SLIM_LOG}
+echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}"
+echo $(date "+%FT%H:%M %Z")"     Running checklog"
+timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${SLIM_LOG} | tee checklog.TrigNavSlimming.log
+echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}.CheckLog"
+if [ -f AOD.pool.root ]; then 
+  echo $(date "+%FT%H:%M %Z")"     Running CheckFile on AOD"
+  timeout 10m checkFile.py AOD.pool.root | tee .pool.root.checkFile
+  echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}.CheckFileAOD"
+  echo $(date "+%FT%H:%M %Z")"     Running CheckxAOD AOD"
+  timeout 10m checkxAOD.py AOD.pool.root | tee AOD.pool.root.checkxAODFile
+  echo "art-result: ${PIPESTATUS[0]} ${SLIM_LOG%.*}.CheckXAOD"
+else 
+  echo $(date "+%FT%H:%M %Z")"     No AOD.pool.root to check"
+fi
+
+if [ -f AOD.pool.root ]; then
+  echo "#######################################"
+  echo $(date "+%FT%H:%M %Z")"     Test checkFileTrigSize_RTT"
+  export TRIGSIZE_LOG=${JOB_LOG%%.*}.TrigEDMSize.${JOB_LOG#*.}
+  timeout 10m checkFileTrigSize_RTT.py | tee ${TRIGSIZE_LOG}
+  echo "art-result: ${PIPESTATUS[0]} ${TRIGSIZE_LOG%.*}"
+else
+  echo $(date "+%FT%H:%M %Z")"     No AOD.pool.root to check with checkFileTrigSize_RTT"
+fi
+
+echo $(date "+%FT%H:%M %Z")"     Done executing TrigAnalysisTest post processing for test ${NAME}"
+

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaod_grid.sh

+#!/bin/bash
+
+# art-description: Trigger MC pp v7 RDO to AOD test
+# art-type: grid
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="mc_pp_v7_rdotoaod_grid"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="MC_pp_v7"
+export EVENTS="100"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh

+#!/bin/bash
+
+# art-description: Trigger MC pp v7 RDO to AODSLIM
+# art-type: build
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="mc_pp_v7_rdotoesdaodslim_build"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="MC_pp_v7"
+export EVENTS="3"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAODSLIM.py"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh

+#!/bin/bash
+
+# art-description: Trigger MC pp v7 RDO to BS and BS to ESD test
+# art-type: build
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="mc_pp_v7_rdotobstoesd_build"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="MC_pp_v7"
+export EVENTS="3"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoBS.py"
+
+source exec_athena_art_trigger_validation.sh
+athena.py -c "jp.AthenaCommonFlags.BSRDOInput=['raw.data']" TrigAnalysisTest/testAthenaTrigBStoESD.py | tee ${JOB_LOG%%.*}.BStoESD.${JOB_LOG#*.}
+echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}.BStoESD"
+
+source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh

+#!/bin/bash
+
+# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-type: build
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="mc_pp_v7_rdotoesdaod_build"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="MC_pp_v7"
+export EVENTS="3"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh
+source exec_art_triganalysistest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh

+#!/bin/bash
+
+# art-description: Trigger MC pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-type: grid
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+
+export NAME="mc_pp_v7_rdotoesdaod_grid"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="MC_pp_v7"
+export EVENTS="100"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh
+source exec_art_triganalysistest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh

+#!/bin/bash
+
+# art-description: Trigger Decision Tool test on AOD
+# art-type: grid
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="mc_pp_v7_trigdecisiontool_grid"
+export JOB_LOG="athena.log"
+export TEST="TrigAnalysisTest"
+export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_MC_pp_v7_chain/AOD.pool.root"]'
+
+athena.py -c "RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=${DS}" -b TrigAnalysisTest/testAthenaTrigAOD_TrigDecTool.py | tee ${JOB_LOG}
+echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}"
+
+source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh

+#!/bin/bash
+
+# art-description: Trigger Event Data Model test on AOD
+# art-type: grid
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="mc_pp_v7_trigedm_grid"
+export JOB_LOG="athena.log"
+export TEST="TrigAnalysisTest"
+export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_MC_pp_v7_chain/AOD.pool.root"]'
+
+athena.py -c "RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=${DS}" -b TrigAnalysisTest/testAthenaTrigAOD_TrigEDMCheck.py | tee ${JOB_LOG}
+echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}"
+
+source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh

+#!/bin/bash
+
+# art-description: Trigger Physics pp v7 RDO to AOD test
+# art-type: grid
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="physics_pp_v7_rdotoaod_grid"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="Physics_pp_v7"
+export EVENTS="100"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoAOD.py"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh

+#!/bin/bash
+
+# art-description: Trigger Physics pp v7 RDO to BS and BS to AOD test
+# art-type: build
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="physics_pp_v7_rdotobstoesd_build"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="Physics_pp_v7"
+export EVENTS="3"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoBS.py"
+
+source exec_athena_art_trigger_validation.sh
+athena.py -c "jp.AthenaCommonFlags.BSRDOInput=['raw.data']" testAthenaTrigBStoESD.py | tee ${JOB_LOG%%.*}2.${JOB_LOG#*.}
+echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}2"
+
+source exec_art_triggertest_post.sh
+
+

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh

+#!/bin/bash
+
+# art-description: Trigger Physics pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-type: build
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="physics_pp_v7_rdotoesdaod_build"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="Physics_pp_v7"
+export EVENTS="3"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh
+source exec_art_triganalysistest_post.sh

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh

+#!/bin/bash
+
+# art-description: Trigger Physics pp v7 RDO to ESD and AOD test, plus extra tests using these files
+# art-type: grid
+# art-include: 21.1/AthenaP1
+# art-include: 21.1-dev/AthenaP1
+# art-include: 21.0/Athena
+# art-include: 21.0-TrigMC/Athena
+# art-include: master/Athena
+# 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
+
+export NAME="physics_pp_v7_rdotoesdaod_grid"
+export COST_MONITORING="False"
+export TEST="TrigAnalysisTest"
+export MENU="Physics_pp_v7"
+export EVENTS="100"
+export JOBOPTION="TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py"
+
+source exec_athena_art_trigger_validation.sh
+source exec_art_triggertest_post.sh
+source exec_art_triganalysistest_post.sh

Trigger/TrigValidation/TrigP1Test/CMakeLists.txt

@@ -15,5 +15,5 @@ atlas_depends_on_subdirs( PUBLIC
 atlas_install_python_modules( python/*.py )
 atlas_install_joboptions( share/*.py )
 atlas_install_runtime( test/TrigP1Test_TestConfiguration.xml Testing/*.trans Testing/*.conf python/RunMsgFinder.py python/RttScriptRunner.py python/RootComp.py python/RegTest.py python/CheckLog.py python/CheckStatusCode.py python/LogTail.py python/DeleteRaw.py python/TruncateLog.py )
-atlas_install_scripts( share/*.sh share/testMonHistOH.py share/part_lhl2ef_fix.py share/setMagFieldCurrents.py share/part_get_runnumber.py share/trigp1test_athenaHLT.py Testing/*.sh Testing/splitlog.py )
+atlas_install_scripts( share/*.sh share/testMonHistOH.py share/part_lhl2ef_fix.py share/setMagFieldCurrents.py share/part_get_runnumber.py share/trigp1test_athenaHLT.py Testing/*.sh Testing/splitlog.py test/exec*.sh test/test*.sh )
 

Trigger/TrigValidation/TrigP1Test/share/runHLT_standaloneRTT_data.py

@@ -8,7 +8,7 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
 import os,commands
 def getEosDirectoryList(path,lbRange,sfoRange):
 
-    cmd = '/afs/cern.ch/project/eos/installation/pro/bin/eos.select -b ls %s/ ' % (path)
+    cmd = 'eos -b ls %s/ ' % (path)
     file = []
     pool=os.getenv("WORKDIR")
     if pool == "NONE":