From c97f3f30588475993fdc33cdf91f6705bc4f4b36 Mon Sep 17 00:00:00 2001
From: Patrick Karl Czodrowski <patrick.czodrowski@cern.ch>
Date: Fri, 8 May 2015 13:01:46 +0200
Subject: [PATCH] tons of updates and fixes see changelog for details
 (TrigAnalysisTest-00-04-05)

    * Add PhysValMonitoring RTT Test
    * TrigAnalysisTest-00-04-xy

2015-05-04/05/06/7 Patrick Czodrowski <czodrows@cern.ch>
    * fix root comp for AthenaTrigESD_HLTMonitoring
    * add root-comp, chaindump, TE dump for all other tests that have expert-mon files
    * fix testAthenaTrigRDOtoBS.py (reduce output level and remove std. input, add menu selection)
    * add testAthenaTrigRDOtoBS_MC test
    * update HIST and REG reference path to ATN conf file to new unified structure
    * rm the edmcheck diffPoolFiles.py
    * Add PhysValMonitoring ATN Test (RTT to be configured)
    * Add MC_standalone test to run BS from the AthenaTrigRDOtoBS_MC test (try with rerunLVL1=1 for now)
    * Add diverse ATN-suits to enable parallel running - thanks to Alex for the support to enable the testing
    * Reduce diverse ATN-suits for now until the integrated ATN test is fixed to accept more than x
    * finally properly remove/prevent some of the std tests in RTT if not appropiate
    * TrigAnalysisTest-00-04-05

2015-04-04 Patrick Czodrowski <czodrows@cern.ch>
    * stop chainDump from running/failing in TDT and TrigEDM Checkers
    * add costum PerfMonDump for the no/Split Reco_tfs
...
(Long ChangeLog diff - truncated)
---
 .../Testing/TrigAnalysisTest.conf             | 276 ++++---
 .../share/testAthenaTrigAOD_TrigDecTool.py    |   5 +
 .../share/testAthenaTrigAOD_TrigEDMCheck.py   |   8 +
 .../share/testAthenaTrigBStoESD.py            |  40 +-
 .../share/testAthenaTrigRDOtoBS.py            |  25 +-
 .../TrigAnalysisTest_TestConfiguration.xml    | 761 ++++++++++--------
 6 files changed, 642 insertions(+), 473 deletions(-)

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf b/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf
index 5898e7bd81f..9ced31833a0 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf
+++ b/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf
@@ -4,20 +4,20 @@ test 1
   joboptions TDTExampleJO.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaTrigAOD_TDT.reference
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigAOD_TDT.reference
   athena_cmd athena.py -c 'InputFiles=["/afs/cern.ch/atlas/project/trigger/pesa-sw/validation/validation-data/valid1.005200.T1_McAtNlo_Jimmy.recon.AOD.e322_s461_r598/AOD.030013._00005.pool.root.1"]'
   post_command rm -f AOD.030013._00005.pool.root.1
   
 test 2
   name AthenaTrigAOD_TrigDecTool
-  doc runs old TrigDec tool on AOD, trys using ../AthenaTrigRDOtoAOD/AOD.pool.root, other files if not available
+  doc runs old TrigDec tool on AOD, trys using ../AthenaTrigRDOtoAOD_MC/AOD.pool.root, other files if not available
   #pre_condition test -e ../AthenaTrigRDOtoAOD/AOD.pool.root
