Skip to content
Snippets Groups Projects
Commit 0f2fbbd2 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'update-trigger-ART-master' into 'master'

updates for Trigger ART tests

See merge request atlas/athena!16237

Former-commit-id: 5893af6a
parents 984c3e4b 0f8ce3eb
No related branches found
No related tags found
No related merge requests found
Showing
with 24 additions and 24 deletions
......@@ -33,15 +33,15 @@ timeout 1m chainDump.py -S --rootFile=expert-monitoring.root
export JOB_LOG_TAIL=${JOB_LOG%%.*}.tail.${JOB_LOG#*.}
tail -10000 ${JOB_LOG} > ${JOB_LOG_TAIL}
grep REGTEST athena.log > athena.regtest
grep REGTEST athena.log > athena.regtest.new
if [ -f ${REF_FOLDER}/athena.regtest ]; then
echo $(date "+%FT%H:%M %Z")" Running regtest"
timeout 1m regtest.pl --inputfile athena.regtest --reffile ${REF_FOLDER}/athena.regtest | tee regtest.log
timeout 1m regtest.pl --inputfile athena.regtest.new --reffile ${REF_FOLDER}/athena.regtest | tee regtest.log
echo "art-result: ${PIPESTATUS[0]} RegTest"
else
echo $(date "+%FT%H:%M %Z")" No reference athena.regtest found in ${REF_FOLDER}"
echo "art-result: 5 RegTest"
echo "art-result: 999 RegTest"
fi
if [ -f ${REF_FOLDER}/expert-monitoring.root ]; then
......@@ -53,8 +53,8 @@ if [ -f ${REF_FOLDER}/expert-monitoring.root ]; then
echo "art-result: ${PIPESTATUS[0]} CheckCounts"
else
echo $(date "+%FT%H:%M %Z")" No reference expert-monitoring.root found in ${REF_FOLDER}"
echo "art-result: 5 RootComp"
echo "art-result: 5 CheckCounts"
echo "art-result: 999 RootComp"
echo "art-result: 999 CheckCounts"
fi
if [ -f trig_cost.root ]; then
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_hi_v4_grid"
export MENU="MC_HI_v4"
......
......@@ -18,7 +18,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_hi_v5_grid"
export MENU="MC_HI_v5"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_build"
export MENU="MC_pp_v7"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_bulkmcprod_grid"
export MENU="MC_pp_v7_BulkMCProd_mc_prescale"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_cpsampleprod_grid"
export MENU="MC_pp_v7_CPSampleProd_mc_prescale"
......
......@@ -21,7 +21,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_grid"
export MENU="MC_pp_v7"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_loose_grid"
export MENU="MC_pp_v7_loose_mc_prescale"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_nops_aod_ftk_build"
export MENU="Physics_pp_v7_primaries"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_nops_aod_ftk_grid"
export MENU="Physics_pp_v7_primaries"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_tight_grid"
export MENU="MC_pp_v7_tight_mc_prescale"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="mc_pp_v7_triggervalidation_grid"
export MENU="MC_pp_v7_TriggerValidation_mc_prescale"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="physics_hi_v4_build"
export MENU="Physics_HI_v4"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="physics_hi_v4_grid"
export MENU="Physics_HI_v4"
......
......@@ -18,7 +18,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="physics_hi_v5_build"
export MENU="Physics_HI_v5"
......
......@@ -18,7 +18,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="physics_hi_v5_grid"
export MENU="Physics_HI_v5"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="physics_pp_v7_aod_grid"
export MENU="Physics_pp_v7"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="physics_pp_v7_build"
export MENU="Physics_pp_v7"
......
......@@ -20,7 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="physics_pp_v7_chainorder_build"
export MENU="Physics_pp_v7"
......
......@@ -21,7 +21,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest
# art-output: *.regtest.new
export NAME="physics_pp_v7_grid"
export MENU="Physics_pp_v7"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment