May 2018 updates to Trigger ART tests and framework

Former-commit-id: 304068cda45e80a6d1d6c514013f7af97011186a

Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh

@@ -24,7 +24,7 @@ athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_
 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 "art-result: ${PIPESTATUS[0]} CheckLog.TrigDecTool"
 
 echo "##############################"
 echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigAOD_TrigEDMCheck"
@@ -33,7 +33,7 @@ athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_
 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 "art-result: ${PIPESTATUS[0]} CheckLog.TrigEDMCheck"
 
 echo "##############################"
 echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigAOD_TrigEDMAuxCheck"
@@ -42,7 +42,7 @@ athena.py -c 'fileList=["AOD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_
 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 "art-result: ${PIPESTATUS[0]} CheckLog.TrigEDMAuxCheck"
 
 echo "################################"
 echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigAOD_TrigHLTMon"
@@ -51,7 +51,7 @@ TrigHLTMon_tf.py --inputAODFile  AOD.pool.root --outputHISTFile myHIST.root | te
 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 "art-result: ${PIPESTATUS[0]} CheckLog.TrigHLTMon"
 
 echo "################################"
 echo $(date "+%FT%H:%M %Z")"     Test AthenaTrigESD_HLTMonitoring"
@@ -60,12 +60,12 @@ athena.py -c 'fileList=["ESD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigESD_
 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"
+echo "art-result: ${PIPESTATUS[0]} CheckLog.HLTMonitoring"
 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"
+  echo "art-result: ${PIPESTATUS[0]} RootComp.HLTMonitoring"
 else
   echo $(date "+%FT%H:%M %Z")"     No reference expert-monitoring.root found in ${REF_FOLDER}"
 fi
@@ -77,14 +77,14 @@ athena.py -c 'TestType="RSegamma";useCONDBR2=False;' -b TrigAnalysisTest/testAth
 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"
+echo "art-result: ${PIPESTATUS[0]} CheckLog.TrigNavSlimming"
 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"
+  timeout 10m checkFile.py AOD.pool.root | tee AOD.pool.root.checkFile
+  echo "art-result: ${PIPESTATUS[0]} CheckFileAOD.TrigNavSlimming"
   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"
+  echo "art-result: ${PIPESTATUS[0]} CheckFileXAOD.TrigNavSlimming"
 else 
   echo $(date "+%FT%H:%M %Z")"     No AOD.pool.root to check"
 fi
@@ -94,10 +94,13 @@ if [ -f AOD.pool.root ]; then
   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%.*}"
+  echo "art-result: ${PIPESTATUS[0]} TrigEDMSize"
 else
   echo $(date "+%FT%H:%M %Z")"     No AOD.pool.root to check with checkFileTrigSize_RTT"
 fi
 
+echo  $(date "+%FT%H:%M %Z")"     Files in directory:"
+ls -lh
+
 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

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoaodslim_build.sh

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotobstoesd_build.sh

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_build.sh

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_rdotoesdaod_grid.sh

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigdecisiontool_grid.sh

@@ -7,6 +7,7 @@
 # art-include: 21.0/Athena
 # art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
+# art-include: master/AthenaP1
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
 # art-output: L1AV.txt

Trigger/TrigValidation/TrigAnalysisTest/test/test_mc_pp_v7_trigedm_grid.sh

@@ -7,6 +7,7 @@
 # art-include: 21.0/Athena
 # art-include: 21.0-TrigMC/Athena
 # art-include: master/Athena
+# art-include: master/AthenaP1
 # art-output: HLTChain.txt
 # art-output: HLTTE.txt
 # art-output: L1AV.txt

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoaod_grid.sh

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotobstoesd_build.sh

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_build.sh

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigAnalysisTest/test/test_physics_pp_v7_rdotoesdaod_grid.sh

@@ -2,8 +2,6 @@
 
 # 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

Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test.conf

@@ -378,21 +378,11 @@ test 61
   checklog --config checklogTrigP1Test.conf --showexcludestats
   athena_cmd athenaHLT.py -M -n 75 -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -o HLT_physicsV7_menu  -c 'testPhysicsV7=True;trigBase="Default";doDBConfig=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py
 
