Skip to content
Snippets Groups Projects
Commit 06549b7d authored by John Kenneth Anders's avatar John Kenneth Anders
Browse files

Merge branch 'cherry-pick-41ed6324-21.0' into '21.0' 

Sweeping !20324 from 21.3 to 21.0.
TriggerTest: add a few tests running on data

See merge request atlas/athena!20364
parents 2a6d5c30 98df890e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 171 additions and 22 deletions
Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh
+ 12
− 9
View file @ 06549b7d
......@@ -66,23 +66,26 @@ else
echo $(date "+%FT%H:%M %Z")" file trig_cost.root does not exist thus RunTrigCostD3PD will not be run"
fi
# SKIP_CHAIN_DUMP=1 skips this step
# SKIP_CHAIN_DUMP=2 skips the L1 and HLTTE checks, but does the HLTChain check
echo "trigedm SKIP_CHAIN_DUMP" $[SKIP_CHAIN_DUMP]
if [ $[SKIP_CHAIN_DUMP] != 1 ]; then
echo $(date "+%FT%H:%M %Z")" Running check for zero L1, HLT or TE counts"
export COUNT_EXIT=0
if [[ `sed 's|.*\(.* \)|\1|' L1AV.txt | sed 's/^[ \t]*//' | sed '/^0/'d | wc -l` == 0 ]]; then
echo "L1 counts ERROR : all entires are ZERO please consult L1AV.txt"
(( COUNT_EXIT = COUNT_EXIT || 1 ))
if [ $[SKIP_CHAIN_DUMP] != 2 ]; then
if [[ `sed 's|.*\(.* \)|\1|' L1AV.txt | sed 's/^[ \t]*//' | sed '/^0/'d | wc -l` == 0 ]]; then
echo "L1 counts ERROR : all entires are ZERO please consult L1AV.txt"
(( COUNT_EXIT = COUNT_EXIT || 1 ))
fi
if [[ `sed 's|.*\(.* \)|\1|' HLTTE.txt | sed 's/^[ \t]*//' | sed '/^0/'d | wc -l` == 0 ]]; then
echo "HLTTE counts ERROR : all entires are ZERO please consult HLTTE.txt"
(( COUNT_EXIT = COUNT_EXIT || 1 ))
fi
fi
if [[ `sed 's|.*\(.* \)|\1|' HLTChain.txt | sed 's/^[ \t]*//' | sed '/^0/'d | wc -l` == 0 ]]; then
if [[ `sed 's|.*\(.* \)|\1|' HLTChain.txt | sed 's/^[ \t]*//' | sed '/^0/'d | wc -l` == 0 ]]; then
echo "HLTChain counts ERROR : all entires are ZERO please consult HLTChain.txt"
(( COUNT_EXIT = COUNT_EXIT || 1 ))
fi
if [[ `sed 's|.*\(.* \)|\1|' HLTTE.txt | sed 's/^[ \t]*//' | sed '/^0/'d | wc -l` == 0 ]]; then
echo "HLTTE counts ERROR : all entires are ZERO please consult HLTTE.txt"
(( COUNT_EXIT = COUNT_EXIT || 1 ))
fi
echo "art-result: ${COUNT_EXIT} ZeroCounts"
else
echo $(date "+%FT%H:%M %Z")" Do not run ZERO counts for this test, SKIP_CHAIN_DUMP=1"
......
Trigger/TrigValidation/TriggerTest/test/exec_athena_art_trigger_validation.sh
+ 31
− 13
View file @ 06549b7d
......@@ -13,7 +13,11 @@ if [ -z ${EVENTS} ]; then
fi
if [ -z ${JOBOPTION} ]; then
export JOBOPTION="TriggerTest/testCommonSliceAthenaTrigRDO.py"
if [[ $INPUT == "data" ]]; then
export JOBOPTION="TriggerRelease/runHLT_standalone.py"
else
export JOBOPTION="TriggerTest/testCommonSliceAthenaTrigRDO.py"
fi
fi
if [ -z ${JOB_LOG} ]; then
......@@ -45,6 +49,9 @@ elif [[ $INPUT == "mubphysics" ]]; then
elif [[ $INPUT == "minbias" ]]; then
export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/mc15_13TeV.361203.Pythia8_A2_MSTW2008LO_ND_minbias.recon.RDO.e3639_s2606_s2174_r7661_tid07858100_00/RDO.07858100._000087.pool.root.1"]'
elif [[ $INPUT == 'data' ]]; then
export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]'
else
# Default - ttbar
export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1","/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000002.pool.root.1"]'
......@@ -54,18 +61,29 @@ trap 'PREVIOUS_COMMAND=$THIS_COMMAND; THIS_COMMAND=$BASH_COMMAND' DEBUG
######################################
athena.py -b -c \
"enableCostMonitoring=${COST_MONITORING};\
RunningRTT=True;\
menu=\"${MENU}\";\
sliceName=\"${SLICE}\";\
jp.AthenaCommonFlags.FilesInput=${DS};\
jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(${EVENTS});\
jp.Rec.OutputLevel=WARNING;\
${EXTRA}\
LVL1OutputLevel=WARNING;\
HLTOutputLevel=WARNING;" \
${JOBOPTION} &> ${JOB_LOG}
if [[ $INPUT == 'data' ]]; then
athena.py -b -c \
"setMenu=\"${MENU}\";\
BSRDOInput=${DS};\
EvtMax=${EVENTS};\
${EXTRA}\
LVL1OutputLevel=WARNING;\
HLTOutputLevel=WARNING;" \
${JOBOPTION} &> ${JOB_LOG}
else
athena.py -b -c \
"enableCostMonitoring=${COST_MONITORING};\
RunningRTT=True;\
menu=\"${MENU}\";\
sliceName=\"${SLICE}\";\
jp.AthenaCommonFlags.FilesInput=${DS};\
jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(${EVENTS});\
jp.Rec.OutputLevel=WARNING;\
${EXTRA}\
LVL1OutputLevel=WARNING;\
HLTOutputLevel=WARNING;" \
${JOBOPTION} &> ${JOB_LOG}
fi
######################################
......
Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_build.sh 0 → 100755
+ 32
− 0
View file @ 06549b7d
#!/bin/bash
# art-description: Physics v7 TriggerTest on data
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.3/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: costMonitoring_*
# art-output: *.root
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest.new
export NAME="data_physics_pp_v7_build"
export MENU="Physics_pp_v7"
export EVENTS="100"
export INPUT="data"
# The flag below skips HLTTE and L1 counts checks, but keeps the HLTChain counts check.
# This is needed because we run on data without rerunLvl1, so we only produce HLTChain counts.
export SKIP_CHAIN_DUMP=2
source exec_athena_art_trigger_validation.sh
source exec_art_triggertest_post.sh
Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_grid.sh 0 → 100755
+ 32
− 0
View file @ 06549b7d
#!/bin/bash
# art-description: Physics v7 TriggerTest on data
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.3/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: costMonitoring_*
# art-output: *.root
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest.new
export NAME="data_physics_pp_v7_grid"
export MENU="Physics_pp_v7"
export EVENTS="500"
export INPUT="data"
# The flag below skips HLTTE and L1 counts checks, but keeps the HLTChain counts check.
# This is needed because we run on data without rerunLvl1, so we only produce HLTChain counts.
export SKIP_CHAIN_DUMP=2
source exec_athena_art_trigger_validation.sh
source exec_art_triggertest_post.sh
Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_build.sh 0 → 100755
+ 32
− 0
View file @ 06549b7d
#!/bin/bash
# art-description: Physics v7 primaries TriggerTest on data
# art-type: build
# art-include: 21.0/Athena
# art-include: 21.3/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: costMonitoring_*
# art-output: *.root
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest.new
export NAME="data_physics_pp_v7_primaries_build"
export MENU="Physics_pp_v7_primaries"
export EVENTS="100"
export INPUT="data"
# The flag below skips HLTTE and L1 counts checks, but keeps the HLTChain counts check.
# This is needed because we run on data without rerunLvl1, so we only produce HLTChain counts.
export SKIP_CHAIN_DUMP=2
source exec_athena_art_trigger_validation.sh
source exec_art_triggertest_post.sh
Trigger/TrigValidation/TriggerTest/test/test_data_physics_pp_v7_primaries_grid.sh 0 → 100755
+ 32
− 0
View file @ 06549b7d
#!/bin/bash
# art-description: Physics v7 primaries TriggerTest on data
# art-type: grid
# art-include: 21.0/Athena
# art-include: 21.3/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: costMonitoring_*
# art-output: *.root
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: TotalEventsProcessed.txt
# art-output: *.regtest.new
export NAME="data_physics_pp_v7_primaries_grid"
export MENU="Physics_pp_v7_primaries"
export EVENTS="500"
export INPUT="data"
# The flag below skips HLTTE and L1 counts checks, but keeps the HLTChain counts check.
# This is needed because we run on data without rerunLvl1, so we only produce HLTChain counts.
export SKIP_CHAIN_DUMP=2
source exec_athena_art_trigger_validation.sh
source exec_art_triggertest_post.sh
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment