From 0e4fa87c0c701b46ed1fca12174f8f52387bdfac Mon Sep 17 00:00:00 2001
From: Daniele Zanzi <daniele.zanzi@cern.ch>
Date: Thu, 22 Nov 2018 13:57:39 +0000
Subject: [PATCH] TrigP1Test: fix for PS test (ATR-16799
Former-commit-id: 17c6701f41cf921ee2bd154c05aed06bc59c6a54
---
.../TrigP1Test/test/exec_art_trigp1test_post.sh | 3 ++-
.../test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh | 1 +
.../test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh | 7 ++++---
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh b/Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh
index 757f63cb090b0..3e5909258cd83 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh
@@ -59,7 +59,8 @@ fi
if [ -f trig_cost.root ]; then
echo $(date "+%FT%H:%M %Z")" Running CostMon"
- timeout 2h RunTrigCostD3PD -f trig_cost.root --outputTagFromAthena --costMode --ratesMode > costMon.log 2>&1
+# timeout 2h RunTrigCostD3PD -f trig_cost.root --outputTagFromAthena --costMode --ratesMode > costMon.log 2>&1
+ timeout 2h RunTrigCostD3PD -f trig_cost.root --outputTagFromAthena --costMode --monitorRates --isCPUPrediction --useEBWeight --patternsMonitor HLT_costmonitor HLT_mistimemonj400 HLT_mistimemoncaltimenomu HLT_mistimemoncaltime HLT_l1topodebug HLT_l1calooverflow HLT_e5_lhvloose_nod0_bBeexM6000t HLT_2e5_lhvloose_nod0_bBeexM6000t HLT_cscmon_L1All HLT_j0_perf_ds1_L1J100 --patternsInvert --predictionLumi 1.50e34 > costMon.log 2>&1
else
echo $(date "+%FT%H:%M %Z")" file trig_cost.root does not exist thus RunTrigCostD3PD will not be run"
fi
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh
index fcf3881283f59..175e1c221458e 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_athenaHLT_CostMonitoring_PhysicsV7_grid.sh
@@ -20,6 +20,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: *.regtest
+# art-output: athena_stdout.txt
export NAME="athenaHLT_CostMonitoring_PhysicsV7_grid"
export TESTOPTION="setMenu='Physics_pp_v7_unprescaled_only_physics_prescale';setLVL1XML='TriggerMenuXML/LVL1config_Physics_pp_v7.xml';setL1TopoXML=setLVL1XML.replace('/LVL1','/L1Topo');rerunLVL1=True;enableCostD3PD=True;enableCostForCAF=True;HLTOutputLevel=INFO;doValidation=True;"
diff --git a/Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh b/Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh
index b8179370165b8..eed3d8bbb1255 100755
--- a/Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh
+++ b/Trigger/TrigValidation/TrigP1Test/test/test_physics_pp_v7_PSed_nightlyDayBefore_grid.sh
@@ -15,7 +15,7 @@
# art-output: ntuple.pmon.gz
# art-output: *perfmon*
# art-output: *.regtest
-
+# art-output: athena_stdout.txt
export NAME="athenaHLT_prescaled_PhysicsV7"
export JOB_LOG="${NAME}.log"
@@ -44,11 +44,12 @@ if [ -z ${release} ]; then
fi
l1psk="'lvl1key': ${l1psk}"
-subshellcmd='source $AtlasSetup/scripts/asetup.sh AthenaP1,21.1,'${release}'; athenaHLT.py -n 5000 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00339070.physics_EnhancedBias.merge.RAW._lb0101._SFO-1._0001.1 -o HLT_physicsV7_prescaled -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBART" --db-smkey '${smk}' --db-hltpskey '${hltpsk}' --db-extra "{'${l1psk}'}"; Trig_reco_tf.py --inputBSFile=HLT_physicsV7_prescaled._0001.data --outputNTUP_TRIGCOST=trig_cost.root; RunTrigCostD3PD -f trig_cost.root --outputTagFromAthena --costMode --ratesMode --isCPUPrediction; chainDump.py -n -S 2>&1 | tee ${JOB_LOG}'
+subshellcmd='source $AtlasSetup/scripts/asetup.sh AthenaP1,21.1,'${release}'; athenaHLT.py -n 5000 -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00339070.physics_EnhancedBias.merge.RAW._lb0101._SFO-1._0001.1 -o HLT_physicsV7_prescaled -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBART" --db-smkey '${smk}' --db-hltpskey '${hltpsk}' --db-extra "{'${l1psk}'}"; Trig_reco_tf.py --inputBSFile=HLT_physicsV7_prescaled._0001.data --outputNTUP_TRIGCOST=trig_cost.root; RunTrigCostD3PD -f trig_cost.root --outputTagFromAthena --costMode --monitorRates --isCPUPrediction --useEBWeight --patternsMonitor HLT_costmonitor HLT_mistimemonj400 HLT_mistimemoncaltimenomu HLT_mistimemoncaltime HLT_l1topodebug HLT_l1calooverflow HLT_e5_lhvloose_nod0_bBeexM6000t HLT_2e5_lhvloose_nod0_bBeexM6000t HLT_cscmon_L1All HLT_j0_perf_ds1_L1J100 --patternsInvert --predictionLumi 1.50e34; chainDump.py -n -S 2>&1 | tee ${JOB_LOG}'
echo "running in subshell: $subshellcmd"
(eval $subshellcmd)
-grep -r "RATE_" costMonitoring_*/csv/Table_Rate_Group_HLT_All.csv | awk '{split($0,a,","); print a[1]"\t"a[3]"\t"a[4] }' >> HLTChain.txt
+grep -r "RATE_" costMonitoring_*/csv/Table_Rate_Group_HLT_All.csv | awk '{split($0,a,","); print a[1]"\t"a[4] }' >> HLTChain.txt
+grep "TrigSteer_HLT.TrigChainMoni" stdout.txt | awk '{split($0,a,":|\t"); print a[4]" "a[10] }' | sed 's/\s*active\s*/_rerun\t/g' | sed 's/\s*HLT/HLT/g' >> HLTChain.txt
ATH_RETURN=${PIPESTATUS[0]}
echo "art-result: ${ATH_RETURN} ${NAME}"
--
GitLab