-test 62
-  name UploadMenuKeys
-  doc Generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB.
-  pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup.txt 
-  pre_condition test -e ../HLT_physicsV7_menu/ef_Default_setup_setup.txt 
-  pre_condition test -e ../HLT_physicsV7_menu/outputHLT*xml
-  athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV7
-
-
 test 63
   name HLT_physicsV7_rerun 
   doc Recreate trigger configuration and compare with configuration from HLT_physicsV7_menu
   athena_cmd athenaHLT.py -M -n 75 -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -o HLT_physicsV7_rerun -c 'testPhysicsV7=True;trigBase="Default";doDBConfig=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py
 
-
 test 64
   name CheckKeysV7
   doc compare the SMK created from the HLT_physicsV7 first and rerun jobs 
@@ -406,35 +396,6 @@ test 64
   athena_cmd testCheckKeys.sh --menu HLT_physicsV7
 
 
-
-test 65
-  name HLT_physicsV7_menu_rerundb
-  doc athenaHLT from DB, use HLT_physicsV7 as reference
-  checklog --config checklogTrigP1Test.conf --showexcludestats
-  rootcomp   ../HLT_physicsV7_menu/r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000000_part_athenaHLT_mon_HLT-Histogramming.root
-  extra_failure_codes ROOTCOMP_MISMATCH  
-  pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh
-  athena_cmd unset FRONTIER_SERVER; source ../UploadMenuKeys/exportMenuKeys.sh; athenaHLT.py -M -n 75 -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -oHLT_physicsV7_menu_rerundb -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBATN" --db-smkey ${smk} --db-hltpskey ${hltpsk} --db-extra "{'lvl1key': ${l1psk}}"
-  post_command chainDump.py -n -S
-  post_test RunMsg check_msg_stat.py --showignored --config checkMsgStat_TrigP1Test.conf $logfile
-
-test 66
-  name HLT_physicsV6_prescaleChange
-  doc Test of HLT prescale change
-  checklog --config checklogTrigP1Test.conf --showexcludestats
-  pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh
-  pre_condition test -e ../UploadMenuKeys/prescales.txt
-  pre_command ln -sf ../UploadMenuKeys/prescales.txt
-  pre_command get_files -jo testPrescaleChange_postconfig.py
-  athena_cmd source ../UploadMenuKeys/exportMenuKeys.sh; athenaHLT.py -Z TrigP1Test.PrescaleChange -C 'include("testPrescaleChange_postconfig.py");fpeAuditor=True' -f root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -J TrigConf::HLTJobOptionsSvc --use-database "DBServer=TRIGGERDBATN:Instance=L2:DBSMKey=${smk}:DBHLTPSKey=${hltpsk}:DBLVL1PSKey=${l1psk}"
-
-test 67
-  name TriggerDBAccessTest
-  doc Access TriggerDB using Oracle and Frontier and compare
-# pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh
-  athena_cmd testAccessDBAndCompare.sh
-
-
 ## Compare JO vs DB also with rerunLvl1 to test the reprocessing on run1 data
 
 test 71
@@ -443,26 +404,6 @@ test 71
   checklog --config checklogTrigP1Test.conf --showexcludestats
   athena_cmd athenaHLT.py -M -n 25  -f /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -o HLT_physicsV7_rerunLVL1_menu  -c 'doDBConfig=True;testPhysicsV7=True;rerunLVL1=True;trigBase="Default";enableCostForCAF=True;fpeAuditor=True' TriggerRelease/runHLT_standalone.py
 
-test 72
-  name UploadMenuKeys_rerunLVL1
-  doc Generates and uploads SMKs created from the HLT first and compares after rerun jobs from DB.
-  pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/ef_Default_setup.txt 
-  pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/ef_Default_setup_setup.txt 
-  pre_condition test -e ../HLT_physicsV7_rerunLVL1_menu/outputHLT*xml
-  athena_cmd testUploadMenuKeys.sh --menu HLT_physicsV7_rerunLVL1
-
-
-test 73
-  name HLT_physicsV7_rerunLVL1_menu_rerundb
-  doc athenaHLT from DB, use HLT_physicsV7 as reference
-  checklog --config checklogTrigP1Test.conf --showexcludestats
-  rootcomp   ../HLT_physicsV7_rerunLVL1_menu/r0000000000_part_athenaHLT_mon_HLT-Histogramming.root r0000000000_part_athenaHLT_mon_HLT-Histogramming.root
-  extra_failure_codes ROOTCOMP_MISMATCH  
-  pre_condition test -e ../UploadMenuKeys_rerunLVL1/exportMenuKeys.sh
-  athena_cmd unset FRONTIER_SERVER; source ../UploadMenuKeys_rerunLVL1/exportMenuKeys.sh; athenaHLT.py -M -n 25 -f  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/atn-test/data17_13TeV.00327265.physics_eb_zmm_egz.merged.RAW.selected._0001.data -oHLT_physicsV7_rerunLVL1_menu_rerundb -J TrigConf::HLTJobOptionsSvc --use-database --db-type "Coral" --db-server "TRIGGERDBATN" --db-smkey ${smk} --db-hltpskey ${hltpsk} --db-extra "{'lvl1key': ${l1psk}}"
-  post_command chainDump.py -n -S
-  post_test RunMsg check_msg_stat.py --showignored --config checkMsgStat_TrigP1Test.conf $logfile
-
 
 #############################################################################################
 ## Transform tests on BS from main  HLT_physicsV7 test
