diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh index 26b67fc32b6500dab1ea06e812a67bc32252b3a2..c571290406b5dd592a2e4a09c14df700a51ee5dd 100755 --- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh +++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh @@ -31,4 +31,7 @@ export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigAnalysisTest/ athena.py -c "RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=${DS};DetDescrVersion='ATLAS-R2-2015-03-01-00'" -b TrigAnalysisTest/testAthenaTrigAOD_TrigDecTool.py | tee ${JOB_LOG} echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}" +export SKIP_CHAIN_DUMP=1 +echo "trigedm SKIP_CHAIN_DUMP" $[SKIP_CHAIN_DUMP] + source exec_art_triggertest_post.sh diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh index 995bd2c464a826bcd771e3c581f21b68612425ea..8f2e084f0c68a002a87243832c655e25db640e08 100755 --- a/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh +++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh @@ -31,4 +31,6 @@ export DS='["/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigAnalysisTest/ athena.py -c "RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=${DS};DetDescrVersion='ATLAS-R2-2015-03-01-00'" -b TrigAnalysisTest/testAthenaTrigAOD_TrigEDMCheck.py | tee ${JOB_LOG} echo "art-result: ${PIPESTATUS[0]} ${JOB_LOG%%.*}" +export SKIP_CHAIN_DUMP=1 +echo "trigedm SKIP_CHAIN_DUMP" $[SKIP_CHAIN_DUMP] source exec_art_triggertest_post.sh diff --git a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh index c27a4b22db50baadb34750cc2adb208a9944c7cb..7830134f51cc60c21185604e03b7e8a339267d1c 100755 --- a/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh +++ b/Trigger/TrigValidation/TriggerTest/test/exec_art_triggertest_post.sh @@ -60,22 +60,27 @@ else echo $(date "+%FT%H:%M %Z")" file trig_cost.root does not exist thus RunTrigCostD3PD will not be run" fi -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 )) -fi -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" +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 )) + fi + 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" +fi if [ -f ESD.pool.root ]; then echo $(date "+%FT%H:%M %Z")" Running CheckFile on ESD"