-  pre_condition if [[ $(find ../AthenaTrigRDOtoAOD/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD/AOD.pool.root ; else test -e non_existing_file ; fi  
+  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 testAthenaTrigAOD_TrigDecTool.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  athena_cmd athena.py -c 'fileList=["../AthenaTrigRDOtoAOD/AOD.pool.root"]'  
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaAOD_TrigDecTool.reference
+  athena_cmd athena.py -c 'fileList=["../AthenaTrigRDOtoAOD_MC/AOD.pool.root"]'  
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaAOD_TrigDecTool.reference
   
 test 3
   name AthenaTrigAOD_TrigDecTool_fixedAOD
@@ -27,17 +27,17 @@ test 3
   pre_command RecExCommon_links.sh
   #pre_command xrdcp root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.005200.T1_McAtNlo_Jimmy.recon.AOD.e322_s461_r598/AOD.030013._00005.pool.root.1 .
   #post_command  rm AOD.030013._00005.pool.root.1
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaAOD_TrigDecTool_fixedAOD_top_extract_full.reference
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaAOD_TrigDecTool_fixedAOD_top_extract_full.reference
 
 test 4
   name AthenaTrigAOD_TrigEDMCheck
-  doc  TrigEDMCheck on ../AthenaTrigRDOtoAOD/AOD.pool.root
-  pre_condition if [[ $(find ../AthenaTrigRDOtoAOD/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD/AOD.pool.root ; else test -e non_existing_file ; fi  
+  doc  TrigEDMCheck on ../AthenaTrigRDOtoAOD_MC/AOD.pool.root
+  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 testAthenaTrigAOD_TrigEDMCheck.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  athena_cmd athena.py -c 'fileList=["../AthenaTrigRDOtoAOD/AOD.pool.root"]' 
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaAOD_TrigEDMCheck.reference
+  athena_cmd athena.py -c 'fileList=["../AthenaTrigRDOtoAOD_MC/AOD.pool.root"]' 
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaAOD_TrigEDMCheck.reference
   
 test 5
   name AthenaTrigAOD_TrigEDMCheck_fixedAOD
@@ -45,7 +45,7 @@ test 5
   joboptions testAthenaTrigAOD_TrigEDMCheck_fixedAOD.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDO_TrigEDMCheck_fixedAOD.reference
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDO_TrigEDMCheck_fixedAOD.reference
 
 test 6
   name AthenaTrigAOD_TrigSlimValidation
@@ -54,7 +54,7 @@ test 6
   joboptions testAthenaTrigAOD_TrigSlimValidation.py
   athena_cmd athena.py -c 'inputFile="../AthenaTrigAODtoAOD_TrigNavSlimming/AOD.pool.root"'
   checklog --config checklogTriggerTest.conf --showexcludestats
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaTrigAOD_TrigSlimValidation.reference
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigAOD_TrigSlimValidation.reference
 
 test 7
   name AthenaTrigAOD_TrigSqueezeValidation
@@ -63,7 +63,7 @@ test 7
   joboptions testAthenaTrigAOD_TrigSlimValidation.py
   athena_cmd athena.py -c 'inputFile="../AthenaTrigAODtoAOD_TrigNavSqueeze/AOD_SqueezeRFTrigCaloCellMaker.pool.root"'
   checklog --config checklogTriggerTest.conf --showexcludestats
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaTrigAOD_TrigSqueezeValidation.reference
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigAOD_TrigSqueezeValidation.reference
 
 test 8
   name AthenaTrigAOD_Trigslimval 
@@ -83,7 +83,7 @@ test 9
   joboptions testAthenaTrigAOD_TrigSlimValidation.py
   athena_cmd athena.py -c 'inputFile="../AthenaTrigRDOtoAOD/AOD.pool.root"'
   checklog --config checklogTriggerTest.conf --showexcludestats
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaTrigAOD_UnslimVal.reference
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigAOD_UnslimVal.reference
 
 test 10
   name AthenaTrigAODtoAOD_TrigNavSlimming
@@ -110,12 +110,13 @@ test 12
   doc Writes BS from ESD, trigger only configured, use BS file ../AthenaTrigRDOtoBS/data_test*.data
   pre_condition if [[ $(find ../AthenaTrigRDOtoBS/raw*.data -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoBS/raw*.data ; else test -e non_existing_file ; fi  
   joboptions testAthenaTrigBStoESD.py
+  athena_args -c "jp.AthenaCommonFlags.BSRDOInput=['../AthenaTrigRDOtoBS/raw.data']"
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaBStoESD.reference 
-  #no rootfile no# rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigBStoESD.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaBStoESD.reference 
+  #no rootfile no# rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigBStoESD.root
   post_command checkFile.py ESD.pool.root > ESD.txt
-  edmcheck diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigBStoESD_ESD.pool.root
+#  edmcheck diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigBStoESD_ESD.pool.root
 
 test 13
    name AthenaTrigESD_HLTMonitoring
@@ -125,7 +126,9 @@ test 13
    joboptions testAthenaTrigESD_HLTMonitoring.py
    checklog --config checklogTriggerTest.conf --showexcludestats
    athena_cmd athena.py -c 'fileList=["../AthenaTrigRDOtoESDAOD/ESD.pool.root"]'  
-   customrootcomp  rootcomp.py histo.root /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigESD_HLTMonitoring_ESD_hist.root --select=L1Jet_L2Jet_dEt --select=L1Jet_L2Jet_dEt --select=L1Jet_et --select=L2Jet_et --select=EFJet_et --select=L2Jet_EFJet_dEt --select=L2_MET --select=EF_MET_lin --select=compN_vs_compSumEt --select=L2MET_EFMET_EtCor --select=EF_MET_phi --select=muFast_pt --select=muComb_ptratio_toMF --select=muIso_etcone_toOffl --select=TileMu_RecCBMuon_PhiCor --select=EF_SAMuon_RecSAMuon_PtCor --select=EF_SAMuon_RecSAMuon_PhiCor --select=TrigL2Bjet_XIP3D --select=TrigL2Bjet_XCHI2 --select=TrigEFBjet_XIP3D --select=TrigEFBjet_XCHI2 --select=hEMRadiusRatioVsEta --select=hETEMCalibRatioVsEta --select=hEtHadCalibRatioVsETa --select=hEtRatioVsEt --select=hIsoFracRAtioVsEta --select=hMatchdEtaVsETa --select=hMatchdPhiVsEta --select=hMatchdRVsEta --select=sctECA_sp --select=sctECC_sp --select=sctBarr_sp --select=pixECA_sp --select=pixBarr_sp --select=pixECC_sp --select=TrigIDScan --select=TrigIDScan_phi --select=TrigIDScan_pt --select=TrigIDScan_z0   --select=TrigSiTrack_a0 --select=TrigSiTrack_eta --select=TrigSiTrack_phi --select=TrigSiTrack_pt --select=EmClus --select=L1Eta --select=HadEt --select=Rcore --select=EFScanCaloEta --select=Pixel --select=Qual
+   #for the reference script
+   post_command cp histo.root expert-monitoring.root 
+   customrootcomp  rootcomp.py histo.root /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigESD_HLTMonitoring.root --select=L1Jet_L2Jet_dEt --select=L1Jet_L2Jet_dEt --select=L1Jet_et --select=L2Jet_et --select=EFJet_et --select=L2Jet_EFJet_dEt --select=L2_MET --select=EF_MET_lin --select=compN_vs_compSumEt --select=L2MET_EFMET_EtCor --select=EF_MET_phi --select=muFast_pt --select=muComb_ptratio_toMF --select=muIso_etcone_toOffl --select=TileMu_RecCBMuon_PhiCor --select=EF_SAMuon_RecSAMuon_PtCor --select=EF_SAMuon_RecSAMuon_PhiCor --select=TrigL2Bjet_XIP3D --select=TrigL2Bjet_XCHI2 --select=TrigEFBjet_XIP3D --select=TrigEFBjet_XCHI2 --select=hEMRadiusRatioVsEta --select=hETEMCalibRatioVsEta --select=hEtHadCalibRatioVsETa --select=hEtRatioVsEt --select=hIsoFracRAtioVsEta --select=hMatchdEtaVsETa --select=hMatchdPhiVsEta --select=hMatchdRVsEta --select=sctECA_sp --select=sctECC_sp --select=sctBarr_sp --select=pixECA_sp --select=pixBarr_sp --select=pixECC_sp --select=TrigIDScan --select=TrigIDScan_phi --select=TrigIDScan_pt --select=TrigIDScan_z0   --select=TrigSiTrack_a0 --select=TrigSiTrack_eta --select=TrigSiTrack_phi --select=TrigSiTrack_pt --select=EmClus --select=L1Eta --select=HadEt --select=Rcore --select=EFScanCaloEta --select=Pixel --select=Qual
 
 test 14
    name AthenaTrigESD_HLTMonitoring_fixedESD
@@ -134,7 +137,7 @@ test 14
    joboptions testAthenaTrigESD_HLTMonitoring.py
    checklog --config checklogTriggerTest.conf --showexcludestats
    athena_cmd athena.py -c 'fileList=["/afs/cern.ch/atlas/project/trigger/pesa-sw/validation/validation-data/valid1.105200.T1_McAtNlo_Jimmy.recon.ESD.e380_s764_r1332_tid144313_00/ESD.144313._000001.pool.root.1"]' 
-   customrootcomp  rootcomp.py histo.root /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigESD_HLTMonitoring_fixedESD_hist.root --select=L1Jet_L2Jet_dEt --select=L1Jet_L2Jet_dEt --select=L1Jet_et --select=L2Jet_et --select=EFJet_et --select=L2Jet_EFJet_dEt --select=L2_MET --select=EF_MET_lin --select=compN_vs_compSumEt --select=L2MET_EFMET_EtCor --select=EF_MET_phi --select=muFast_pt --select=muComb_ptratio_toMF --select=muIso_etcone_toOffl --select=TileMu_RecCBMuon_PhiCor --select=EF_SAMuon_RecSAMuon_PtCor --select=EF_SAMuon_RecSAMuon_PhiCor --select=TrigL2Bjet_XIP3D --select=TrigL2Bjet_XCHI2 --select=TrigEFBjet_XIP3D --select=TrigEFBjet_XCHI2 --select=hEMRadiusRatioVsEta --select=hETEMCalibRatioVsEta --select=hEtHadCalibRatioVsETa --select=hEtRatioVsEt --select=hIsoFracRAtioVsEta --select=hMatchdEtaVsETa --select=hMatchdPhiVsEta --select=hMatchdRVsEta --select=sctECA_sp --select=sctECC_sp --select=sctBarr_sp --select=pixECA_sp --select=pixBarr_sp --select=pixECC_sp --select=TrigIDScan --select=TrigIDScan_phi --select=TrigIDScan_pt --select=TrigIDScan_z0   --select=TrigSiTrack_a0 --select=TrigSiTrack_eta --select=TrigSiTrack_phi --select=TrigSiTrack_pt --select=EmClus --select=L1Eta --select=HadEt --select=Rcore --select=EFScanCaloEta --select=Pixel --select=Qual
+   customrootcomp  rootcomp.py histo.root /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigESD_HLTMonitoring_fixedESD_hist.root --select=L1Jet_L2Jet_dEt --select=L1Jet_L2Jet_dEt --select=L1Jet_et --select=L2Jet_et --select=EFJet_et --select=L2Jet_EFJet_dEt --select=L2_MET --select=EF_MET_lin --select=compN_vs_compSumEt --select=L2MET_EFMET_EtCor --select=EF_MET_phi --select=muFast_pt --select=muComb_ptratio_toMF --select=muIso_etcone_toOffl --select=TileMu_RecCBMuon_PhiCor --select=EF_SAMuon_RecSAMuon_PtCor --select=EF_SAMuon_RecSAMuon_PhiCor --select=TrigL2Bjet_XIP3D --select=TrigL2Bjet_XCHI2 --select=TrigEFBjet_XIP3D --select=TrigEFBjet_XCHI2 --select=hEMRadiusRatioVsEta --select=hETEMCalibRatioVsEta --select=hEtHadCalibRatioVsETa --select=hEtRatioVsEt --select=hIsoFracRAtioVsEta --select=hMatchdEtaVsETa --select=hMatchdPhiVsEta --select=hMatchdRVsEta --select=sctECA_sp --select=sctECC_sp --select=sctBarr_sp --select=pixECA_sp --select=pixBarr_sp --select=pixECC_sp --select=TrigIDScan --select=TrigIDScan_phi --select=TrigIDScan_pt --select=TrigIDScan_z0   --select=TrigSiTrack_a0 --select=TrigSiTrack_eta --select=TrigSiTrack_phi --select=TrigSiTrack_pt --select=EmClus --select=L1Eta --select=HadEt --select=Rcore --select=EFScanCaloEta --select=Pixel --select=Qual
 
 test 15
   name AthenaTrigRDO_TDT
@@ -142,7 +145,10 @@ test 15
   joboptions testAthenaTrigRDO_TDT.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaTrigRDO_TDT.reference
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDO_TDT.reference
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDO_TDT.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDO_TDT.root 1
+  post_command chainDump.py -n -S
 
 test 16
   doc runs trigger from RDO writes AOD, AOD is used by other tasks
@@ -150,17 +156,16 @@ test 16
   joboptions testAthenaTrigRDOtoAOD.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  athena_cmd  athena.py -c 'from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00/RDO.04782081._000001.pool.root.1"]'
-  #pre_command get_files -jo checkFileTrigSize_RTT.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"]'
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD.reference
-#  regtest TrigSteer_L2.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_L2.TrigChainMoniValidation.reference
-#  regtest TrigSteer_EF.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_EF.TrigChainMoniValidation.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AOD.pool.root
+  athena_cmd  athena.py -c 'jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD.reference
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkxAOD.py AOD.pool.root > AOD.pool.root.checkxAODFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD.root 1
+  post_command chainDump.py -n -S
 
 test 17
   name AthenaTrigRDOtoBS
@@ -169,10 +174,12 @@ test 17
   checklog --config checklogTriggerTest.conf --showexcludestats
 #  compresslog
   pre_command RecExCommon_links.sh
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"]'
+  athena_cmd  athena.py -c 'menu="Physics_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   post_command rm -f raw._0001.data
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoBS_top_CSC-01-02-00_RDO_extract_full.reference
-  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoBS.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoBS.reference
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoBS.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoBS.root 1
+  post_command chainDump.py -n -S
 
 test 18
   name AthenaTrigRDOtoESDAOD
@@ -180,37 +187,41 @@ test 18
   joboptions testAthenaTrigRDOtoESDAOD.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  athena_cmd athena.py -c 'from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00/RDO.04782081._000001.pool.root.1"]'
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoESDAOD.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_AOD.pool.root
-  edmcheck  diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_ESD.pool.root
+  athena_cmd athena.py -c 'menu="MC_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_AOD.pool.root
+#  edmcheck diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_ESD.pool.root
   post_command checkFile.py ESD.pool.root > ESD.txt
   post_command checkFile.py AOD.pool.root > AOD.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
-  
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD.root 1
+  post_command chainDump.py -n -S
+
 test 19
   name AthenaTrigRDOtoTAG
   doc runs trigger from RDO writes TAG
   joboptions testAthenaTrigRDOtoTAG.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"]'
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoTAG.reference
-  
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoTAG.reference
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoTAG.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoTAG.root 1
+  post_command chainDump.py -n -S
+
 test 20
   name BackCompAthenaTrigBStoESDAOD
   joboptions None
-#  pre_command xrdcp root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data10_7TeV.00152845.physics_MinBias.merge.RAW/data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1 . 
-#athena_cmd Reco_tf.py --geometryVersion ATLAS-R1-2012-02-01-00 --maxEvents 10 --inputBSFile root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data12_8TeV.00212967.physics_EnhancedBias.merge_eb_zee_zmumu_cc.RAW._lb0291._SFO-5._0001.data --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --autoConfiguration everything
   athena_cmd Reco_tf.py --AMIConfig=q120 --maxEvents 10 --inputBSFile root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data12_8TeV.00212967.physics_EnhancedBias.merge_eb_zee_zmumu_cc.RAW._lb0291._SFO-5._0001.data --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root
-  checklog --config checklogTriggerTest.conf --showexcludestats
-#  post_command rm data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1
   post_command checkFile.py ESD.pool.root > ESD.txt
   post_command checkFile.py AOD.pool.root > AOD.txt
   post_command perl -i.clean -pe 's/^[\d:]+ //' log.RAWtoESD 
+  post_command perl -i.clean -pe 's/^[\d:]+ //' log.ESDtoAOD 
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
-  
+  post_command cat log.RAWtoESD log.ESDtoAOD >> BackCompAthenaTrigBStoESDAOD_test.log  
+  checklog --config checklogTriggerTest.conf --showexcludestats  
+
 test 21
    name BackCompAthenaTrigAOD_TrigDecTool
    pre_condition if [[ $(find ../BackCompAthenaTrigBStoESDAOD/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../BackCompAthenaTrigBStoESDAOD/AOD.pool.root ; else test -e non_existing_file ; fi  
@@ -218,7 +229,7 @@ test 21
    athena_cmd athena.py -c 'fileList=["../BackCompAthenaTrigBStoESDAOD/AOD.pool.root"]'
    checklog --config checklogTriggerTest.conf --showexcludestats
    #pre_command RecExCommon_links.sh
-   fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/BackCompAthenaTrigAOD_TrigDecTool
+   fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_BackCompAthenaTrigAOD_TrigDecTool.reference
 
 test 22
    name BackCompAthenaTrigAOD_TrigEDMCheck
@@ -227,52 +238,55 @@ test 22
    checklog --config checklogTriggerTest.conf --showexcludestats
    #pre_command RecExCommon_links.sh
    athena_cmd athena.py -c 'fileList=["../BackCompAthenaTrigBStoESDAOD/AOD.pool.root"]'
-   fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/BackCompAthenaTrigAOD_TrigEDMCheck
+   fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_BackCompAthenaTrigAOD_TrigEDMCheck.reference
 
 test 23
   doc runs trigger from RDO writes AOD, Physics menu
   name AthenaTrigRDOtoAOD_Physics
   joboptions testAthenaTrigRDOtoAOD.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="Physics_pp_v5"'
-  athena_cmd  athena.py -c 'from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00/RDO.04782081._000001.pool.root.1"];menu="Physics_pp_v5"'
+  athena_cmd  athena.py -c 'menu="Physics_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
   #pre_command get_files -jo checkFileTrigSize_RTT.py
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_Physics.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_Physics_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AOD_Physics.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_Physics.reference
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_Physics_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD_Physics.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
-  
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_Physics.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_Physics.root 1
+  post_command chainDump.py -n -S
+
 test 24
   doc runs trigger from RDO writes AOD, MC menu
   name AthenaTrigRDOtoAOD_MC
   joboptions testAthenaTrigRDOtoAOD.py
-  athena_cmd  athena.py -c 'from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00/RDO.04782081._000001.pool.root.1"];menu="MC_pp_v5"'
-#  athena_cmd  athena.py -c 'menu="MC_pp_v5"'
+  athena_cmd  athena.py -c 'menu="MC_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
   #pre_command get_files -jo checkFileTrigSize_RTT.py
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_MC.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_MC_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AOD_MC.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC.reference
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD_MC.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_MC.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_MC.root 1
+  post_command chainDump.py -n -S
   
 test 25
   doc runs trigger from RDO writes AOD, LS1 menu
   name AthenaTrigRDOtoAOD_LS1
   joboptions testAthenaTrigRDOtoAOD.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="LS1_v1"'
-  athena_cmd  athena.py -c 'menu="LS1_v1"'
+  athena_cmd  athena.py -c 'menu="LS1_v1"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
   #pre_command get_files -jo checkFileTrigSize_RTT.py
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_LS1.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_LS1_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AOD_LS1.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_LS1.reference
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_LS1_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD_LS1.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
@@ -281,14 +295,13 @@ test 26
   doc runs trigger from RDO writes AOD, DC14 menu
   name AthenaTrigRDOtoAOD_DC14
   joboptions testAthenaTrigRDOtoAOD.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="DC14"'
   athena_cmd  athena.py -c 'menu="DC14"'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
   #pre_command get_files -jo checkFileTrigSize_RTT.py
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_DC14.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_DC14_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AOD_DC14.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_DC14.reference
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_DC14_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD_DC14.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
@@ -297,43 +310,46 @@ test 27
   name AthenaTrigRDOtoESDAOD_Physics
   doc Basic, standard, RecExCommon-based, read-RDO, run-trigger job. Reco enabled, Physics menu
   joboptions testAthenaTrigRDOtoESDAOD.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="Physics_pp_v5"'
-  athena_cmd  athena.py -c 'from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00/RDO.04782081._000001.pool.root.1"];menu="Physics_pp_v5"'
+  athena_cmd  athena.py -c 'menu="Physics_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoESDAOD_Physics.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_AOD_Physics.pool.root
-  edmcheck  diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_ESD_Physics.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD_Physics.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_AOD_Physics.pool.root
+#  edmcheck diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_ESD_Physics.pool.root
   post_command checkFile.py ESD.pool.root > ESD.txt
   post_command checkFile.py AOD.pool.root > AOD.txt 
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_Physics.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_Physics.root 1
+  post_command chainDump.py -n -S
     
 test 28
   name AthenaTrigRDOtoESDAOD_MC
   doc Basic, standard, RecExCommon-based, read-RDO, run-trigger job. Reco enabled, MC menu
   joboptions testAthenaTrigRDOtoESDAOD.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="MC_pp_v5"'
-  athena_cmd  athena.py -c 'from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00/RDO.04782081._000001.pool.root.1"];menu="MC_pp_v5"'
+  athena_cmd  athena.py -c 'menu="MC_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoESDAOD_MC.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_AOD_MC.pool.root
-  edmcheck  diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_ESD_MC.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD_MC.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_AOD_MC.pool.root
+#  edmcheck diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_ESD_MC.pool.root
   post_command checkFile.py ESD.pool.root > ESD.txt
   post_command checkFile.py AOD.pool.root > AOD.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_MC.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_MC.root 1
+  post_command chainDump.py -n -S
   
 test 29
   name AthenaTrigRDOtoESDAOD_LS1
   doc Basic, standard, RecExCommon-based, read-RDO, run-trigger job. Reco enabled, LS1 menu
   joboptions testAthenaTrigRDOtoESDAOD.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="LS1_v1"'
-  athena_cmd  athena.py -c 'menu="LS1_v1"'
+  athena_cmd  athena.py -c 'menu="LS1_v1"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoESDAOD_LS1.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_AOD_LS1.pool.root
-  edmcheck  diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_ESD_LS1.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD_LS1.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_AOD_LS1.pool.root
+#  edmcheck diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_ESD_LS1.pool.root
   post_command checkFile.py ESD.pool.root > ESD.txt
   post_command checkFile.py AOD.pool.root > AOD.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
@@ -346,9 +362,9 @@ test 30
   athena_cmd  athena.py -c 'menu="DC14"'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoESDAOD_DC14.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_AOD_DC14.pool.root
-  edmcheck  diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoESDAOD_ESD_DC14.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD_DC14.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_AOD_DC14.pool.root
+#  edmcheck diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_ESD_DC14.pool.root
   post_command checkFile.py ESD.pool.root > ESD.txt
   post_command checkFile.py AOD.pool.root > AOD.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
@@ -359,16 +375,16 @@ test 31
   joboptions testAthenaTrigRDOtoAODSLIM.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  athena_cmd  athena.py -c 'from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00/RDO.04782081._000001.pool.root.1"]'
-#  pre_command get_files -jo checkFileTrigSize_RTT.py
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAODSLIM.reference
-#  regtest TrigSteer_L2.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_L2.TrigChainMoniValidation.reference
-#  regtest TrigSteer_EF.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_EF.TrigChainMoniValidation.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAODSLIM_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AODSLIM.pool.root
+  athena_cmd  athena.py -c 'menu="MC_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAODSLIM_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AODSLIM.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkxAOD.py AOD.pool.root > AOD.pool.root.checkxAODFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_SLIM.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_SLIM.root 1
+  post_command chainDump.py -n -S
+
 
 test 32
   doc test if ATLAS-R2-2015-01-01-00 is already working
@@ -377,9 +393,9 @@ test 32
   athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="Physics_pp_v5"'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_Physics_ATLAS_R2_READY_OR_NOT.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_Physics_ATLAS_R2_READY_OR_NOT_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AOD_Physics_ATLAS_R2_READY_OR_NOT.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_Physics_ATLAS_R2_READY_OR_NOT.reference
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_Physics_ATLAS_R2_READY_OR_NOT_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD_Physics_ATLAS_R2_READY_OR_NOT.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
@@ -388,13 +404,12 @@ test 33
   doc runs trigger from RDO writes AOD, MC_pp_v5_loose_mc_prescales menu
   name AthenaTrigRDOtoAOD_MC_pp_v5_loose_mc_prescales
   joboptions testAthenaTrigRDOtoAOD.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="MC_pp_v5_loose_mc_prescales"'
-  athena_cmd  athena.py -c 'menu="MC_pp_v5_loose_mc_prescales"'
+  athena_cmd  athena.py -c 'menu="MC_pp_v5_loose_mc_prescales"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_MC_pp_v5_loose_mc_prescales.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_MC_pp_v5_loose_mc_prescales_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AOD_MC_pp_v5_loose_mc_prescales.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC_pp_v5_loose_mc_prescales.reference
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC_pp_v5_loose_mc_prescales_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD_MC_pp_v5_loose_mc_prescales.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
@@ -403,13 +418,12 @@ test 34
   doc runs trigger from RDO writes AOD, MC_pp_v5_tight_mc_prescales menu
   name AthenaTrigRDOtoAOD_MC_pp_v5_tight_mc_prescales
   joboptions testAthenaTrigRDOtoAOD.py
-#  athena_cmd  athena.py -c 'from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00";from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;athenaCommonFlags.FilesInput=["/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/RDO.01606245._000001.pool.root.1"];menu="MC_pp_v5_tight_mc_prescales"'
-  athena_cmd  athena.py -c 'menu="MC_pp_v5_tight_mc_prescales"'
+  athena_cmd  athena.py -c 'menu="MC_pp_v5_tight_mc_prescales"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_MC_pp_v5_tight_mc_prescales.reference
-  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoAOD_MC_pp_v5_tight_mc_prescales_HLT.TrigChainMoniValidation.reference
-  edmcheck  diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/AthenaTrigRDOtoAOD_AOD_MC_pp_v5_tight_mc_prescales.pool.root
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC_pp_v5_tight_mc_prescales.reference
+  regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC_pp_v5_tight_mc_prescales_HLT.TrigChainMoniValidation.reference
+#  edmcheck diffPoolFiles.py AOD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD_MC_pp_v5_tight_mc_prescales.pool.root
   post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
   post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
@@ -427,3 +441,57 @@ test 35
   post_command perl -i.clean -pe 's/^[\d:]+ //' log.RAWtoESD 
   post_command perl -i.clean -pe 's/^[\d:]+ //' log.ESDtoAOD 
   post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
+
+test 36
+  name AthenaTrigRDOtoBS_MC
+  doc Write BS from RDO, runs trigger MC menu, result is used by BStoESD
+  joboptions testAthenaTrigRDOtoBS.py
+  checklog --config checklogTriggerTest.conf --showexcludestats
+#  compresslog
+  pre_command RecExCommon_links.sh
+  athena_cmd  athena.py -c 'menu="MC_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+  post_command rm -f raw._0001.data
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoBS_MC.reference
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoBS_MC.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoBS_MC.root 1
+  post_command chainDump.py -n -S
+
+test 37
+  name AthenaTrigBStoESD_MC
+  doc Writes BS from ESD, trigger only configured, use BS file ../AthenaTrigRDOtoBS_MC/data_test*.data
+  pre_condition if [[ $(find ../AthenaTrigRDOtoBS_MC/raw*.data -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoBS_MC/raw*.data ; else test -e non_existing_file ; fi  
+  joboptions testAthenaTrigBStoESD.py
+  checklog --config checklogTriggerTest.conf --showexcludestats
+  pre_command RecExCommon_links.sh
+  athena_args -c "jp.AthenaCommonFlags.BSRDOInput=['../AthenaTrigRDOtoBS_MC/raw.data']"
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaBStoESD_MC.reference 
+#no rootfile no# rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigBStoESD_MC.root
+  post_command checkFile.py ESD.pool.root > ESD.txt
+#  edmcheck diffPoolFiles.py ESD.pool.root  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigBStoESD_MC_ESD.pool.root
+
+test 38
+  name PhysValMonitoring
+  joboptions None
+  doc runs PhysValMonitoring on AOD, uses ../AthenaTrigRDOtoAOD_MC/AOD.pool.root 
+  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  
+  checklog --config checklogTriggerTest.conf --showexcludestats
+  athena_cmd Reco_tf.py --inputAODFile `find ../AthenaTrigRDOtoAOD_MC/  -name "AOD.pool.root" -printf %p,` --outputNTUP_PHYSVALFile physval.root --validationFlags noExample doTrigMinBias doTrigIDtrk doTrigMET doTrigJet doTrigTau doTrigEgamma doTrigMuon doTrigBphys #doTrigBjet 
+  post_command perl -i.clean -pe 's/^[\d:]+ //' log.PhysicsValidation 
+  post_command cp physval.root physval2.root
+  post_command mkdir html
+  post_command physval_make_web_display.py --reffile Same:physval.root --outdir=html --title Same physval2.root 
+  post_command cat log.PhysicsValidation >> PhysValMonitoring_test.log  
+  checklog --config checklogTriggerTest.conf --showexcludestats
+
+test 39
+  name MC_standalone
+  doc TriggerRelease/runHLT_standalone.py
+  joboptions TriggerRelease/runHLT_standalone.py
+  pre_condition if [[ $(find ../AthenaTrigRDOtoBS_MC/raw.data -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoBS_MC/raw.data ; else test -e non_existing_file ; fi  
+  checklog --config checklogTriggerTest.conf --showexcludestats
+  regtest TrigSteer_HLT.TrigChainMoniOnline REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_MC_standalone_HLT.TrigChainMoniValidation.reference
+  rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_MC_standalone.root
+  checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_MC_standalone.root 1
+  athena_args -c "setupForMC=True;useCONDBR2=False;setGlobalTag='OFLCOND-RUN12-SDR-25';setDetDescr='ATLAS-R2-2015-02-01-00';EvtMax=10;rerunLVL1=1;testMCV5=True;BSRDOInput='../AthenaTrigRDOtoBS_MC/raw.data'" 
+  pre_command RecExCommon_links.sh
+  post_command chainDump.py -n -S
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
index ce33aa9ddc1..1ddb4676e54 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
@@ -100,6 +100,11 @@ TrigDecChecker.MonitoredChains=[]
 #from AthenaCommon.GlobalFlags import GlobalFlags
 #GlobalFlags.DetGeo.set_atlas()
 
+from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
+ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
+
+from TrigEDMConfig.TriggerEDM import EDMLibraries
+ToolSvc.TrigDecisionTool.Navigation.Dlls = EDMLibraries
 
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
index dfd3debea23..ff7da9735e0 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
@@ -92,11 +92,19 @@ StatusCodeSvc.AbortOnError=False
 from TrigValAlgs.TrigValAlgsConfig import TrigEDMChecker
 TrigEDMChecker = TrigEDMChecker("TrigEDMChecker")
 
+from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
+ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
+
+from TrigEDMConfig.TriggerEDM import EDMLibraries
+ToolSvc.TrigDecisionTool.Navigation.Dlls = EDMLibraries
+
 from AthenaCommon.AlgSequence import AlgSequence
 topSequence = AlgSequence()
 topSequence += TrigEDMChecker
 TrigEDMChecker.doDumpAll = True
 
+
+
 include("TriggerTest/TriggerTestCommon.py")
 
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py
index f8ee6af03ee..648f9575e68 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py
@@ -9,23 +9,27 @@ from AthenaCommon.Logging import logging
 log = logging.getLogger("testAthenaTrigBStoESD.py:") 
 
 # find input BS file using a glob because the name seems to change a lot
-if not 'BSRDOInput' in dir():
-   #BSRDOInput=["../AthenaTrigRDOtoBS/data_test.00005200.Single_Stream.daq.RAW._lb0000._Athena._0001.data"]
-   import glob
-   pattern="../AthenaTrigRDOtoBS/raw*.data"
-   bsfiles=glob.glob(pattern)
-   if (len(bsfiles)==0):
-      log.fatal(" ERROR FATAL No input BS file could be found matching '" + pattern + "'")
-      exit(-1)
-   elif (len(bsfiles)>1):
-      log.warning("Multiple input BS files found, taking last one: " + bsfiles[-1])
-      print "All matches to pattern '" + pattern + "': ", bsfiles
-      acf.BSRDOInput=[bsfiles[-1]]
-   else:
-      log.info("Using input BS file " + bsfiles[0])
-      acf.BSRDOInput=bsfiles
+#if not 'BSRDOInput' in dir():
+#   #BSRDOInput=["../AthenaTrigRDOtoBS/data_test.00005200.Single_Stream.daq.RAW._lb0000._Athena._0001.data"]
+#   import glob
+#   pattern="../AthenaTrigRDOtoBS/raw*.data"
+#   bsfiles=glob.glob(pattern)
+#   if (len(bsfiles)==0):
+#      log.fatal(" ERROR FATAL No input BS file could be found matching '" + pattern + "'")
+#      exit(-1)
+#   elif (len(bsfiles)>1):
+#      log.warning("Multiple input BS files found, taking last one: " + bsfiles[-1])
+#      print "All matches to pattern '" + pattern + "': ", bsfiles
+#      acf.BSRDOInput=[bsfiles[-1]]
+#   else:
+#      log.info("Using input BS file " + bsfiles[0])
+#      acf.BSRDOInput=bsfiles
  
-acf.FilesInput=acf.BSRDOInput()
+
+#acf.FilesInput=acf.BSRDOInput()
+ 
+
+
 
 
 # specifying conditions by hand until auto configure is fixed
@@ -33,7 +37,9 @@ acf.FilesInput=acf.BSRDOInput()
 #log.warning("setting geometry and coniditions by hand, will break if default RDO file changes")
 
 from AthenaCommon.GlobalFlags import globalflags
-globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-RUN12-SDR-22')
+#globalflags.ConditionsTag.set_Value_and_Lock('OFLCOND-RUN12-SDR-22')
+globalflags.InputFormat='bytestream'
+
 #globalflags.ConditionsTag.set_Value_and_Lock("OFLCOND-RUN12-SDR-17")
 #globalflags.DetDescrVersion.set_Value_and_Lock("ATLAS-GEO-21-02-02")
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py
index a02b3a633ff..6e096dc9b2d 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py
@@ -1,30 +1,26 @@
-
 ### usually ATN tests runs with following RDO input:
 
 from RecExConfig.RecFlags import rec
 from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
 
-acf.FilesInput=["/afs/cern.ch/atlas/offline/ReleaseData/v19/testfile/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_10evt.pool.root"]
+#acf.FilesInput=["/afs/cern.ch/atlas/offline/ReleaseData/v19/testfile/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_10evt.pool.root"]
 #["/afs/cern.ch/atlas/offline/data/testfile/calib1_csc11.005200.T1_McAtNlo_Jimmy.digit.RDO.v12000301_tid003138._00016_extract_10evt.pool.root"] 
 #DetDescrVersion="ATLAS-CSC-01-02-00"
 acf.BSRDOOutput="raw.data"
 
-
 if not acf.EvtMax.is_locked():
     acf.EvtMax=5
 if not ('OutputLevel' in dir()):
     rec.OutputLevel=DEBUG
+#    rec.OutputLevel=INFO
+#scan for RTT files (only if dsName and fileRange set)
+include("TriggerTest/TrigScanFiles.py")
 ###############################
-rec.doCBNT=False
-
 
 doTrigger=True
 #doTriggerConfigOnly=True 
-
 rec.doESD=False
-
 TriggerModernConfig=True
-
 rec.doWriteAOD=False
 rec.doWriteESD=False
 rec.doWriteTAG=False
@@ -33,7 +29,7 @@ rec.doDPD=False
 #rec.doESD=False
 rec.doESD.set_Value_and_Lock(False)
 doTAG=False
-
+rec.doCBNT=False
 #rec.doTruth=True
 
 #-----------------------------------------------------------
@@ -43,13 +39,20 @@ include("RecExCond/RecExCommon_flags.py")
 #TriggerFlags.readHLTconfigFromXML=False
 #TriggerFlags.readLVL1configFromXML=False
 
-TriggerFlags.enableMonitoring = [ 'Validation', 'Time', 'Log' ]
+# set up trigger monitoring                                                                                                                                                        
+if not ('RunningRTT' in dir()):
+    TriggerFlags.enableMonitoring = [ 'Validation', 'Time' , 'Log' ]
+else:
+    TriggerFlags.enableMonitoring = [ 'Validation', 'Time' ]
+
 TriggerFlags.writeBS=True
 rec.doWriteBS = True
 
 #------------ This is for ATN/RTT tests only ---------
 #TriggerFlags.triggerMenuSetup = 'default'
-TriggerFlags.triggerMenuSetup = 'Physics_pp_v5'
+#TriggerFlags.triggerMenuSetup = 'Physics_pp_v5'
+if  ('menu' in dir()):
+    TriggerFlags.triggerMenuSetup=menu 
 TriggerFlags.L1PrescaleSet = ''
 TriggerFlags.HLTPrescaleSet = ''
 TriggerFlags.doHLT=True
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml b/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
index 159bc598164..b3547291f7e 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
@@ -11,7 +11,7 @@
     <!-- ATN tests configured here -->
     <atn>
         <!-- always KEEP this one --> 
-        <TEST name="AthenaTrigRDOtoESDAOD" type="script" suite="triganalysis_val"> 
+        <TEST name="AthenaTrigRDOtoESDAOD" type="script" suite="triganalysis_val_RDOtoESDAOD"> 
             <options_atn>trigtest.pl --test AthenaTrigRDOtoESDAOD --run AthenaTrigRDOtoESDAOD --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
@@ -21,7 +21,19 @@
             </expectations> 
         </TEST> 
         
-        <TEST name="AthenaTrigRDOtoBS" type="script" suite="triganalysis_val"> 
+        
+        <TEST name="AthenaTrigESD_HLTMonitoring" type="script" suite="triganalysis_val_RDOtoESDAOD"> 
+            <options_atn>trigtest.pl --test AthenaTrigESD_HLTMonitoring --run AthenaTrigESD_HLTMonitoring --conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
+            <author>TrigAnalysis validation</author> 
+            <expectations> 
+                <errorMessage>FAILURE </errorMessage> 
+                <returnValue>0</returnValue> 
+            </expectations> 
+        </TEST> 
+        
+        
+        <TEST name="AthenaTrigRDOtoBS" type="script" suite="triganalysis_val_BS"> 
             <options_atn>trigtest.pl --test AthenaTrigRDOtoBS --run AthenaTrigRDOtoBS --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
@@ -31,8 +43,8 @@
             </expectations> 
         </TEST> 
         
-        <TEST name="AthenaTrigRDOtoAOD_Physics" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigRDOtoAOD_Physics --run AthenaTrigRDOtoAOD_Physics --conf TrigAnalysisTest.conf</options_atn> 
+        <TEST name="AthenaTrigBStoESD" type="script" suite="triganalysis_val_BS"> 
+            <options_atn>trigtest.pl --test AthenaTrigBStoESD --run AthenaTrigBStoESD --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
@@ -41,8 +53,9 @@
             </expectations> 
         </TEST> 
         
-        <TEST name="AthenaTrigRDOtoESDAOD_Physics" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigRDOtoESDAOD_Physics --run AthenaTrigRDOtoESDAOD_Physics --conf TrigAnalysisTest.conf</options_atn> 
+        <!--TEST name="AthenaTrigRDOtoBS_MC" type="script" suite="triganalysis_val_BS_MC"-->         
+        <TEST name="AthenaTrigRDOtoBS_MC" type="script" suite="triganalysis_val_BS"> 
+            <options_atn>trigtest.pl --test AthenaTrigRDOtoBS_MC --run AthenaTrigRDOtoBS_MC --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
@@ -51,8 +64,31 @@
             </expectations> 
         </TEST> 
         
-        <TEST name="AthenaTrigRDOtoAOD_MC" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigRDOtoAOD_MC --run AthenaTrigRDOtoAOD_MC --conf TrigAnalysisTest.conf</options_atn> 
+        <!--TEST name="AthenaTrigBStoESD_MC" type="script" suite="triganalysis_val_BS_MC"--> 
+        <TEST name="AthenaTrigBStoESD_MC" type="script" suite="triganalysis_val_BS"> 
+            <options_atn>trigtest.pl --test AthenaTrigBStoESD_MC --run AthenaTrigBStoESD_MC --conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
+            <author>TrigAnalysis validation</author> 
+            <expectations> 
+                <errorMessage>FAILURE </errorMessage> 
+                <returnValue>0</returnValue> 
+            </expectations> 
+        </TEST> 
+        
+        <!--TEST name="MC_standalone" type="script" suite="triganalysis_val_BS_MC"--> 
+        <TEST name="MC_standalone" type="script" suite="triganalysis_val_BS"> 
+            <options_atn>trigtest.pl --test MC_standalone --run MC_standalone --conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
+            <author>TrigAnalysis validation</author> 
+            <expectations> 
+                <errorMessage>FAILURE </errorMessage> 
+                <returnValue>0</returnValue> 
+            </expectations> 
+        </TEST> 
+        
+        <!--TEST name="AthenaTrigRDOtoESDAOD_Physics" type="script" suite="triganalysis_val_Phys_EA"--> 
+        <TEST name="AthenaTrigRDOtoESDAOD_Physics" type="script" suite="triganalysis_val_EA"> 
+            <options_atn>trigtest.pl --test AthenaTrigRDOtoESDAOD_Physics --run AthenaTrigRDOtoESDAOD_Physics --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
@@ -61,7 +97,9 @@
             </expectations> 
         </TEST> 
         
-        <TEST name="AthenaTrigRDOtoESDAOD_MC" type="script" suite="triganalysis_val"> 
+        
+        <!--TEST name="AthenaTrigRDOtoESDAOD_MC" type="script" suite="triganalysis_val_MC_EA"--> 
+        <TEST name="AthenaTrigRDOtoESDAOD_MC" type="script" suite="triganalysis_val_EA"> 
             <options_atn>trigtest.pl --test AthenaTrigRDOtoESDAOD_MC --run AthenaTrigRDOtoESDAOD_MC --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
@@ -71,7 +109,7 @@
             </expectations> 
         </TEST> 
         
-        <TEST name="AthenaTrigRDOtoTAG" type="script" suite="triganalysis_val"> 
+        <TEST name="AthenaTrigRDOtoTAG" type="script" suite="triganalysis_val_tag"> 
             <options_atn>trigtest.pl --test AthenaTrigRDOtoTAG --run AthenaTrigRDOtoTAG --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
@@ -81,7 +119,19 @@
             </expectations> 
         </TEST> 
         
-        <TEST name="AthenaTrigRDOtoAOD" type="script" suite="triganalysis_val"> 
+        <!--TEST name="AthenaTrigRDOtoAOD_Physics" type="script" suite="triganalysis_val_AOD_Phys"--> 
+        <TEST name="AthenaTrigRDOtoAOD_Physics" type="script" suite="triganalysis_val_AOD"> 
+            <options_atn>trigtest.pl --test AthenaTrigRDOtoAOD_Physics --run AthenaTrigRDOtoAOD_Physics --conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
+            <author>TrigAnalysis validation</author> 
+            <expectations> 
+                <errorMessage>FAILURE </errorMessage> 
+                <returnValue>0</returnValue> 
+            </expectations> 
+        </TEST> 
+        
+        
+        <TEST name="AthenaTrigRDOtoAOD" type="script" suite="triganalysis_val_AOD"> 
             <options_atn>trigtest.pl --test AthenaTrigRDOtoAOD --run AthenaTrigRDOtoAOD --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
@@ -91,7 +141,8 @@
             </expectations> 
         </TEST> 
         
-        <TEST name="AthenaTrigRDOtoAOD_SLIM" type="script" suite="triganalysis_val"> 
+        <!--TEST name="AthenaTrigRDOtoAOD_SLIM" type="script" suite="triganalysis_val_AOD_SLIM"--> 
+        <TEST name="AthenaTrigRDOtoAOD_SLIM" type="script" suite="triganalysis_val_AOD"> 
             <options_atn>trigtest.pl --test AthenaTrigRDOtoAOD_SLIM --run AthenaTrigRDOtoAOD_SLIM --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
@@ -100,8 +151,10 @@
                 <returnValue>0</returnValue> 
             </expectations> 
         </TEST> 
-        
-        <TEST name="AthenaTrigRDO_TDT" type="script" suite="triganalysis_val"> 
+
+
+        <!--TEST name="AthenaTrigRDO_TDT" type="script" suite="triganalysis_val_TDT"-->
+        <TEST name="AthenaTrigRDO_TDT" type="script" suite="triganalysis_val_EA">  
             <options_atn>trigtest.pl --test AthenaTrigRDO_TDT --run AthenaTrigRDO_TDT --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
@@ -111,38 +164,30 @@
             </expectations> 
         </TEST> 
         
-        <!--TEST name="AthenaTrigAOD_TDT_fixedAOD" type="script" suite="triganalysis_val"> 
-         <options_atn>trigtest.pl - -test AthenaTrigAOD_TDT_fixedAOD - -run AthenaTrigAOD_TDT_fixedAOD - -conf TrigAnalysisTest.conf</options_atn> 
-         <timelimit>25</timelimit> 
-         <author>TrigAnalysis validation</author> 
-         <expectations> 
-         <errorMessage>FAILURE </errorMessage> 
-         <returnValue>0</returnValue> 
-         </expectations> 
-         </TEST--> 
+        <TEST name="AthenaTrigRDOtoAOD_MC" type="script" suite="triganalysis_val_MC_Slim"> 
+            <options_atn>trigtest.pl --test AthenaTrigRDOtoAOD_MC --run AthenaTrigRDOtoAOD_MC --conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
+            <author>TrigAnalysis validation</author> 
+            <expectations> 
+                <errorMessage>FAILURE </errorMessage> 
+                <returnValue>0</returnValue> 
+            </expectations> 
+        </TEST> 
         
-        <TEST name="AthenaTrigESD_HLTMonitoring" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigESD_HLTMonitoring --run AthenaTrigESD_HLTMonitoring --conf TrigAnalysisTest.conf</options_atn> 
+        <TEST name= "AthenaTrigAODtoAOD_TrigNavSlimming" type="script" suite="triganalysis_val_MC_Slim"> 
+            <options_atn>trigtest.pl --test AthenaTrigAODtoAOD_TrigNavSlimming --run AthenaTrigAODtoAOD_TrigNavSlimming --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
+            <mailto> tbold@mail.cern.ch</mailto> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
                 <returnValue>0</returnValue> 
             </expectations> 
         </TEST> 
         
-        <!--TEST name="AthenaTrigESD_HLTMonitoring_fixedESD" type="script" suite="triganalysis_val"> 
-         <options_atn>trigtest.pl - -test AthenaTrigESD_HLTMonitoring_fixedESD - -run AthenaTrigESD_HLTMonitoring_fixedESD - -conf TrigAnalysisTest.conf</options_atn> 
-         <timelimit>30</timelimit> 
-         <author>TrigAnalysis validation</author> 
-         <expectations> 
-         <errorMessage>FAILURE </errorMessage> 
-         <returnValue>0</returnValue> 
-         </expectations> 
-         </TEST--> 
         
-        <TEST name="AthenaTrigBStoESD" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigBStoESD --run AthenaTrigBStoESD --conf TrigAnalysisTest.conf</options_atn> 
+        <TEST name="AthenaTrigAOD_TrigEDMCheck" type="script" suite="triganalysis_val_MC_Slim"> 
+            <options_atn>trigtest.pl --test AthenaTrigAOD_TrigEDMCheck --run AthenaTrigAOD_TrigEDMCheck --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
@@ -151,28 +196,37 @@
             </expectations> 
         </TEST> 
         
-        <TEST name= "AthenaTrigAODtoAOD_TrigNavSlimming" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigAODtoAOD_TrigNavSlimming --run AthenaTrigAODtoAOD_TrigNavSlimming --conf TrigAnalysisTest.conf</options_atn> 
+        <TEST name="PhysValMonitoring" type="script" suite="triganalysis_val_MC_Slim"> 
+            <options_atn>trigtest.pl --test PhysValMonitoring --run PhysValMonitoring --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
-            <mailto> tbold@mail.cern.ch</mailto> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
                 <returnValue>0</returnValue> 
             </expectations> 
         </TEST> 
         
-        <TEST name= "AthenaTrigAOD_TrigSlimValidation" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl - -test AthenaTrigAOD_TrigSlimValidation - -run AthenaTrigAOD_TrigSlimValidation - -conf TrigAnalysisTest.conf</options_atn> 
+        <TEST name="AthenaTrigAOD_TrigDecTool" type="script" suite="triganalysis_val_MC_Slim"> 
+            <options_atn>trigtest.pl --test AthenaTrigAOD_TrigDecTool --run AthenaTrigAOD_TrigDecTool --conf TrigAnalysisTest.conf</options_atn> 
             <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
-            <mailto> Benjamin.Smith@cern.ch</mailto> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
                 <returnValue>0</returnValue> 
             </expectations> 
         </TEST> 
         
+        <!--TEST name= "AthenaTrigAOD_TrigSlimValidation" type="script" suite="triganalysis_val"> 
+         <options_atn>trigtest.pl - -test AthenaTrigAOD_TrigSlimValidation - -run AthenaTrigAOD_TrigSlimValidation - -conf TrigAnalysisTest.conf</options_atn> 
+         <timelimit>30</timelimit> 
+         <author>TrigAnalysis validation</author> 
+         <mailto> Benjamin.Smith@cern.ch</mailto> 
+         <expectations> 
+         <errorMessage>FAILURE </errorMessage> 
+         <returnValue>0</returnValue> 
+         </expectations> 
+         </TEST--> 
+        
         <!--TEST name= "AthenaTrigAOD_UnslimVal" type="script" suite="triganalysis_val"> 
          <options_atn>trigtest.pl - -test AthenaTrigAOD_UnslimVal - -run AthenaTrigAOD_UnslimVal - -conf TrigAnalysisTest.conf</options_atn> 
          <timelimit>30</timelimit> 
@@ -217,118 +271,97 @@
          </expectations> 
          </TEST--> 
         
-        <TEST name="AthenaTrigAOD_TrigEDMCheck" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigAOD_TrigEDMCheck --run AthenaTrigAOD_TrigEDMCheck --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>30</timelimit> 
-            <author>TrigAnalysis validation</author> 
-            <expectations> 
-                <errorMessage>FAILURE </errorMessage> 
-                <returnValue>0</returnValue> 
-            </expectations> 
-        </TEST> 
+        <!-- EDM backwards compatibility tests -->
         
-        <!--TEST name="AthenaTrigAOD_TrigEDMCheck_fixedAOD" type="script" suite="triganalysis_val"> 
-         <options_atn>trigtest.pl - -test AthenaTrigAOD_TrigEDMCheck_fixedAOD - -run AthenaTrigAOD_TrigEDMCheck_fixedAOD - -conf TrigAnalysisTest.conf</options_atn> 
-         <timelimit>30</timelimit> 
+        <!--TEST name= "BackCompAthenaTrigBStoESDAOD_2010" type="script" suite="triganalysis_val"> 
+         <options_atn>trigtest.pl - -test BackCompAthenaTrigBStoESDAOD_2010 - -run BackCompAthenaTrigBStoESDAOD_2010 - -conf TrigAnalysisTest.conf</options_atn> 
+         <timelimit>45</timelimit> 
          <author>TrigAnalysis validation</author> 
+         <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
          <expectations> 
          <errorMessage>FAILURE </errorMessage> 
          <returnValue>0</returnValue> 
          </expectations> 
          </TEST--> 
         
-        
-        <TEST name="AthenaTrigAOD_TrigDecTool" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigAOD_TrigDecTool --run AthenaTrigAOD_TrigDecTool --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>30</timelimit> 
+        <TEST name= "BackCompAthenaTrigBStoESDAOD" type="script" suite="triganalysis_val_BackComp"> 
+            <options_atn>trigtest.pl --test BackCompAthenaTrigBStoESDAOD --run BackCompAthenaTrigBStoESDAOD --conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>45</timelimit> 
             <author>TrigAnalysis validation</author> 
+            <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
                 <returnValue>0</returnValue> 
             </expectations> 
         </TEST> 
         
-        
-        <!--TEST name="AthenaTrigAOD_TrigDecTool_fixedAOD" type="script" suite="triganalysis_val"> 
-         <options_atn>trigtest.pl - -test AthenaTrigAOD_TrigDecTool_fixedAOD - -run AthenaTrigAOD_TrigDecTool_fixedAOD - -conf TrigAnalysisTest.conf</options_atn> 
+        <!--TEST name="BackCompAthenaTrigAOD_TrigDecTool" type="script" suite="triganalysis_val"> 
+         <options_atn>trigtest.pl - -test BackCompAthenaTrigAOD_TrigDecTool - -run BackCompAthenaTrigAOD_TrigDecTool - -conf TrigAnalysisTest.conf</options_atn> 
+         <timelimit>30</timelimit> 
+         <author>TrigAnalysis validation</author> 
+         <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
+         <expectations> 
+         <errorMessage>FAILURE </errorMessage> 
+         <returnValue>0</returnValue> 
+         </expectations> 
+         </TEST> 
+         
+         <TEST name="BackCompAthenaTrigAOD_TrigEDMCheck" type="script" suite="triganalysis_val"> 
+         <options_atn>trigtest.pl - -test BackCompAthenaTrigAOD_TrigEDMCheck - -run  BackCompAthenaTrigAOD_TrigEDMCheck - -conf TrigAnalysisTest.conf</options_atn> 
          <timelimit>30</timelimit> 
          <author>TrigAnalysis validation</author> 
+         <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
          <expectations> 
          <errorMessage>FAILURE </errorMessage> 
          <returnValue>0</returnValue> 
          </expectations> 
          </TEST--> 
         
-        <!-- EDM backwards compatibility tests -->
-        
-        <!--TEST name= "BackCompAthenaTrigBStoESDAOD_2010" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl - -test BackCompAthenaTrigBStoESDAOD_2010 - -run BackCompAthenaTrigBStoESDAOD_2010 - -conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>45</timelimit> 
-            <author>TrigAnalysis validation</author> 
-            <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
-            <expectations> 
-                <errorMessage>FAILURE </errorMessage> 
-                <returnValue>0</returnValue> 
-            </expectations> 
-        </TEST--> 
-        
-        <TEST name= "BackCompAthenaTrigBStoESDAOD" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test BackCompAthenaTrigBStoESDAOD --run BackCompAthenaTrigBStoESDAOD --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>45</timelimit> 
-            <author>TrigAnalysis validation</author> 
-            <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
-            <expectations> 
-                <errorMessage>FAILURE </errorMessage> 
-                <returnValue>0</returnValue> 
-            </expectations> 
-        </TEST> 
-        
-        <TEST name="BackCompAthenaTrigAOD_TrigDecTool" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test BackCompAthenaTrigAOD_TrigDecTool --run BackCompAthenaTrigAOD_TrigDecTool --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>30</timelimit> 
-            <author>TrigAnalysis validation</author> 
-            <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
-            <expectations> 
-                <errorMessage>FAILURE </errorMessage> 
-                <returnValue>0</returnValue> 
-            </expectations> 
-        </TEST> 
-        
-        <TEST name="BackCompAthenaTrigAOD_TrigEDMCheck" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test BackCompAthenaTrigAOD_TrigEDMCheck --run  BackCompAthenaTrigAOD_TrigEDMCheck --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>30</timelimit> 
-            <author>TrigAnalysis validation</author> 
-            <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
-            <expectations> 
-                <errorMessage>FAILURE </errorMessage> 
-                <returnValue>0</returnValue> 
-            </expectations> 
-        </TEST> 
-        
         <!-- Summary table -->
-        <TEST name="atn_timeline" type="script" suite="triganalysis_val">
+        <TEST name="atn_timeline" type="script" suite="triganalysis_index0">
             <doc>ATN timeline</doc>
             <options_atn>atn_timeline.py --atn -p TrigAnalysisTest </options_atn>
             <timelimit>2</timelimit>
             <author>Frank Winklmeier</author>
+            <!--prerequisite>triganalysis_val_RDOtoESDAOD</prerequisite>
+             <prerequisite>triganalysis_val_BS</prerequisite>
+             <prerequisite>triganalysis_val_BS_MC</prerequisite>
+             <prerequisite>triganalysis_val_MC_Slim</prerequisite>
+             <prerequisite>triganalysis_val_BackComp</prerequisite>
+             <prerequisite>triganalysis_val_Phys_EA</prerequisite>
+             <prerequisite>triganalysis_val_MC_EA</prerequisite>
+             <prerequisite>triganalysis_val_tag</prerequisite>
+             <prerequisite>triganalysis_val_AOD_Phys</prerequisite>
+             <prerequisite>triganalysis_val_AOD</prerequisite>
+             <prerequisite>triganalysis_val_AOD_SLIM</prerequisite>
+             <prerequisite>triganalysis_val_TDT</prerequisite-->
+            <prerequisite>triganalysis_val_RDOtoESDAOD</prerequisite>
+            <prerequisite>triganalysis_val_BS</prerequisite>
+            <prerequisite>triganalysis_val_BackComp</prerequisite>
+            <prerequisite>triganalysis_val_EA</prerequisite>            
+            <prerequisite>triganalysis_val_tag</prerequisite>
+            <prerequisite>triganalysis_val_AOD</prerequisite>
+            <prerequisite>triganalysis_val_MC_Slim</prerequisite>
             <expectations>
                 <returnValue>0</returnValue>
             </expectations>
         </TEST>
         
-        <TEST name="atn_xml_summary_table" type="script" suite="triganalysis_val">
+        <TEST name="atn_xml_summary_table" type="script" suite="triganalysis_index">
             <options_atn>atn_summary.pl </options_atn>
             <timelimit>2</timelimit>
             <author>TrigAnalysis validation</author>
+            <prerequisite>triganalysis_index0</prerequisite>
             <expectations>
                 <returnValue>0</returnValue>
             </expectations>
         </TEST>
         
-        <TEST name="sendmail2shifter" type="script" suite="triganalysis_val">
+        <TEST name="sendmail2shifter" type="script" suite="triganalysis_index">
             <options_atn>echo $ATN_PACKAGE | mail -s "TrigAnalysisTest ATN done" "czodrows@cern.ch" </options_atn>
             <timelimit>2</timelimit>
-            <author>TAPM validation</author>
+            <author>TrigAnalysis validation</author>
+            <prerequisite>triganalysis_index0</prerequisite>
             <expectations>
                 <returnValue>0</returnValue>
             </expectations>
@@ -356,7 +389,7 @@
                 <displayComponent>Trig-Common</displayComponent>
             </classification> 
             
-            <!--  athena.py -c"RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]" Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAOD.py -->
+            <!--  athena.py -c"RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]" Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAOD.py from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"] -->
             
             <jobTransform userJobId="LeakCheck_MC_pp_v5" >
                 <doc>
@@ -364,7 +397,7 @@
                 </doc>
                 <jobTransformJobName>LeakCheck_MC_pp_v5</jobTransformJobName>
                 <jobTransformCmd>
-                    export LD_PRELOAD=/afs/cern.ch/sw/lcg/external/libunwind/5c2cade/x86_64-slc6-gcc47-opt/lib/libunwind.so ; athena.py --stdcmalloc --leak-check-execute -c 'RunningRTT=TRUE;menu="MC_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoAOD.py
+                    export LD_PRELOAD=/afs/cern.ch/sw/lcg/external/libunwind/5c2cade/x86_64-slc6-gcc47-opt/lib/libunwind.so ; athena.py --stdcmalloc --leak-check-execute -c 'RunningRTT=TRUE;menu="MC_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoAOD.py
                 </jobTransformCmd>
                 <group>TrigAnalysisTestIOTests</group>
                 <queue>long</queue>
@@ -376,7 +409,7 @@
                 </doc>
                 <jobTransformJobName>LeakCheck_Physics_pp_v5</jobTransformJobName>
                 <jobTransformCmd>
-                    export LD_PRELOAD=/afs/cern.ch/sw/lcg/external/libunwind/5c2cade/x86_64-slc6-gcc47-opt/lib/libunwind.so ; athena.py --stdcmalloc --leak-check-execute -c 'RunningRTT=TRUE;menu="Physics_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoAOD.py
+                    export LD_PRELOAD=/afs/cern.ch/sw/lcg/external/libunwind/5c2cade/x86_64-slc6-gcc47-opt/lib/libunwind.so ; athena.py --stdcmalloc --leak-check-execute -c 'RunningRTT=TRUE;menu="Physics_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoAOD.py
                 </jobTransformCmd>
                 <group>TrigAnalysisTestIOTests</group>
                 <queue>long</queue>
@@ -388,29 +421,29 @@
                 </doc>
                 <jobTransformJobName>Valgrind_RDOtoAOD_MC_pp_v5</jobTransformJobName>
                 <jobTransformCmd>
-                    cp $ROOTSYS/etc/valgrind-root.supp ./ ; get_files newSuppressions.supp; get_files oracleDB.supp; get_files root.supp; get_files valgrindRTT.supp; get_files Gaudi.supp; get_files valgrind-python.supp ; valgrind --suppressions=valgrind-root.supp --track-origins=yes --trace-children=yes --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=root.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/pythonJobO.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/reflexPyROOT.supp --error-limit=no --leak-check=yes --num-callers=30 `which athena.py` --stdcmalloc -c 'RunningRTT=TRUE;menu="MC_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(5);jp.Rec.doDetailedPerfMon.set_Value_and_Lock( False ) ; jp.Rec.doSemiDetailedPerfMon.set_Value_and_Lock( False ); from PerfMonComps.PerfMonFlags import jobproperties ; jobproperties.PerfMonFlags.doMonitoring.set_Value_and_Lock( False ) ; jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoAOD.py 2&gt;&amp;1 | tee valgrind.log ;  sed -e '/    definitely lost: / { N; d; }' valgrind.log > Valgrind_test_log_1 ; cp /afs/cern.ch/user/c/czodrows/public/ValgrindAnalysisScript_TriggerTest.py ./ ; python ValgrindAnalysisScript_TriggerTest.py
+                    cp $ROOTSYS/etc/valgrind-root.supp ./ ; get_files newSuppressions.supp; get_files oracleDB.supp; get_files root.supp; get_files valgrindRTT.supp; get_files Gaudi.supp; get_files valgrind-python.supp ; valgrind --suppressions=valgrind-root.supp --track-origins=yes --trace-children=yes --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=root.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/pythonJobO.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/reflexPyROOT.supp --error-limit=no --leak-check=yes --num-callers=30 `which athena.py` --stdcmalloc -c 'RunningRTT=TRUE;menu="MC_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(3);jp.Rec.doDetailedPerfMon.set_Value_and_Lock( False ) ; jp.Rec.doSemiDetailedPerfMon.set_Value_and_Lock( False ); from PerfMonComps.PerfMonFlags import jobproperties ; jobproperties.PerfMonFlags.doMonitoring.set_Value_and_Lock( False ) ; jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoAOD.py 2&gt;&amp;1 |  sed -e '/    definitely lost: / { N; d; }'  | tee  Valgrind_test_log_1 ; cp /afs/cern.ch/user/c/czodrows/public/ValgrindAnalysisScript_TriggerTest.py ./ ; python ValgrindAnalysisScript_TriggerTest.py
                 </jobTransformCmd>
                 <group>TrigAnalysisTestIOTests</group>
                 <queue>long</queue>
                 <!--test position="10">
-                    <modulename>ValGrindPostScript_TrigAnalysisTest</modulename>
-                    <testname>ValGrindPostScript_TrigAnalysisTest</testname>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>sed -e '/    definitely lost: / { N; d; }' Valgrind_*_log > Valgrind_test_log_1 </argvalue>
-                    </arg>
-                    <noalarm />
-                </test>
-                <test position="11">
-                    <modulename>ValgrindAnalysisScript_TrigAnalysisTest</modulename>
-                    <testname>ValgrindAnalysisScript_TrigAnalysisTest</testname>
-                    <testdoc>Create a shortened Valgrind log file</testdoc>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>python ValgrindAnalysisScript_TrigAnalysisTest.py</argvalue>
-                    </arg>
-                    <noalarm />
-                </test-->
+                 <modulename>ValGrindPostScript_TrigAnalysisTest</modulename>
+                 <testname>ValGrindPostScript_TrigAnalysisTest</testname>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>sed -e '/    definitely lost: / { N; d; }' Valgrind_*_log > Valgrind_test_log_1 </argvalue>
+                 </arg>
+                 <noalarm />
+                 </test>
+                 <test position="11">
+                 <modulename>ValgrindAnalysisScript_TrigAnalysisTest</modulename>
+                 <testname>ValgrindAnalysisScript_TrigAnalysisTest</testname>
+                 <testdoc>Create a shortened Valgrind log file</testdoc>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>python ValgrindAnalysisScript_TrigAnalysisTest.py</argvalue>
+                 </arg>
+                 <noalarm />
+                 </test-->
                 <testToRemove>
                     <jobGroupName>RTT:Athena</jobGroupName>
                     <testidentifier>Athena_FileGrepper</testidentifier>
@@ -428,29 +461,29 @@
                 </doc>
                 <jobTransformJobName>Valgrind_RDOtoAOD_Physics_pp_v5</jobTransformJobName>
                 <jobTransformCmd>
-                    cp $ROOTSYS/etc/valgrind-root.supp ./ ; get_files newSuppressions.supp; get_files oracleDB.supp; get_files root.supp; get_files valgrindRTT.supp; get_files Gaudi.supp; get_files valgrind-python.supp ; valgrind --suppressions=valgrind-root.supp --track-origins=yes --trace-children=yes --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=root.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/pythonJobO.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/reflexPyROOT.supp --error-limit=no --leak-check=yes --num-callers=30 `which athena.py` --stdcmalloc -c 'RunningRTT=TRUE;menu="Physics_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(5);jp.Rec.doDetailedPerfMon.set_Value_and_Lock( False ) ; jp.Rec.doSemiDetailedPerfMon.set_Value_and_Lock( False ); from PerfMonComps.PerfMonFlags import jobproperties ; jobproperties.PerfMonFlags.doMonitoring.set_Value_and_Lock( False ) ; jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoAOD.py 2&gt;&amp;1 | tee valgrind.log ;  sed -e '/    definitely lost: / { N; d; }' valgrind.log > Valgrind_test_log_1 ; cp /afs/cern.ch/user/c/czodrows/public/ValgrindAnalysisScript_TriggerTest.py ./ ; python ValgrindAnalysisScript_TriggerTest.py
+                    cp $ROOTSYS/etc/valgrind-root.supp ./ ; get_files newSuppressions.supp; get_files oracleDB.supp; get_files root.supp; get_files valgrindRTT.supp; get_files Gaudi.supp; get_files valgrind-python.supp ; valgrind --suppressions=valgrind-root.supp --track-origins=yes --trace-children=yes --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=root.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/pythonJobO.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/reflexPyROOT.supp --error-limit=no --leak-check=yes --num-callers=30 `which athena.py` --stdcmalloc -c 'RunningRTT=TRUE;menu="Physics_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(3);jp.Rec.doDetailedPerfMon.set_Value_and_Lock( False ) ; jp.Rec.doSemiDetailedPerfMon.set_Value_and_Lock( False ); from PerfMonComps.PerfMonFlags import jobproperties ; jobproperties.PerfMonFlags.doMonitoring.set_Value_and_Lock( False ) ; jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoAOD.py 2&gt;&amp;1 |  sed -e '/    definitely lost: / { N; d; }'  | tee  Valgrind_test_log_1 ; cp /afs/cern.ch/user/c/czodrows/public/ValgrindAnalysisScript_TriggerTest.py ./ ; python ValgrindAnalysisScript_TriggerTest.py
                 </jobTransformCmd>
                 <group>TrigAnalysisTestIOTests</group>
                 <queue>long</queue>
                 <!--test position="10">
-                    <modulename>ValGrindPostScript_TrigAnalysisTest</modulename>
-                    <testname>ValGrindPostScript_TrigAnalysisTest</testname>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>sed -e '/    definitely lost: / { N; d; }' Valgrind_*_log > Valgrind_test_log_1 </argvalue>
-                    </arg>
-                    <noalarm />
-                </test>
-                <test position="11">
-                    <modulename>ValgrindAnalysisScript_TrigAnalysisTest</modulename>
-                    <testname>ValgrindAnalysisScript_TrigAnalysisTest</testname>
-                    <testdoc>Create a shortened Valgrind log file</testdoc>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>python ValgrindAnalysisScript_TrigAnalysisTest.py</argvalue>
-                    </arg>
-                    <noalarm />
-                </test-->
+                 <modulename>ValGrindPostScript_TrigAnalysisTest</modulename>
+                 <testname>ValGrindPostScript_TrigAnalysisTest</testname>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>sed -e '/    definitely lost: / { N; d; }' Valgrind_*_log > Valgrind_test_log_1 </argvalue>
+                 </arg>
+                 <noalarm />
+                 </test>
+                 <test position="11">
+                 <modulename>ValgrindAnalysisScript_TrigAnalysisTest</modulename>
+                 <testname>ValgrindAnalysisScript_TrigAnalysisTest</testname>
+                 <testdoc>Create a shortened Valgrind log file</testdoc>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>python ValgrindAnalysisScript_TrigAnalysisTest.py</argvalue>
+                 </arg>
+                 <noalarm />
+                 </test-->
                 <testToRemove>
                     <jobGroupName>RTT:Athena</jobGroupName>
                     <testidentifier>Athena_FileGrepper</testidentifier>
@@ -471,29 +504,29 @@
                 </doc>
                 <jobTransformJobName>Valgrind_RDOtoESDAOD_MC_pp_v5</jobTransformJobName>
                 <jobTransformCmd>
-                    cp $ROOTSYS/etc/valgrind-root.supp ./ ; get_files newSuppressions.supp; get_files oracleDB.supp; get_files root.supp; get_files valgrindRTT.supp; get_files Gaudi.supp; get_files valgrind-python.supp ; valgrind --suppressions=valgrind-root.supp --track-origins=yes --trace-children=yes --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=root.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/pythonJobO.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/reflexPyROOT.supp --error-limit=no --leak-check=yes --num-callers=30 `which athena.py` --stdcmalloc -c 'RunningRTT=TRUE;menu="MC_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(5);jp.Rec.doDetailedPerfMon.set_Value_and_Lock( False ) ; jp.Rec.doSemiDetailedPerfMon.set_Value_and_Lock( False ); from PerfMonComps.PerfMonFlags import jobproperties ; jobproperties.PerfMonFlags.doMonitoring.set_Value_and_Lock( False ) ; jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py 2&gt;&amp;1 | tee valgrind.log ;  sed -e '/    definitely lost: / { N; d; }' valgrind.log > Valgrind_test_log_1 ; cp /afs/cern.ch/user/c/czodrows/public/ValgrindAnalysisScript_TriggerTest.py ./ ; python ValgrindAnalysisScript_TriggerTest.py
+                    cp $ROOTSYS/etc/valgrind-root.supp ./ ; get_files newSuppressions.supp; get_files oracleDB.supp; get_files root.supp; get_files valgrindRTT.supp; get_files Gaudi.supp; get_files valgrind-python.supp ; valgrind --suppressions=valgrind-root.supp --track-origins=yes --trace-children=yes --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=root.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/pythonJobO.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/reflexPyROOT.supp --error-limit=no --leak-check=yes --num-callers=30 `which athena.py` --stdcmalloc -c 'RunningRTT=TRUE;menu="MC_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(3);jp.Rec.doDetailedPerfMon.set_Value_and_Lock( False ) ; jp.Rec.doSemiDetailedPerfMon.set_Value_and_Lock( False ); from PerfMonComps.PerfMonFlags import jobproperties ; jobproperties.PerfMonFlags.doMonitoring.set_Value_and_Lock( False ) ; jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py 2&gt;&amp;1 |  sed -e '/    definitely lost: / { N; d; }'  | tee  Valgrind_test_log_1 ; cp /afs/cern.ch/user/c/czodrows/public/ValgrindAnalysisScript_TriggerTest.py ./ ; python ValgrindAnalysisScript_TriggerTest.py
                 </jobTransformCmd>
                 <group>TrigAnalysisTestIOTests</group>
                 <queue>long</queue>
                 <!--test position="10">
-                    <modulename>ValGrindPostScript_TrigAnalysisTest</modulename>
-                    <testname>ValGrindPostScript_TrigAnalysisTest</testname>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>sed -e '/    definitely lost: / { N; d; }' Valgrind_*_log > Valgrind_test_log_1 </argvalue>
-                    </arg>
-                    <noalarm />
-                </test>
-                <test position="11">
-                    <modulename>ValgrindAnalysisScript_TrigAnalysisTest</modulename>
-                    <testname>ValgrindAnalysisScript_TrigAnalysisTest</testname>
-                    <testdoc>Create a shortened Valgrind log file</testdoc>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>python ValgrindAnalysisScript_TrigAnalysisTest.py</argvalue>
-                    </arg>
-                    <noalarm />
-                </test-->
+                 <modulename>ValGrindPostScript_TrigAnalysisTest</modulename>
+                 <testname>ValGrindPostScript_TrigAnalysisTest</testname>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>sed -e '/    definitely lost: / { N; d; }' Valgrind_*_log > Valgrind_test_log_1 </argvalue>
+                 </arg>
+                 <noalarm />
+                 </test>
+                 <test position="11">
+                 <modulename>ValgrindAnalysisScript_TrigAnalysisTest</modulename>
+                 <testname>ValgrindAnalysisScript_TrigAnalysisTest</testname>
+                 <testdoc>Create a shortened Valgrind log file</testdoc>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>python ValgrindAnalysisScript_TrigAnalysisTest.py</argvalue>
+                 </arg>
+                 <noalarm />
+                 </test-->
                 <testToRemove>
                     <jobGroupName>RTT:Athena</jobGroupName>
                     <testidentifier>Athena_FileGrepper</testidentifier>
@@ -511,29 +544,29 @@
                 </doc>
                 <jobTransformJobName>Valgrind_RDOtoESDAOD_Physics_pp_v5</jobTransformJobName>
                 <jobTransformCmd>
-                    cp $ROOTSYS/etc/valgrind-root.supp ./ ; get_files newSuppressions.supp; get_files oracleDB.supp; get_files root.supp; get_files valgrindRTT.supp; get_files Gaudi.supp; get_files valgrind-python.supp ; valgrind --suppressions=valgrind-root.supp --track-origins=yes --trace-children=yes --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=root.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/pythonJobO.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/reflexPyROOT.supp --error-limit=no --leak-check=yes --num-callers=30 `which athena.py` --stdcmalloc -c 'RunningRTT=TRUE;menu="Physics_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(5);jp.Rec.doDetailedPerfMon.set_Value_and_Lock( False ) ; jp.Rec.doSemiDetailedPerfMon.set_Value_and_Lock( False ); from PerfMonComps.PerfMonFlags import jobproperties ; jobproperties.PerfMonFlags.doMonitoring.set_Value_and_Lock( False ) ; jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py 2&gt;&amp;1 | tee valgrind.log ;  sed -e '/    definitely lost: / { N; d; }' valgrind.log > Valgrind_test_log_1 ; cp /afs/cern.ch/user/c/czodrows/public/ValgrindAnalysisScript_TriggerTest.py ./ ; python ValgrindAnalysisScript_TriggerTest.py
+                    cp $ROOTSYS/etc/valgrind-root.supp ./ ; get_files newSuppressions.supp; get_files oracleDB.supp; get_files root.supp; get_files valgrindRTT.supp; get_files Gaudi.supp; get_files valgrind-python.supp ; valgrind --suppressions=valgrind-root.supp --track-origins=yes --trace-children=yes --suppressions=newSuppressions.supp --suppressions=oracleDB.supp --suppressions=root.supp --suppressions=valgrindRTT.supp --suppressions=Gaudi.supp --suppressions=valgrind-python.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/pythonJobO.supp --suppressions=/afs/cern.ch/user/k/krasznaa/public/valgrind/reflexPyROOT.supp --error-limit=no --leak-check=yes --num-callers=30 `which athena.py` --stdcmalloc -c 'RunningRTT=TRUE;menu="Physics_pp_v5";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(3);jp.Rec.doDetailedPerfMon.set_Value_and_Lock( False ) ; jp.Rec.doSemiDetailedPerfMon.set_Value_and_Lock( False ); from PerfMonComps.PerfMonFlags import jobproperties ; jobproperties.PerfMonFlags.doMonitoring.set_Value_and_Lock( False ) ; jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName="/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00";fileRange=[1,4]' TrigAnalysisTest/testAthenaTrigRDOtoESDAOD.py 2&gt;&amp;1 |  sed -e '/    definitely lost: / { N; d; }'  | tee  Valgrind_test_log_1 ; cp /afs/cern.ch/user/c/czodrows/public/ValgrindAnalysisScript_TriggerTest.py ./ ; python ValgrindAnalysisScript_TriggerTest.py
                 </jobTransformCmd>
                 <group>TrigAnalysisTestIOTests</group>
                 <queue>long</queue>
                 <!--test position="10">
-                    <modulename>ValGrindPostScript_TrigAnalysisTest</modulename>
-                    <testname>ValGrindPostScript_TrigAnalysisTest</testname>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>sed -e '/    definitely lost: / { N; d; }' Valgrind_*_log > Valgrind_test_log_1 </argvalue>
-                    </arg>
-                    <noalarm />
-                </test>
-                <test position="11">
-                    <modulename>ValgrindAnalysisScript_TrigAnalysisTest</modulename>
-                    <testname>ValgrindAnalysisScript_TrigAnalysisTest</testname>
-                    <testdoc>Create a shortened Valgrind log file</testdoc>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>python ValgrindAnalysisScript_TrigAnalysisTest.py</argvalue>
-                    </arg>
-                    <noalarm />
-                </test--> 
+                 <modulename>ValGrindPostScript_TrigAnalysisTest</modulename>
+                 <testname>ValGrindPostScript_TrigAnalysisTest</testname>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>sed -e '/    definitely lost: / { N; d; }' Valgrind_*_log > Valgrind_test_log_1 </argvalue>
+                 </arg>
+                 <noalarm />
+                 </test>
+                 <test position="11">
+                 <modulename>ValgrindAnalysisScript_TrigAnalysisTest</modulename>
+                 <testname>ValgrindAnalysisScript_TrigAnalysisTest</testname>
+                 <testdoc>Create a shortened Valgrind log file</testdoc>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>python ValgrindAnalysisScript_TrigAnalysisTest.py</argvalue>
+                 </arg>
+                 <noalarm />
+                 </test--> 
                 <testToRemove>
                     <jobGroupName>RTT:Athena</jobGroupName>
                     <testidentifier>Athena_FileGrepper</testidentifier>
@@ -552,7 +585,7 @@
                 </doc>
                 <displayName>RDOtoAOD_Physics</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -567,7 +600,7 @@
                 </doc>
                 <displayName>RDOtoAOD_MC</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='MC_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='MC_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -582,7 +615,7 @@
                 </doc>
                 <displayName>RDOtoESDAOD_MC</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='MC_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='MC_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
@@ -596,7 +629,7 @@
                 </doc>
                 <displayName>RDOtoESDAOD_Physics</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
@@ -609,98 +642,132 @@
             <chain>
                 <chainName>Validation_Trig_and_Reco_Split_chain</chainName>
                 <abortOnError />
+                
                 <sequential>
                     <parallel>
                         
-                         <sequential>
-                        <chainElement>
-                            <jobTransform userJobId="Split" >
-                                <doc>
-                                    Reco_tf.py split activated
-                                </doc>
-                                <jobTransformJobName>Split</jobTransformJobName>
-                                <jobTransformCmd>
-                                    Reco_tf.py --inputRDOFile /afs/cern.ch/work/g/graemes/ddm/pmb/RDO.01177879._000004.pool.root.2 --outputRDO_TRIGFile tmp.RDO_TRIG --outputESDFile Split.ESD.pool.root --outputAODFile Split.AOD.pool.root --maxEvents 10 --autoConfiguration everything --preExec "TriggerFlags.enableMonitoring = ['Online']" --steering RAWtoESD:in-RDO RAWtoESD:in-BS RAWtoESD:in+RDO_TRIG
-                                </jobTransformCmd>
-                                <group>TrigAnalysisTestIOTests</group>
-                                <queue>long</queue>
-                                <alwaysRunPostProc />
-                            </jobTransform>
-                            <chainfileout>Split.AOD.pool.root</chainfileout>
-                        </chainElement>
-                        
-                        
-                        <!--chainElement>
-                                <athena userJobId="Split_TDT">
-                                    <doc> AthenaTrigAOD_TrigDecTool on Split AOD </doc>
-                                    <displayName>Split_TDT</displayName>
-                                    <commandLineFlags>RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=["Split.AOD.pool.root"]</commandLineFlags>
-                                    <options>testAthenaTrigAOD_TrigDecTool.py</options>
-                                    <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
+                        <sequential>
+                            
+                            <chainElement>
+                                <jobTransform userJobId="Split" >
+                                    <doc>
+                                        Reco_tf.py split activated
+                                    </doc>
+                                    <jobTransformJobName>Split</jobTransformJobName>
+                                    <jobTransformCmd>
+                                        Reco_tf.py --athenaopts=--stdcmalloc --inputRDOFile /afs/cern.ch/work/g/graemes/ddm/pmb/RDO.01177879._000004.pool.root.2 --outputRDO_TRIGFile tmp.RDO_TRIG --outputAODFile Split.AOD.pool.root --maxEvents 500 --autoConfiguration everything --preExec "TriggerFlags.enableMonitoring = ['Online']" --steering RAWtoESD:in-RDO RAWtoESD:in-BS RAWtoESD:in+RDO_TRIG --conditionsTag="OFLCOND-RUN12-SDR-22" ; rm -f tmp.* ; for i in ntuple*.gz; do perfmon.py -f 0.90 $i ; done
+                                    </jobTransformCmd>
                                     <group>TrigAnalysisTestIOTests</group>
-                                    <queue>long</queue> 
-                                    <chaindataset_info>
-                                        <dc2/>
-                                        <chaindatasetName>Split.AOD.pool.root</chaindatasetName>
-                                        <dataset_info>
-                                            <dc2 />
-                                            <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_AOD.pool.root</datasetName>
-                                        </dataset_info>
-                                    </chaindataset_info>
-                                </athena>
-                            <chainfileout>Split.xml</chainfileout>
-                        </chainElement-->
-                        
+                                    <queue>long</queue>
+                                    <testToRemove>
+                                        <jobGroupName>TrigAnalysisTestIOTests</jobGroupName>
+                                        <testidentifier>PerfMonRunner</testidentifier>
+                                    </testToRemove>
+                                    <alwaysRunPostProc />
+                                </jobTransform>
+                                <chainfileout>Split.AOD.pool.root</chainfileout>
+                            </chainElement>
+                            
+                            
+                            <!--chainElement>
+                             <athena userJobId="Split_TDT">
+                             <doc> AthenaTrigAOD_TrigDecTool on Split AOD </doc>
+                             <displayName>Split_TDT</displayName>
+                             <commandLineFlags>RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=["Split.AOD.pool.root"]</commandLineFlags>
+                             <options>testAthenaTrigAOD_TrigDecTool.py</options>
+                             <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
+                             <group>TrigAnalysisTestIOTests</group>
+                             <queue>long</queue> 
+                             <chaindataset_info>
+                             <dc2/>
+                             <chaindatasetName>Split.AOD.pool.root</chaindatasetName>
+                             <dataset_info>
+                             <dc2 />
+                             <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_AOD.pool.root</datasetName>
+                             </dataset_info>
+                             </chaindataset_info>
+                             </athena>
+                             <chainfileout>Split.xml</chainfileout>
+                             </chainElement-->
+                            
+                            
+                            
+                        </sequential>
                         
                         
-                         </sequential>
+                        <!--sequential>
+                         <chainElement>
+                         <jobTransform userJobId="Split_compare" >
+                         <doc>
+                         Reco_tf.py comp split vs nonsplit
+                         </doc>
+                         <jobTransformJobName>Split</jobTransformJobName>
+                         <jobTransformCmd>
+                         Reco_tf.py - -inputRDOFile /afs/cern.ch/work/g/graemes/ddm/pmb/RDO.01177879._000004.pool.root.2 - -outputRDO_TRIGFile tmp.RDO_TRIG - -outputAODFile Split.AOD.pool.root - -maxEvents 250 - -autoConfiguration everything - -preExec "TriggerFlags.enableMonitoring = ['Online']" - -steering RAWtoESD:in-RDO RAWtoESD:in-BS RAWtoESD:in+RDO_TRIG - -conditionsTag="OFLCOND-RUN12-SDR-22" ; rm -f tmp.* ; Reco_tf.py - -inputRDOFile /afs/cern.ch/work/g/graemes/ddm/pmb/RDO.01177879._000004.pool.root.2 - -outputAODFile noSplit.AOD.pool.root - -maxEvents 250 - -autoConfiguration everything - -preExec "TriggerFlags.enableMonitoring = ['Online']" - -conditionsTag="OFLCOND-RUN12-SDR-22" ; rm -f tmp.* ; cp /afs/cern.ch/user/c/czodrows/public/testTDT.py ./ ; athena.py -c'fileList=["Split.AOD.pool.root"]' testTDT.py ; mv trigger_counts.xml Split.xml ; athena.py -c'fileList=["noSplit.AOD.pool.root"]' testTDT.py ; mv trigger_counts.xml noSplit.xml ; python /afs/cern.ch/user/c/czodrows/public/rogercounts/counts/countable.py -f html -o splitcheck.html Split.xml noSplit.xml ; python /afs/cern.ch/user/c/czodrows/public/rogercounts/counts/countable.py -f text -o splitcheck.txt Split.xml noSplit.xml
+                         </jobTransformCmd>
+                         <group>TrigAnalysisTestIOTests</group>
+                         <queue>long</queue>
+                         <testToRemove>
+                         <jobGroupName>TriggerTestMonitorHistos</jobGroupName>
+                         <testidentifier>PerfMonRunner</testidentifier>
+                         </testToRemove>
+                         <alwaysRunPostProc />
+                         </jobTransform>
                          
-                          <sequential>
-                        <chainElement>
-                            <jobTransform userJobId="noSplit" >
-                                <doc>
-                                    Reco_tf.py noSplit 
-                                </doc>
-                                <jobTransformJobName>noSplit</jobTransformJobName>
-                                <jobTransformCmd>
-                                    Reco_tf.py --inputRDOFile /afs/cern.ch/work/g/graemes/ddm/pmb/RDO.01177879._000004.pool.root.2 --outputRDO_TRIGFile tmp.RDO_TRIG --outputESDFile noSplit.ESD.pool.root --outputAODFile noSplit.AOD.pool.root --maxEvents 10 --autoConfiguration everything --preExec "TriggerFlags.enableMonitoring = ['Online']"
-                                </jobTransformCmd>
-                                <group>TrigAnalysisTestIOTests</group>
-                                <queue>long</queue>
-                                <alwaysRunPostProc />
-                            </jobTransform>
-                            <chainfileout>noSplit.AOD.pool.root</chainfileout>
-                        </chainElement>
-                        
+                         </chainElement> 
+                         </sequential-->
                         
-                        <!--chainElement>
-                            <athena userJobId="noSplit_TDT">
-                                <doc> AthenaTrigAOD_TrigDecTool on Split AOD </doc>
-                                <displayName>Split_TDT</displayName>
-                                <commandLineFlags>RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=["Split.AOD.pool.root"]</commandLineFlags>
-                                <options>testAthenaTrigAOD_TrigDecTool.py</options>
-                                <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
-                                <group>TrigAnalysisTestIOTests</group>
-                                <queue>long</queue> 
-                                <chaindataset_info>
-                                    <dc2/>
-                                    <chaindatasetName>Split.AOD.pool.root</chaindatasetName>
-                                    <dataset_info>
-                                        <dc2 />
-                                        <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_AOD.pool.root</datasetName>
-                                    </dataset_info>
-                                </chaindataset_info>
-                                <testToRemove>
-                                    <jobGroupName>RTT:Top</jobGroupName>
-                                    <testidentifier>CheckFileRunner0</testidentifier>
-                                </testToRemove>
-                            </athena>
-                            <chainfileout>noSplit.xml</chainfileout>
-                        </chainElemen-->
-                        
-                        
-                        
-                         </sequential>
+                        <sequential>
+                            
+                            <chainElement>
+                                <jobTransform userJobId="noSplit" >
+                                    <doc>
+                                        Reco_tf.py noSplit 
+                                    </doc>
+                                    <jobTransformJobName>noSplit</jobTransformJobName>
+                                    <jobTransformCmd>
+                                        Reco_tf.py --inputRDOFile /afs/cern.ch/work/g/graemes/ddm/pmb/RDO.01177879._000004.pool.root.2 --outputAODFile noSplit.AOD.pool.root --maxEvents 500 --autoConfiguration everything --preExec "TriggerFlags.enableMonitoring = ['Online']" --conditionsTag="OFLCOND-RUN12-SDR-22" ; rm -f tmp.* ; for i in ntuple*.gz; do perfmon.py -f 0.90 $i ; done
+                                    </jobTransformCmd>
+                                    <group>TrigAnalysisTestIOTests</group>
+                                    <queue>long</queue>
+                                    <testToRemove>
+                                        <jobGroupName>TrigAnalysisTestIOTests</jobGroupName>
+                                        <testidentifier>PerfMonRunner</testidentifier>
+                                    </testToRemove>
+                                    <alwaysRunPostProc />
+                                </jobTransform>
+                                <chainfileout>noSplit.AOD.pool.root</chainfileout>
+                            </chainElement>
+                            
+                            
+                            <!--chainElement>
+                             <athena userJobId="noSplit_TDT">
+                             <doc> AthenaTrigAOD_TrigDecTool on Split AOD </doc>
+                             <displayName>Split_TDT</displayName>
+                             <commandLineFlags>RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=["Split.AOD.pool.root"]</commandLineFlags>
+                             <options>testAthenaTrigAOD_TrigDecTool.py</options>
+                             <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
+                             <group>TrigAnalysisTestIOTests</group>
+                             <queue>long</queue> 
+                             <chaindataset_info>
+                             <dc2/>
+                             <chaindatasetName>Split.AOD.pool.root</chaindatasetName>
+                             <dataset_info>
+                             <dc2 />
+                             <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_AOD.pool.root</datasetName>
+                             </dataset_info>
+                             </chaindataset_info>
+                             <testToRemove>
+                             <jobGroupName>RTT:Top</jobGroupName>
+                             <testidentifier>CheckFileRunner0</testidentifier>
+                             </testToRemove>
+                             </athena>
+                             <chainfileout>noSplit.xml</chainfileout>
+                             </chainElemen-->
+                            
+                            
+                            
+                        </sequential>
                     </parallel>
                     
                     
@@ -708,65 +775,65 @@
                     
                     
                     <!--chainElement>
-                        <jobTransform userJobId="compare_Split_and_noSplit" >
-                            <doc>
-                               compare_Split_and_noSplit
-                            </doc>
-                            <jobTransformJobName>compare_Split_and_noSplit</jobTransformJobName>
-                            <jobTransformCmd>
-                                mv trigger_counts.xml 
-                            </jobTransformCmd>
-                            <group>TrigAnalysisTestIOTests</group>
-                            <queue>long</queue> 
-                            <chaindataset_info>
-                                <dc2/>
-                                <chaindatasetName>noSplit.xml</chaindatasetName>
-                                <dataset_info>
-                                    <dc2 />
-                                    <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_noSplit.xml</datasetName>
-                                </dataset_info>
-                            </chaindataset_info>
-                            <chaindataset_info>
-                                <dc2/>
-                                <chaindatasetName>Split.xml</chaindatasetName>
-                                <dataset_info>
-                                    <dc2 />
-                                    <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_Split.xml</datasetName>
-                                </dataset_info>
-                            </chaindataset_info>
-                            <testToRemove>
-                                <jobGroupName>RTT:Top</jobGroupName>
-                                <testidentifier>CheckFileRunner0</testidentifier>
-                            </testToRemove>
-
-                        </jobTransform>
-                    </chainElement-->
+                     <jobTransform userJobId="compare_Split_and_noSplit" >
+                     <doc>
+                     compare_Split_and_noSplit
+                     </doc>
+                     <jobTransformJobName>compare_Split_and_noSplit</jobTransformJobName>
+                     <jobTransformCmd>
+                     mv trigger_counts.xml 
+                     </jobTransformCmd>
+                     <group>TrigAnalysisTestIOTests</group>
+                     <queue>long</queue> 
+                     <chaindataset_info>
+                     <dc2/>
+                     <chaindatasetName>noSplit.xml</chaindatasetName>
+                     <dataset_info>
+                     <dc2 />
+                     <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_noSplit.xml</datasetName>
+                     </dataset_info>
+                     </chaindataset_info>
+                     <chaindataset_info>
+                     <dc2/>
+                     <chaindatasetName>Split.xml</chaindatasetName>
+                     <dataset_info>
+                     <dc2 />
+                     <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_Split.xml</datasetName>
+                     </dataset_info>
+                     </chaindataset_info>
+                     <testToRemove>
+                     <jobGroupName>RTT:Top</jobGroupName>
+                     <testidentifier>CheckFileRunner0</testidentifier>
+                     </testToRemove>
+                     
+                     </jobTransform>
+                     </chainElement-->
                     
                     
                     <!--chainElement>
-                        <athena userJobId="AOD_TrigDecTool_MC_pp_v5">
-                            <doc> AthenaTrigAOD_TrigDecTool on Menu: MC_pp_v5 Sample: top AOD from RDO</doc>
-                            <displayName>AthenaTrigAOD_TrigDecTool_MC_pp_v5</displayName>
-                            <commandLineFlags>RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=["AOD.pool.root"]</commandLineFlags>
-                            <options>testAthenaTrigAOD_TrigDecTool.py</options>
-                            <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
-                            <group>TrigAnalysisTestIOTests</group>
-                            <queue>long</queue> 
-                            <chaindataset_info>
-                                <dc2/>
-                                <chaindatasetName>AOD.pool.root</chaindatasetName>
-                                <dataset_info>
-                                    <dc2 />
-                                    <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_AOD.pool.root</datasetName>
-                                </dataset_info>
-                            </chaindataset_info>
-                            <testToRemove>
-                                <jobGroupName>RTT:Top</jobGroupName>
-                                <testidentifier>CheckFileRunner0</testidentifier>
-                            </testToRemove>
-                        </athena>
-                          </chainElement-->
-                        
+                     <athena userJobId="AOD_TrigDecTool_MC_pp_v5">
+                     <doc> AthenaTrigAOD_TrigDecTool on Menu: MC_pp_v5 Sample: top AOD from RDO</doc>
+                     <displayName>AthenaTrigAOD_TrigDecTool_MC_pp_v5</displayName>
+                     <commandLineFlags>RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=["AOD.pool.root"]</commandLineFlags>
+                     <options>testAthenaTrigAOD_TrigDecTool.py</options>
+                     <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
+                     <group>TrigAnalysisTestIOTests</group>
+                     <queue>long</queue> 
+                     <chaindataset_info>
+                     <dc2/>
+                     <chaindatasetName>AOD.pool.root</chaindatasetName>
+                     <dataset_info>
+                     <dc2 />
+                     <datasetName>/afs/cern.ch/atlas/project/RTT/prod/Results/rtt/chainstore/devval/x86_64-slc6-gcc47-opt/AtlasProduction/Trigger/TrigValidation/TrigAnalysisTest/AthenaTrigAOD_TrigEDMandTDTCheck_chain/file_link_broken_on_purpose_to_spot_RTT_errors_AOD.pool.root</datasetName>
+                     </dataset_info>
+                     </chaindataset_info>
+                     <testToRemove>
+                     <jobGroupName>RTT:Top</jobGroupName>
+                     <testidentifier>CheckFileRunner0</testidentifier>
+                     </testToRemove>
+                     </athena>
+                     </chainElement-->
+                    
                     
                     
                 </sequential>
@@ -855,7 +922,7 @@
                             <doc> Menu: MC_pp_v5 Sample: top - produces AOD 100 events</doc>
                             <displayName>RDOtoAOD_MC_pp_v5</displayName>
                             <commandLineFlags>
-                                RunningRTT=TRUE;menu='MC_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                                RunningRTT=TRUE;menu='MC_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                             </commandLineFlags>
                             <options>testAthenaTrigRDOtoAOD.py</options>
                             <group>TrigAnalysisTestIOTests</group>
@@ -887,6 +954,10 @@
                                     <jobGroupName>RTT:Top</jobGroupName>
                                     <testidentifier>CheckFileRunner0</testidentifier>
                                 </testToRemove>
+                                <testToRemove>
+                                    <jobGroupName>TrigAnalysisTestIOTests</jobGroupName>
+                                    <testidentifier>chainDump</testidentifier>
+                                </testToRemove>
                             </athena>
                         </chainElement>
                         
@@ -911,6 +982,10 @@
                                     <jobGroupName>RTT:Top</jobGroupName>
                                     <testidentifier>CheckFileRunner0</testidentifier>
                                 </testToRemove>
+                                <testToRemove>
+                                    <jobGroupName>TrigAnalysisTestIOTests</jobGroupName>
+                                    <testidentifier>chainDump</testidentifier>
+                                </testToRemove>
                             </athena>
                         </chainElement>
                     </parallel>
@@ -924,7 +999,7 @@
                 </doc>
                 <displayName>RDOtoAOD_MC_pp_v5_loose_mc_prescale</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='MC_pp_v5_loose_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='MC_pp_v5_loose_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -939,7 +1014,7 @@
                 </doc>
                 <displayName>RDOtoAOD_MC_pp_v5_tight_mc_prescale</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='MC_pp_v5_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='MC_pp_v5_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -955,7 +1030,7 @@
                 </doc>
                 <displayName>RDOtoAOD_MC_pp_v5_1000</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='MC_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(1000);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='MC_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(1000);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -986,7 +1061,7 @@
                 </doc>
                 <displayName>RDOtoAODSLIM_MC_pp_v5_tight_mc_prescale</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='MC_pp_v5_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='MC_pp_v5_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAODSLIM.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -1001,7 +1076,7 @@
                 </doc>
                 <displayName>RDOtoESDAOD_MC_pp_v5_loose_mc_prescale</displayName>
                 <commandLineFlags> 
-                    RunningRTT=TRUE;menu='MC_pp_v5_loose_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='MC_pp_v5_loose_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
@@ -1016,7 +1091,7 @@
                 </doc>
                 <displayName>RDOtoESDAOD_MC_pp_v5_tight_mc_prescale</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='MC_pp_v5_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2081_r6070_tid04782081_00';fileRange=[1,4]
+                    RunningRTT=TRUE;menu='MC_pp_v5_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00';fileRange=[1,4]
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
@@ -1056,6 +1131,8 @@
                 <keepFilePattern info="PerfMon Hephaestus file">*.heph.log</keepFilePattern>
                 <keepFilePattern info="PerfMon xml">*.xml</keepFilePattern>
                 <keepFilePattern info="PDF files">*.pdf</keepFilePattern>
+                <keepFilePattern info="HTML files">*.html</keepFilePattern>
+                <keepFilePattern info="Tex files">*.tex</keepFilePattern>
                 <keepFilePattern info="POOL files">*.pool.root</keepFilePattern>
                 <keepFilePattern info="GIF files">*.gif</keepFilePattern>
                 <keepFilePattern info="ROOT files">*.root</keepFilePattern>
@@ -1071,6 +1148,7 @@
                 <test position="1">
                     <modulename>chainDump</modulename>
                     <testname>chainDump</testname>
+                    <testidentifier>chainDump</testidentifier>
                     <arg>
                         <argname>rootFile</argname>
                         <argvalue>expert-monitoring.root</argvalue>
@@ -1103,6 +1181,7 @@
                 <test position="4">
                     <modulename>RttLibraryTools</modulename>
                     <testname>PerfMonRunner</testname>
+                    <testidentifier>PerfMonRunner</testidentifier>
                     <arg>
                         <argname>fileName</argname>
                         <argvalue>ntuple.pmon.gz</argvalue>
-- 
GitLab