@@ -563,15 +504,6 @@ test 114
   checkcount ../HLT_physicsV6/expert-monitoring.root 0 HLT
   athena_cmd athenaHLT.py -f root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data12_8TeV.00212967.physics_eb_zee_zmumu_cc._0001.data -oHLT_physicsV6_nocache  -c 'testPhysicsV6=True;noCaching=True;HLTOutputLevel=INFO;doValidation=True;useCONDBR2=False;setGlobalTag="COMCOND-HLTP-004-03-VAL-01";setDetDescr="ATLAS-R1-2012-02-00-00";fpeAuditor=True' TriggerRelease/runHLT_standalone.py
 
-test 115
-  name tfTestPPV6
-  doc Check tf for menu PP V6 data
-  pre_command xrdcp root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data12_8TeV.00212967.physics_eb_zee_zmumu_cc._0001.data .
-  pre_condition test -e ../UploadMenuKeys/exportMenuKeys.sh
-  checklog --config checklogTrigP1Test.conf --showexcludestats
-  athena_cmd source ../UploadMenuKeys/exportMenuKeys.sh; BatchHLTTrf_wrap.py inputBSFile=data12_8TeV.00212967.physics_eb_zee_zmumu_cc._0001.data outputRAWFile=RAW.999999._000001.data.1 doStreaming=True filters="express" stream_out=debug connection=TRIGGERDBATN smk=${smk} lvl1ps=${l1psk} hltps=${hltpsk} outputNTUP_TRIGCOSTEFFile=NTUP_TRIGCOSTEF.root outputNTUP_TRIGCOSTL2File=NTUP_TRIGCOSTL2.root outputNTUP_TRIGRATEEFFile=NTUP_TRIGRATEEF.root outputNTUP_TRIGRATEL2File=NTUP_TRIGRATEL2.root outputHIST_HLTMONEFFile=HIST_HLTMONEF.root outputHIST_HLTMONL2File=HIST_HLTMONL2.root max_events=10
-
-
 
 ################################################################################
 # Test of ALFA

Trigger/TrigValidation/TrigP1Test/Testing/TrigP1Test_ART.conf

@@ -863,5 +863,5 @@ test 182
   fullregtest REGTEST  /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.reference
   rootcomp   /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.root
   checkcount /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/ref/latest/HLT_physicsV7_FTK/trigp1test_HLT_physicsV7_FTK.root 1 HLT
-  athena_cmd athenaHLT.py   -o HLT_physicsV7_FTK  -n 75 -f  /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/RAW_FTK.pool.root -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True' TriggerRelease/runHLT_standalone.py
+  athena_cmd athenaHLT.py   -o HLT_physicsV7_FTK  -n 30 -f  /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/RAW_FTK.pool.root -c 'testPhysicsV7=True;HLTOutputLevel=INFO;doValidation=True;fpeAuditor=True;from TriggerJobOpts.TriggerFlags import TriggerFlags;TriggerFlags.doFTK=True' TriggerRelease/runHLT_standalone.py
   post_command chainDump.py -n -S

Trigger/TrigValidation/TrigP1Test/share/trigp1test_athenaHLT.py

@@ -32,7 +32,11 @@ def get_file_list( DATAPATH ) :
       else :
         new_paths = [ path+'/'+directory for path in paths ]
         paths = new_paths
-    # for path in paths : print "PathExpander         INFO Found file at '{0}'".format( path )
+    for i,path in enumerate(paths):
+      print "PathExpander         INFO Found file at '{0}'".format( path )
+      if i > 5: 
+        break
+
     #return [ 'root://eosatlas//'+path for path in paths ]
     return paths
   return sorted( glob(DATAPATH + '*') )
