Fixes to post tests in TrigAnalysTest ART and ATN

Former-commit-id: 52f340f66d75d05189f30421800f8a84ac5a54d6

Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf

@@ -49,10 +49,10 @@ test 5
 
 test 6
   name AthenaTrigAOD_TrigSlimValidation
-  doc Validates slimed AOD:  ../AthenaTrigAODtoAOD_TrigNavSlimming/AOD.pool.root
-  pre_condition if [[ $(find ../AthenaTrigAODtoAOD_TrigNavSlimming/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigAODtoAOD_TrigNavSlimming/AOD.pool.root ; else test -e non_existing_file ; fi  
+  doc Validates slimed AOD:  ../AthenaTrigAODtoAOD_TrigNavSlimming/AODSlim.pool.root
+  pre_condition if [[ $(find ../AthenaTrigAODtoAOD_TrigNavSlimming/AODSlim.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigAODtoAOD_TrigNavSlimming/AOD.pool.root ; else test -e non_existing_file ; fi  
   joboptions testAthenaTrigAOD_TrigSlimValidation.py
-  athena_cmd athena.py -c 'inputFile="../AthenaTrigAODtoAOD_TrigNavSlimming/AOD.pool.root"'
+  athena_cmd athena.py -c 'inputFile="../AthenaTrigAODtoAOD_TrigNavSlimming/AODSlim.pool.root"'
   checklog --config checklogTriggerTest.conf --showexcludestats
   fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigAOD_TrigSlimValidation.reference
 
@@ -90,7 +90,7 @@ test 10
   doc Slims AOD
   pre_condition if [[ $(find ../AthenaTrigRDOtoAOD_MC/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD_MC/AOD.pool.root ; else test -e non_existing_file ; fi  
   joboptions  testAthenaTrigAODtoAOD_TrigNavSlimming.py
-  athena_cmd athena.py -c 'TestType="RSegamma";useCONDBR2=False;jp.AthenaCommonFlags.PoolAODInput=["../AthenaTrigRDOtoAOD_MC/AOD.pool.root"]'
+  athena_cmd athena.py -c 'TestType="RSegamma";useCONDBR2=False;PoolAODInput=["../AthenaTrigRDOtoAOD_MC/AODSlim.pool.root"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   post_command checkFile.py AOD.pool.root >AOD.pool.root.txt
   post_command checkxAOD.py AOD.pool.root >AOD.pool.root.checkxAOD.txt
@@ -101,7 +101,7 @@ test 11
   pre_condition if [[ $(find ../AthenaTrigRDOtoAOD_MC/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD_MC/AOD.pool.root ; else test -e non_existing_file ; fi  
   joboptions testAthenaTrigAODtoAOD_TrigNavSlimming.py
   checklog --config checklogTriggerTest.conf --showexcludestats
-  athena_cmd athena.py -c 'TestType = "SqueezeRFTrigCaloCellMaker";from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00"' 
+  athena_cmd athena.py -c 'TestType = "SqueezeRFTrigCaloCellMaker";from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";PoolAODInput=["../AthenaTrigRDOtoAOD_MC/AODSlim.pool.root"]' 
   post_command checkFile.py AOD_SqueezeRFTrigCaloCellMaker.pool.root >AOD_SqueezeRFTrigCaloCellMaker.pool.root.txt  
   post_command checkxAOD.py AOD_SqueezeRFTrigCaloCellMaker.pool.root >AOD_SqueezeRFTrigCaloCellMaker.pool.root.checkxAOD.txt
 

Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAODtoAOD_TrigNavSlimming.py

@@ -20,10 +20,10 @@ if not acf.EvtMax.is_locked():
     acf.EvtMax = 10
 
 
-if not ('athenaCommonFlags.PoolAODInput' in dir()):
-  acf.PoolAODInput = ['../AthenaTrigRDOtoAOD_MC/AOD.pool.root']
-#if not ('athenaCommonFlags.PoolAODOutput' in dir()):
-  #acf.PoolAODOutput='AOD.pool.root'
+if not ('PoolAODInput' in dir()):
+  acf.PoolAODInput = ['AOD.pool.root']
+if not ('PoolAODOutput' in dir()):
+  acf.PoolAODOutput='AODSlim.pool.root'
 
 acf.FilesInput=acf.PoolAODInput()
 

Trigger/TrigValidation/TrigAnalysisTest/test/exec_art_triganalysistest_post.sh

@@ -57,7 +57,7 @@ echo "art-result: $?"
 echo "################################"
 echo "Test AthenaTrigESD_HLTMonitoring"
 export HLTMON_LOG=${JOB_LOG%%.*}.HLTMonitoring.${JOB_LOG#*.}
-athena.py -c 'fileList=["ESD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigAOD_HLTMonitoring.py | tee ${HLTMON_LOG}
+athena.py -c 'fileList=["ESD.pool.root"]' -b TrigAnalysisTest/testAthenaTrigESD_HLTMonitoring.py | tee ${HLTMON_LOG}
 echo "art-result: $?"
 echo "Running checklog"
 timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${HLTMON_LOG}
@@ -74,10 +74,7 @@ fi
 echo "#######################################"
 echo "Test AthenaTrigAODtoAOD_TrigNavSlimming"
 export SLIM_LOG=${JOB_LOG%%.*}.TrigNavSlimming.${JOB_LOG#*.}
-# I should be the last test because of this
-mv AOD.pool.root AODSlimmingInput.pool.root
-athena.py -c 'TestType="RSegamma";useCONDBR2=False;jp.AthenaCommonFlags.PoolAODInput=["AODSlimmingInput.pool.root"]' \
--b TrigAnalysisTest/testAthenaTrigAODtoAOD_TrigNavSlimming.py | tee ${SLIM_LOG}
+athena.py -c 'TestType="RSegamma";useCONDBR2=False;' -b TrigAnalysisTest/testAthenaTrigAODtoAOD_TrigNavSlimming.py | tee ${SLIM_LOG}
 echo "art-result: $?"
 echo "Running checklog"
 timeout 1m check_log.pl --config checklogTriggerTest.conf --showexcludestats ${SLIM_LOG}
@@ -92,5 +89,3 @@ if [ -f AOD.pool.root ]; then
 else 
   echo "No AOD.pool.root to check"
 fi
-
-echo "Finished TrigAnalysisTest post processing"