@@ -54,7 +58,7 @@ def main():
   last_run_files = get_file_list(runs[-1] + "/*/")
   subset = []
   for i in range(0,opts.nfiles):
-    subset.append('root://eosatlas//' + last_run_files[i])
+    subset.append('root://eosatlas/' + last_run_files[i])
   print subset 
 
   trigCmd = "athenaHLT.py -n " + str(opts.nevents) + " -f \"" + str(subset) + "\" -c \"" + opts.modifiers + "\" TriggerRelease/runHLT_standalone.py"

Trigger/TrigValidation/TrigP1Test/test/exec_art_trigp1test_post.sh

@@ -27,9 +27,9 @@ echo "art-result: ${PIPESTATUS[0]} CheckLog"
 # add check_statuscode.py ${JOB_LOG}
 # RunMsgFinder
 
-# TODO
-# this is RTT and will need some moving
-# timeout 1m PerfMonRunner.py --fileName=ntuple.pmon.gz --options="-f 0.90"
+# Run perfmon
+timeout 1m perfmon.py -f 0.90 ntuple.pmon.gz
+timeout 1m convert -density 300 -trim ntuple.perfmon.pdf -quality 100 -resize 50% ntuple.perfmon.png
 
 echo $(date "+%FT%H:%M %Z")"     Running chainDump"
 timeout 1m chainDump.py -S --rootFile=expert-monitoring.root
@@ -100,6 +100,9 @@ else
   echo $(date "+%FT%H:%M %Z")"     No AOD.pool.root to check"
 fi
 
+echo  $(date "+%FT%H:%M %Z")"     Files in directory:"
+ls -lh
+
 echo  $(date "+%FT%H:%M %Z")"     Finished TrigP1Test post processing"
 
 

Trigger/TrigValidation/TrigP1Test/test/exec_athenaHLT_art_trigger_validation.sh

@@ -29,11 +29,11 @@ if [ -z ${TESTOPTION} ]; then
 fi
 
 if [ -z ${ATHENAHLTOPT} ]; then
-export ATHENAHLTOPT=""
+  export ATHENAHLTOPT=""
 fi
 
 if [ -z ${ATHENAHLTCMD} ]; then
-export ATHENAHLTCMD="athenaHLT.py"
+  export ATHENAHLTCMD="athenaHLT.py"
 fi
 
 ######################################
@@ -42,12 +42,13 @@ ${ATHENAHLTCMD} ${ATHENAHLTOPT} \
 -n ${EVENTS} \
 -f "${FILE}" \
 -c "${TESTOPTION}" \
-${JOBOPTION} | tee ${JOB_LOG}
+${JOBOPTION} &> ${JOB_LOG}
 
 ######################################
-COMMAND=$PREVIOUS_COMMAND 
-ATH_RETURN=${PIPESTATUS[0]}
-echo "Command to reproduce: ${COMMAND}"
+COMMAND=$PREVIOUS_COMMAND ATH_RETURN=$?
+echo ${COMMAND} > command.txt
+echo "Command to reproduce:"
+envsubst < command.txt
 echo "art-result: ${ATH_RETURN} ${JOB_LOG%%.*}"
 echo  $(date "+%FT%H:%M %Z")"     Done executing AthenaHLT test ${NAME}"
 

Trigger/TrigValidation/TrigP1Test/test/test_AthenaP1RDOtoBS_build.sh

@@ -7,6 +7,7 @@
 # art-include: 21.0/AthenaP1
 # art-include: 21.0-TrigMC/AthenaP1
 # art-include: master/AthenaP1
+# art-include: master/Athena
 
 if [ -z ${TEST} ]; then
   export TEST="TrigP1Test"

Trigger/TrigValidation/TrigP1Test/test/test_AthenaTrigBS_L2EFMerging_build.sh

@@ -7,6 +7,7 @@
 # art-include: 21.0/AthenaP1
 # art-include: 21.0-TrigMC/AthenaP1
 # art-include: master/AthenaP1
+# art-include: master/Athena
 
 if [ -z ${TEST} ]; then
   export TEST="TrigP1Test"

Trigger/TrigValidation/TrigP1Test/test/test_HLT_HIV4_build.sh

@@ -7,6 +7,7 @@
 # art-include: 21.0/AthenaP1
 # art-include: 21.0-TrigMC/AthenaP1
 # art-include: master/AthenaP1
+# art-include: master/Athena
 
 if [ -z ${TEST} ]; then
   export TEST="TrigP1Test"