From 295f902bf3c708b2dc6d2a0b67f4aaa07fc4d487 Mon Sep 17 00:00:00 2001
From: Patrick Karl Czodrowski <patrick.czodrowski@cern.ch>
Date: Wed, 7 Jan 2015 16:30:16 +0100
Subject: [PATCH] remove ATLAS_R2_ready_or_not test in ATN and RTT and add
 trigEDM and trigTDT checks for Physics and MC menus - remove the DC14
 (TrigAnalysisTest-00-03-76)

    * add trigEDM and trigTDT checks
    * TrigAnalysisTest-00-03-xy

2015-01-07 Patrick Czodrowski <czodrows@cern.ch>
    * fix RTT RDOtoAOD_LS1 setup - one missing quote
    * remove ATLAS_R2_ready_or_not test in ATN and RTT
    * add trigEDM and trigTDT checks for Physics and MC menus - remove the DC14
    * TrigAnalysisTest-00-03-76

2014-11-30 Patrick Czodrowski <czodrows@cern.ch>
    * add RTT AODSLIM production
    * fix RTT menu name typo
    * TrigAnalysisTest-00-03-75

2014-11-30 Patrick Czodrowski <czodrows@cern.ch>
    * restart the Slim val suite
    * TrigAnalysisTest-00-03-74

2014-11-25 Patrick Czodrowski <czodrows@cern.ch>
    * switch BackCompAthenaTrigBStoESDAOD -> 2012 data file
...
(Long ChangeLog diff - truncated)
---
 .../Testing/TrigAnalysisTest.conf             | 225 ++++++++---
 .../bin/checkFileTrigSize_RTT.py              |  33 +-
 .../TrigAnalysisTest/cmt/requirements         |   3 +-
 .../share/testAthenaTrigAOD_TrigDecTool.py    |   5 +-
 .../share/testAthenaTrigAOD_TrigEDMCheck.py   |   1 -
 ...testAthenaTrigAOD_TrigEDMCheck_fixedAOD.py |   1 -
 .../testAthenaTrigAODtoAOD_TrigNavSlimming.py |  53 +--
 .../share/testAthenaTrigBStoESD.py            |  32 +-
 .../share/testAthenaTrigESD_HLTMonitoring.py  |  65 ++-
 .../share/testAthenaTrigRDO_TDT.py            |   1 -
 .../share/testAthenaTrigRDOtoAOD.py           |   2 +-
 .../share/testAthenaTrigRDOtoAODSLIM.py       |  69 ++++
 .../share/testAthenaTrigRDOtoBS.py            |   5 +-
 .../share/testAthenaTrigRDOtoESDAOD.py        |   2 +-
 .../share/testAthenaTrigRDOtoTAG.py           |   3 +-
 .../TrigAnalysisTest_TestConfiguration.xml    | 371 +++++++++++++-----
 16 files changed, 588 insertions(+), 283 deletions(-)
 create mode 100644 Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAODSLIM.py

diff --git a/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf b/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf
index fb49b5400dc..d428fe1d1c3 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/REG/latest/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
-  pre_condition test -e ../AthenaTrigRDOtoAOD_DC14/AOD.pool.root
+  #pre_condition test -e ../AthenaTrigRDOtoAOD_Physics/AOD.pool.root
+  pre_condition if [[ $(find ../AthenaTrigRDOtoAOD_Physics/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD_Physics/AOD.pool.root ; else test -e non_existing_file ; fi  
   joboptions testAthenaTrigAOD_TrigDecTool.py
   checklog --config checklogTriggerTest.conf --showexcludestats
   pre_command RecExCommon_links.sh
-  # do not specify files here to get backup from RDOtoESDAOD
-  athena_cmd athena.py 
-  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/AOD.pool.root"]'  
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaAOD_TrigDecTool.reference
   
 test 3
   name AthenaTrigAOD_TrigDecTool_fixedAOD
@@ -27,16 +27,16 @@ 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/REG/latest/AthenaAOD_TrigDecTool_fixedAOD_top_extract_full.reference
 
 test 4
   name AthenaTrigAOD_TrigEDMCheck
   doc  TrigEDMCheck on ../AthenaTrigRDOtoAOD/AOD.pool.root
-  pre_condition test -e ../AthenaTrigRDOtoAOD_DC14/AOD.pool.root
+  pre_condition if [[ $(find ../AthenaTrigRDOtoAOD_DC14/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD_DC14/AOD.pool.root ; else test -e non_existing_file ; fi  
   joboptions testAthenaTrigAOD_TrigEDMCheck.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/AthenaAOD_TrigEDMCheck.reference
+  fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaAOD_TrigEDMCheck.reference
   
 test 5
   name AthenaTrigAOD_TrigEDMCheck_fixedAOD
@@ -44,25 +44,25 @@ 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/REG/latest/AthenaRDO_TrigEDMCheck_fixedAOD.reference
 
 test 6
   name AthenaTrigAOD_TrigSlimValidation
   doc Validates slimed AOD:  ../AthenaTrigAODtoAOD_TrigNavSlimming/AOD_RSegamma.pool.root
-  pre_condition test -e ../AthenaTrigAODtoAOD_TrigNavSlimming/AOD_RSegamma.pool.root
+  pre_condition if [[ $(find ../AthenaTrigAODtoAOD_TrigNavSlimming/AOD_RSegamma.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigAODtoAOD_TrigNavSlimming/AOD_RSegamma.pool.root ; else test -e non_existing_file ; fi  
   joboptions testAthenaTrigAOD_TrigSlimValidation.py
   athena_cmd athena.py -c 'inputFile="../AthenaTrigAODtoAOD_TrigNavSlimming/AOD_RSegamma.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/REG/latest/AthenaTrigAOD_TrigSlimValidation.reference
 
 test 7
   name AthenaTrigAOD_TrigSqueezeValidation
   doc Validates squeezed AOD:  ../AthenaTrigAODtoAOD_TrigNavSqueeze/AOD_SqueezeRFTrigCaloCellMaker.pool.root
-  pre_condition test -e ../AthenaTrigAODtoAOD_TrigNavSqueeze/AOD_SqueezeRFTrigCaloCellMaker.pool.root
+  pre_condition if [[ $(find ../AthenaTrigAODtoAOD_TrigNavSqueeze/AOD_SqueezeRFTrigCaloCellMaker.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigAODtoAOD_TrigNavSqueeze/AOD_SqueezeRFTrigCaloCellMaker.pool.root ; else test -e non_existing_file ; fi  
   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/REG/latest/AthenaTrigAOD_TrigSqueezeValidation.reference
 
 test 8
   name AthenaTrigAOD_Trigslimval 
@@ -78,51 +78,55 @@ test 8
 test 9
   name AthenaTrigAOD_UnslimVal
   doc Makes REGTESTs for unslimmed AOD
-  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  
   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/REG/latest/AthenaTrigAOD_UnslimVal.reference
 
 test 10
   name AthenaTrigAODtoAOD_TrigNavSlimming
   doc Slims AOD
-  pre_condition test -e ../AthenaTrigRDOtoESDAOD/AOD.pool.root
+  pre_condition if [[ $(find ../AthenaTrigRDOtoAOD_Physics/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD_Physics/AOD.pool.root ; else test -e non_existing_file ; fi  
   joboptions  testAthenaTrigAODtoAOD_TrigNavSlimming.py
+  athena_cmd athena.py -c 'TestType="RSegamma";inputFile="../AthenaTrigRDOtoAOD_Physics/AOD.pool.root"'
+#';from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00"'
   checklog --config checklogTriggerTest.conf --showexcludestats
-  athena_cmd athena.py -c 'TestType="RSegamma"'
+#  athena_cmd athena.py -c 'TestType="RSegamma"'
   post_command checkFile.py AOD_RSegamma.pool.root >AOD_RSegamma.pool.root.txt
+  post_command checkxAOD.py AOD_RSegamma.pool.root >AOD_RSegamma.pool.root.checkxAOD.txt
   
 test 11
   name AthenaTrigAODtoAOD_TrigNavSqueeze
   doc Squeezes AOD
-  pre_condition test -e ../AthenaTrigRDOtoESDAOD/AOD.pool.root
+  pre_condition if [[ $(find ../AthenaTrigRDOtoAOD_Physics/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD_Physics/AOD.pool.root ; else test -e non_existing_file ; fi  
   joboptions testAthenaTrigAODtoAOD_TrigNavSlimming.py
   checklog --config checklogTriggerTest.conf --showexcludestats
-  athena_cmd athena.py -c 'TestType = "SqueezeRFTrigCaloCellMaker"' 
+  athena_cmd athena.py -c 'TestType = "SqueezeRFTrigCaloCellMaker";from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion="ATLAS-R2-2015-01-01-00"' 
   post_command checkFile.py AOD_SqueezeRFTrigCaloCellMaker.pool.root >AOD_SqueezeRFTrigCaloCellMaker.pool.root.txt  
+  post_command checkxAOD.py AOD_SqueezeRFTrigCaloCellMaker.pool.root >AOD_SqueezeRFTrigCaloCellMaker.pool.root.checkxAOD.txt
 
 test 12
   name AthenaTrigBStoESD
   doc Writes BS from ESD, trigger only configured, use BS file ../AthenaTrigRDOtoBS/data_test*.data
-  pre_condition test -e ../AthenaTrigRDOtoBS/raw*.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
   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 
-  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/REG/latest/AthenaBStoESD.reference 
+  #no rootfile no# rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/HIST/latest/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
 
 test 13
    name AthenaTrigESD_HLTMonitoring
    doc runs HLT monitoring on ouput of RDOtoESDAOD
-   pre_condition test -e ../AthenaTrigRDOtoESDAOD/ESD.pool.root
+   pre_condition if [[ $(find ../AthenaTrigRDOtoESDAOD/ESD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoESDAOD/ESD.pool.root ; else test -e non_existing_file ; fi  
    pre_command  get_files -jo readHLTMon.py
    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_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/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
 
 test 14
    name AthenaTrigESD_HLTMonitoring_fixedESD
@@ -139,7 +143,7 @@ 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/REG/latest/AthenaTrigRDO_TDT.reference
 
 test 16
   doc runs trigger from RDO writes AOD, AOD is used by other tasks
@@ -148,11 +152,14 @@ test 16
   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.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
+#  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
   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
 
 test 17
@@ -162,8 +169,9 @@ 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"]'
   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
+  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
 
 test 18
@@ -172,11 +180,13 @@ test 18
   joboptions testAthenaTrigRDOtoESDAOD.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/AthenaRDOtoESDAOD.reference
+#  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/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
   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
   
 test 19
   name AthenaTrigRDOtoTAG
@@ -184,7 +194,8 @@ test 19
   joboptions testAthenaTrigRDOtoTAG.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/AthenaRDOtoTAG.reference
+#  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
   
 test 20
   name BackCompAthenaTrigBStoESDAOD
@@ -193,138 +204,230 @@ test 20
   #pre_command RecExCommon_links.sh
   #athena_cmd athena.py -c 'BSRDOInput=["/afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/data/testAllPT/data_test.00005200.Single_Stream.daq.RAW._lb0000._Athena._0001.data"]'
   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_trf.py AMI=q120 preExec='from RecExConfig.RecFlags import rec;rec.doESD.set_Value_and_Lock(False);rec.doAOD.set_Value_and_Lock(False)' maxEvents=10 inputBSFile=data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1 outputESDFile=ESD.pool.root outputAODFile=AOD.pool.root outputHISTFile=myMergedMon.root outputNTUP_TRIGFile=myTrigNtup.root --ignoreerrors=True
-  #athena_cmd Reco_tf.py  --AMIConfig=q120 --preExec='from RecExConfig.RecFlags import rec;rec.doESD.set_Value_and_Lock(True);rec.doAOD.set_Value_and_Lock(True)' --maxEvents=10 --inputBSFile=data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root --outputHISTFile=myMergedMon.root --outputNTUP_TRIGFile=myTrigNtup.root --ignoreErrors=True
-  #athena_cmd Reco_tf.py --AMIConfig q120 --autoConfiguration="everything" --preExec='from RecExConfig.RecFlags import rec;rec.doESD.set_Value_and_Lock(True);rec.doAOD.set_Value_and_Lock(True)' --maxEvents=10 --inputBSFile=data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root --outputHISTFile=myMergedMon.root
-  athena_cmd Reco_tf.py --autoConfiguration="everything" --maxEvents=10 --inputBSFile=data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1 --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root 
+  #athena_cmd Reco_tf.py --AMIConfig q120 --geometryVersion ATLAS-R1-2010-02-00-00 --maxEvents 10 --inputBSFile data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --autoConfiguration everything
+#or try: 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  with: ATLAS-R1-2012-02-01-00
+#
+  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
+  checklog --config checklogTriggerTest.conf --showexcludestats
+#athena_cmd Reco_tf.py --geometryVersion ATLAS-R1-2010-02-00-00 --maxEvents 10 --inputBSFile data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --autoConfiguration everything
   checklog --config checklogTriggerTest.conf --showexcludestats
   post_command rm data10_7TeV.00152845.physics_MinBias.merge.RAW._lb0250._0003.1
-  #fullregtest    REGTEST  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/BackCompAthenaTrigBStoESDAOD.reference
+  #fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/BackCompAthenaTrigBStoESDAOD.reference
   post_command checkFile.py ESD.pool.root > ESD.txt
   post_command checkFile.py AOD.pool.root > AOD.txt
+  post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
+  post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
   
 test 21
    name BackCompAthenaTrigAOD_TrigDecTool
-   pre_condition test -e ../BackCompAthenaTrigBStoESDAOD/AOD.pool.root
+   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  
    joboptions testAthenaTrigAOD_TrigDecTool.py
    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/REG/latest/BackCompAthenaTrigAOD_TrigDecTool
 
 test 22
    name BackCompAthenaTrigAOD_TrigEDMCheck
-   pre_condition test -e ../BackCompAthenaTrigBStoESDAOD/AOD.pool.root
+   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  
    joboptions testAthenaTrigAOD_TrigEDMCheck.py
    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/REG/latest/BackCompAthenaTrigAOD_TrigEDMCheck
 
 test 23
   doc runs trigger from RDO writes AOD, Physics menu
   name AthenaTrigRDOtoAOD_Physics
   joboptions testAthenaTrigRDOtoAOD.py
-  athena_cmd  athena.py -c "menu='Physics_pp_v5'"
+#  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 'menu="Physics_pp_v5"'
   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
+  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
   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
   
 test 24
   doc runs trigger from RDO writes AOD, MC menu
   name AthenaTrigRDOtoAOD_MC
   joboptions testAthenaTrigRDOtoAOD.py
-  athena_cmd  athena.py -c "menu='MC_pp_v5'"
+  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/c/czodrows/public/19.3.RDO/10evts.RDO.0119996._000032.pool.root.1"];menu="MC_pp_v5"'
+#  athena_cmd  athena.py -c 'menu="MC_pp_v5"'
   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
+  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
   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
   
 test 25
   doc runs trigger from RDO writes AOD, LS1 menu
   name AthenaTrigRDOtoAOD_LS1
   joboptions testAthenaTrigRDOtoAOD.py
-  athena_cmd  athena.py -c "menu='LS1_v1'"
+#  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"'
   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
+  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
   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
   
 test 26
   doc runs trigger from RDO writes AOD, DC14 menu
   name AthenaTrigRDOtoAOD_DC14
   joboptions testAthenaTrigRDOtoAOD.py
-  athena_cmd  athena.py -c "menu='DC14'"
+#  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
+  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
   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
   
 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 "menu='Physics_pp_v5'"
+#  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 '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/AthenaRDOtoESDAOD_Physics.reference
+  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
   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
     
 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 "menu='MC_pp_v5'"
+#  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 'menu="MC_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/AthenaRDOtoESDAOD_MC.reference
+  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
   post_command checkFile.py ESD.pool.root > ESD.txt
-  post_command checkFile.py AOD.pool.root > AOD.txt  
+  post_command checkFile.py AOD.pool.root > AOD.txt
+  post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
   
 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 "menu='LS1_v1'"
+#  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"'
   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
+  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
   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
   
 test 30
   name AthenaTrigRDOtoESDAOD_DC14
   doc Basic, standard, RecExCommon-based, read-RDO, run-trigger job. Reco enabled, DC14 menu
   joboptions testAthenaTrigRDOtoESDAOD.py
-  athena_cmd  athena.py -c "menu='DC14'"
+#  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
-  fullregtest    REGTEST  /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/REG/latest/AthenaRDOtoESDAOD_DC14.reference
+  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
   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
+
+test 31
+  doc runs trigger from RDO writes AOD SLIM
+  name AthenaTrigRDOtoAOD_SLIM
+  joboptions testAthenaTrigRDOtoAODSLIM.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"]'
+#  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
+  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
+
+test 32
+  doc test if ATLAS-R2-2015-01-01-00 is already working
+  name ATLAS_R2_READY_OR_NOT
+  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"'
+  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
+  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
+
+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"'
+  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
+  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
+
+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"'
+  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
+  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
+
+test 35
+  name BackCompAthenaTrigBStoESDAOD_2010
+  joboptions None
+  checklog --config checklogTriggerTest.conf --showexcludestats
+  athena_cmd Reco_tf.py --geometryVersion ATLAS-R1-2010-02-00-00 --maxEvents 10 --inputBSFile 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 --outputESDFile ESD.pool.root --outputAODFile AOD.pool.root --autoConfiguration everything
+  checklog --config checklogTriggerTest.conf --showexcludestats
+  post_command checkFile.py ESD.pool.root > ESD.txt
+  post_command checkFile.py AOD.pool.root > AOD.txt
+  post_command checkFileTrigSize_RTT.py >AODTrigsum.txt
+  post_command checkxAOD.py AOD.pool.root > AOD.checkxAODFile.txt
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/bin/checkFileTrigSize_RTT.py b/Trigger/TrigValidation/TrigAnalysisTest/bin/checkFileTrigSize_RTT.py
index c66e36a91f6..f4c6ba98eee 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/bin/checkFileTrigSize_RTT.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/bin/checkFileTrigSize_RTT.py
@@ -122,7 +122,6 @@ class checkFileTrigSize_RTT:
             #    'CaloClusterContainer_p4_egClusterCollection',
             #    'CaloClusterContainer_p4_CaloCalTopoCluster',
             #    'Trk::TrackCollection_tlp2_Tracks',
-
         ]
         caloCounter = Counter('calo',caloList)
     
@@ -856,9 +855,9 @@ class checkFileTrigSize_RTT:
             'TrigTauClusterContainer_p4_HLT_TrigT2CaloTau',
             'TrigTauContainer_tlp1_HLT',
             'TrigTauContainer_p3_HLT',
-        'TrigTauClusterContainer_p3_HLT_TrigT2CaloTau',
-        'TrigTauClusterContainer_p5_HLT_TrigT2CaloTau',
-        'TrigTauClusterDetailsContainer_p2_HLT_TrigT2CaloTauDetails',
+            'TrigTauClusterContainer_p3_HLT_TrigT2CaloTau',
+            'TrigTauClusterContainer_p5_HLT_TrigT2CaloTau',
+            'TrigTauClusterDetailsContainer_p2_HLT_TrigT2CaloTauDetails',
             'TrigTauTracksInfoCollection_tlp1_HLT',
             'TrigTauTracksInfoCollection_p2_HLT',
             'TrigTauClusterDetailsContainer_tlp1_HLT_TrigT2CaloTau',
@@ -1053,6 +1052,11 @@ class checkFileTrigSize_RTT:
             if re.search("TOTAL",line):
                 total = float(splitline[4])
 
+            #for new xAOD    
+            if re.search("Total",line):
+                if (unicode(splitline[4])).isnumeric():
+                    total = float(splitline[4])
+
             #only count the good lines (ie. not "=====", etc.)
             if len(splitline)!=10:
                 continue
@@ -1070,18 +1074,20 @@ class checkFileTrigSize_RTT:
             
             ## Added by Rodger
             ## ========================================================
-            
+
             # sum of all algorithm sizes in checkFile
             totalAlgSize += float(sizePerEvent)
             
             # Variable for testing if algorithm might be trigger related
             # Used in the last elif statement
             TrigInName = name.find("Trig") + name.find("HLT") + name.find("LVL1")
+
             
             ## Add trigger algorithm to trigger list if it's found in TriggerEDM.py dictionary
             ## !! It should definately be found if it's a trigger algorithm !!
             if getCategory(name) != 'NOTFOUND':
                 triggerAlgList.append([name, getCategory(name), float(sizePerEvent)])
+
                 
             ## IOVMetaDataContainer* are not in TriggerEDM.py dictionary
             ## Add these manually to list
@@ -1108,7 +1114,6 @@ class checkFileTrigSize_RTT:
                 #check that item has not already been counted
                     if item==name and isLineCounted:
                         doublesList[name]=item
-
                     #if not already counted, increment the size of the Counter
                     if item==name and not isLineCounted:
                         counter.size += float(splitline[4])
@@ -1120,13 +1125,14 @@ class checkFileTrigSize_RTT:
                  sumNU += float(splitline[4])
                 except: pass
                 TrigInName = name.find("Trig") + name.find("HLT") + name.find("LVL1")
-                if TrigInName!=-3:
-                    notUsedList.append(name)
-                    print "====================="
-                    print "Missing Trigger Containers!!!"
-                    print "====================="
-                    print name, sizePerEvent
-        
+#                if TrigInName!=-3:
+#                    notUsedList.append(name)
+#                    print "====================="
+#                    print "Missing Trigger Containers!!!"
+#                    print "====================="
+#                    print name, sizePerEvent
+                    
+
         sum = 0 #the sum of all counters (should be equal to 'total')
         sumTrig = 0 #the sum of trigger component
         sumNonTrig = 0 #the sum of non trigger component
@@ -1137,7 +1143,6 @@ class checkFileTrigSize_RTT:
         triggerAlgSize = {}
         triggerAlgSize[ 'Total' ] = 0.0
         for triggerAlg in triggerAlgList:
-            # print '%s = %s' % (triggerAlg[1], triggerAlg[2])
             if not triggerAlg[1] in triggerAlgSize: triggerAlgSize[ triggerAlg[1] ] = triggerAlg[2]
             else: triggerAlgSize[ triggerAlg[1] ] += triggerAlg[2]
             triggerAlgSize[ 'Total' ] += triggerAlg[2]
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/cmt/requirements b/Trigger/TrigValidation/TrigAnalysisTest/cmt/requirements
index 9f0c19b2721..31e34e2513c 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/cmt/requirements
+++ b/Trigger/TrigValidation/TrigAnalysisTest/cmt/requirements
@@ -9,12 +9,13 @@ package TrigAnalysisTest
 author John Baines <j.baines@rl.ac.uk>
 author Simon george <S.George@rhul.ac.uk>
 author Ricardo Goncalo <r.goncalo@rhul.ac.uk>
+#contact Patrick Czodrowski <czodrows@cern>
 
 use AtlasPolicy 		    AtlasPolicy-*
 #try if we can use AtlasTriggerRunTime instead of AtlasAnalysisRunTime
 use AtlasTriggerRunTime     AtlasTriggerRunTime-*
 #use AtlasAnalysisRunTime 	AtlasAnalysisRunTime-*
-#use RunTimeTester          RunTimeTester-*		Tools
+#use RunTimeTester          RunTimeTester-* Tools
 use TestPolicy              TestPolicy-*
 
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
index 90ec107cf10..8aacbf0c966 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigDecTool.py
@@ -18,8 +18,8 @@ if not ('OutputLevel' in dir()):
 if not ('fileList' in dir()) and not ('RunningRTT' in dir()):
     #just for now take the DC14 as default input
     #
-    default = "../AthenaTrigRDOtoAOD_DC14/AOD.pool.root"
-    summary = "../AthenaTrigRDOtoAOD_DC14/summary.log"
+    default = "../AthenaTrigRDOtoAOD_Physics/AOD.pool.root"
+    summary = "../AthenaTrigRDOtoAOD_Physics/summary.log"
     RDOtoAODokay = False
     from os.path import exists
     if exists(summary):
@@ -55,7 +55,6 @@ if not ('RunningRTT' in dir()):
 
 ###############################
 
-
 rec.doCBNT=False
 
 from RecExConfig.RecFlags import rec
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
index a3ed0682189..625ef824163 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck.py
@@ -13,7 +13,6 @@ if not ('OutputLevel' in dir()):
     rec.OutputLevel=INFO
 
 # look for backup files if RDOtoAOD fails
-
 #if not ('fileList' in dir()):
 #added for RTT-chainstore conmpatibility
 if not ('fileList' in dir()) and not ('RunningRTT' in dir()):
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck_fixedAOD.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck_fixedAOD.py
index c05837f1cfc..0c774a52a7c 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck_fixedAOD.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMCheck_fixedAOD.py
@@ -16,7 +16,6 @@ if not acf.EvtMax.is_locked():
     acf.EvtMax=2000
 if not ('OutputLevel' in dir()):
     rec.OutputLevel=INFO
-
 ###############################
 rec.doCBNT=False
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAODtoAOD_TrigNavSlimming.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAODtoAOD_TrigNavSlimming.py
index 12cb343babf..d5c4ab97761 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAODtoAOD_TrigNavSlimming.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAODtoAOD_TrigNavSlimming.py
@@ -16,62 +16,26 @@ rec.readAOD=True
 from RecExConfig.RecFlags  import rec
 rec.doWriteAOD.set_Value_and_Lock(True)
 
-# Parse command line options and setup input/output files
-# Note that you can setup the slimming via the commandline
-# by setting TestType = "string", where string can be:
-# RS<stream> - remove the specified stream
-# RF<feature> - remove the specified feature
-# Squeeze - remove intermediate elements
-# Or any combination of the above
 if not acf.EvtMax.is_locked():
-  acf.EvtMax = 10
-if not ('TestType' in dir()):
-  TestType = 'NoSlim'
-if len(TestType) > 0:
-  TestType = '_' + TestType
+    acf.EvtMax = 10
 
 
-# used RDOtoESDAOD test which is more likely to exist
 if not ('athenaCommonFlags.PoolAODInput' in dir()):
-  acf.PoolAODInput = ['../AthenaTrigRDOtoESDAOD/AOD.pool.root']
-if not ('athenaCommonFlags.PoolAODOutput' in dir()):
-  acf.PoolAODOutput='AOD'+TestType+'.pool.root'
+  acf.PoolAODInput = ['../AthenaTrigRDOtoAOD_Physics/AOD.pool.root']
+#if not ('athenaCommonFlags.PoolAODOutput' in dir()):
+  #acf.PoolAODOutput='AOD.pool.root'
 
 acf.FilesInput=acf.PoolAODInput()
 
-
-if TestType.startswith('_'):
-  TestType = TestType.replace('_', '', 1)
-
 # Setup slimming
-include ("TrigNavTools/TrigNavigationSlimming_topOptions.py")
-slimmerAlg.WriteTree = 1
-
-# check if squeezing is needed
-if TestType.count('Squeeze') > 0:
-  slimmerAlg.Squeeze = 1
-  TestType = TestType.replace('Squeeze', '')
-
-# check feature and stream removal
-lastLength = len(TestType) - 1
-while lastLength < len(TestType):
-  lastLength = len(TestType)
-  if TestType.startswith('RF'):
-    TestType = TestType.replace('RF', '', 1)
-    feature = TestType.split('RF')[0].split('RS')[0]
-    TestType = TestType.replace(feature, '', 1)
-    slimmerAlg.FeatureExclusionList = slimmerAlg.FeatureExclusionList + [ feature ]
-  if TestType.startswith('RS'):
-    TestType = TestType.replace('RS', '', 1)
-    stream = TestType.split('RF')[0].split('RS')[0]
-    TestType = TestType.replace(stream, '', 1)
-    slimmerAlg.StreamExclusionList = slimmerAlg.StreamExclusionList + [ stream ]
-    slimmerAlg.ProtectOtherStreams = 1
-  
+include ("TrigNavTools/TrigNavigationSlimming_test.py")
+
 # main jobOption
 include ("RecExCommon/RecExCommon_topOptions.py")
 
 
+
+
 #from AthenaCommon.GlobalFlags import GlobalFlags
 #GlobalFlags.DetGeo.set_atlas()
 
@@ -89,3 +53,4 @@ ToolSvc.TrigDecisionTool.Navigation.Dlls = [e for e in  EDMLibraries if 'TPCnv'
 include("TriggerTest/TriggerTestCommon.py")
 
 
+
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py
index f7d86ef7364..ccb581095ac 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigBStoESD.py
@@ -24,19 +24,17 @@ if not 'BSRDOInput' in dir():
    else:
       log.info("Using input BS file " + bsfiles[0])
       acf.BSRDOInput=bsfiles
-
-
  
 acf.FilesInput=acf.BSRDOInput()
 
 
 # specifying conditions by hand until auto configure is fixed
 # this will break every time the default file changes
-log.warning("setting geometry and coniditions by hand, will break if default RDO file changes")
+#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-DR-BS7T-ANom-11")
-globalflags.DetDescrVersion.set_Value_and_Lock("ATLAS-GEO-10-00-00")
+#from AthenaCommon.GlobalFlags import globalflags
+#globalflags.ConditionsTag.set_Value_and_Lock("OFLCOND-RUN12-SDR-17")
+#globalflags.DetDescrVersion.set_Value_and_Lock("ATLAS-GEO-21-02-02")
 
 
 
@@ -49,35 +47,23 @@ if not os.path.exists(acf.BSRDOInput()[0]):
 exit
 
 
-if not 'doWriteESD' in dir():
-    rec.doWriteESD=True
+#if not 'doWriteESD' in dir():
 
+rec.doWriteESD=True
 rec.doWriteRDO=False
 rec.doWriteAOD=False 
 rec.doAOD=False
 rec.doDPD=False
-rec.doESD=False
+rec.doESD=True
 rec.doWriteTAG=False
 
-doTrigger=True
-doTriggerConfigOnly=True
-
-#doTrigger=False
-#-------
-# Read from ByteStream
-#------
-from AthenaCommon.GlobalFlags import GlobalFlags
-globalflags.InputFormat.set_Value_and_Lock('bytestream')
-#GlobalFlags.InputFormat.set_bytestream()
-
-
-readBS=True
+rec.doTrigger=False
 
 
 #from AthenaCommon.AppMgr import ServiceMgr
 #ServiceMgr.IOVDbSvc.GlobalTag="OFLCOND-DR-BS7T-ANom-11"
 
-include ("RecExCommon/RecExCommon_flags.py")
+include ("RecExCond/RecExCommon_flags.py")
 # should be done afterwards so that TriggerFlags are configured ok
 
 # has been run at RDO->BS step (even EF ?)
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py
index e42dcfbd6c1..18b55e0ae92 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigESD_HLTMonitoring.py
@@ -17,7 +17,6 @@ if not fileList == []:
 if not 'RootNtupleOutput' in dir():
     rec.RootNtupleOutput="ntuple_fromAOD.root"
 
-
 rec.doCBNT=False
 rec.readESD=True
 rec.doWriteESD=False 
@@ -36,7 +35,7 @@ if not ('OutputLevel' in dir()):
     rec.OutputLevel=INFO
 
 #-----------------------------------------------------------
-include("RecExCommon/RecExCommon_flags.py")
+include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------
 from TriggerJobOpts.TriggerFlags import TriggerFlags
 TriggerFlags.configurationSourceList.set_Value_and_Lock( [ "ds" ] )
@@ -67,41 +66,41 @@ ToolSvc += HLTMon;
 HLTMonManager.AthenaMonTools += [ "HLTMonTool/HLTMon" ];
 
 
-from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import HLTEgammaMonitoringTool
-HLTMonManager.AthenaMonTools += HLTEgammaMonitoringTool()
-
+#from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import HLTEgammaMonitoringTool
+#HLTMonManager.AthenaMonTools += HLTEgammaMonitoringTool()
+#
 #from TrigCaloMonitoring.TrigCaloMonitoringConfig import HLTCaloMonitoringTool
 #HLTMonManager.AthenaMonTools+=HLTCaloMonitoringTool()
-
-from TrigMuonMonitoring.TrigMuonMonitoringConfig import TrigMuonMonitoringTool
-HLTMonManager.AthenaMonTools += TrigMuonMonitoringTool()
-
-from TrigJetMonitoring.TrigJetMonitoringConfig import TrigJetMonitoringTool
-HLTMonManager.AthenaMonTools += TrigJetMonitoringTool()
-
-from TrigIDtrkMonitoring.TrigIDtrkMonitoringConfig import TrigIDtrkMonitoringTool
-HLTMonManager.AthenaMonTools += TrigIDtrkMonitoringTool()
-
-from TrigMETMonitoring.TrigMETMonitoringConfig import HLTMETMonitoringTool
-HLTMonManager.AthenaMonTools += HLTMETMonitoringTool()
-
+#
+#from TrigMuonMonitoring.TrigMuonMonitoringConfig import TrigMuonMonitoringTool
+#HLTMonManager.AthenaMonTools += TrigMuonMonitoringTool()
+#
+#from TrigJetMonitoring.TrigJetMonitoringConfig import TrigJetMonitoringTool
+#HLTMonManager.AthenaMonTools += TrigJetMonitoringTool()
+#
+#from TrigIDtrkMonitoring.TrigIDtrkMonitoringConfig import TrigIDtrkMonitoringTool
+#HLTMonManager.AthenaMonTools += TrigIDtrkMonitoringTool()
+#
+#from TrigMETMonitoring.TrigMETMonitoringConfig import HLTMETMonitoringTool
+#HLTMonManager.AthenaMonTools += HLTMETMonitoringTool()
+#
 from TrigTauMonitoring.TrigTauMonitoringConfig import TrigTauMonitoringTool
 HLTMonManager.AthenaMonTools += TrigTauMonitoringTool()
-
-from TrigJetMonitoring.TrigJetMonitoringConfig import TrigJetMonitoringTool
-HLTMonManager.AthenaMonTools += TrigJetMonitoringTool()
-
-from TrigBjetMonitoring.TrigBjetMonitoringConfig import TrigBjetMonitoringConfig
-HLTMonManager.AthenaMonTools += TrigBjetMonitoringConfig()
-
-from TrigBphysMonitoring.TrigBphysMonitoringConfig import TrigBphysMonitoringTool
-HLTMonManager.AthenaMonTools += TrigBphysMonitoringTool()
-
-from TrigMinBiasMonitoring.TrigMinBiasMonitoringConfig import TrigMinBiasMonitoringTool
-HLTMonManager.AthenaMonTools += TrigMinBiasMonitoringTool()
-
-from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import HLTEgammaMonitoringDumpTool
-HLTMonManager.AthenaMonTools += HLTEgammaMonitoringDumpTool()
+#
+#from TrigJetMonitoring.TrigJetMonitoringConfig import TrigJetMonitoringTool
+#HLTMonManager.AthenaMonTools += TrigJetMonitoringTool()
+#
+#from TrigBjetMonitoring.TrigBjetMonitoringConfig import TrigBjetMonitoringConfig
+#HLTMonManager.AthenaMonTools += TrigBjetMonitoringConfig()
+#
+#from TrigBphysMonitoring.TrigBphysMonitoringConfig import TrigBphysMonitoringTool
+#HLTMonManager.AthenaMonTools += TrigBphysMonitoringTool()
+#
+#from TrigMinBiasMonitoring.TrigMinBiasMonitoringConfig import TrigMinBiasMonitoringTool
+#HLTMonManager.AthenaMonTools += TrigMinBiasMonitoringTool()
+#
+#from TrigEgammaMonitoring.TrigEgammaMonitoringConfig import HLTEgammaMonitoringDumpTool
+#HLTMonManager.AthenaMonTools += HLTEgammaMonitoringDumpTool()
 
 HLTMonManager.FileKey = "GLOBAL"
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDO_TDT.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDO_TDT.py
index 802c6ebf2bd..b7e80f8574f 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDO_TDT.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDO_TDT.py
@@ -3,7 +3,6 @@ from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
 
 include("TriggerTest/testAthenaTrigRDO.py")
 
-
 from TrigDecisionMaker.TrigDecisionMakerConfig import WriteTrigDecision
 trigDecWriter = WriteTrigDecision()
 
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAOD.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAOD.py
index abd94f7cfaf..80a9690f66d 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAOD.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAOD.py
@@ -24,7 +24,7 @@ rec.doCBNT=False
 rec.doTruth=True
 
 #-----------------------------------------------------------
-include("RecExCommon/RecExCommon_flags.py")
+include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------
 
 # set up trigger monitoring                                                                                                                                                        
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAODSLIM.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAODSLIM.py
new file mode 100644
index 00000000000..bcdec141d7a
--- /dev/null
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoAODSLIM.py
@@ -0,0 +1,69 @@
+#still needs a lot of cleaning ... 
+
+from RecExConfig.RecFlags import rec
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+
+if not acf.EvtMax.is_locked():
+    acf.EvtMax=10
+if not ('OutputLevel' in dir()):
+    rec.OutputLevel=INFO
+#scan for RTT files (only if dsName and fileRange set)
+include("TriggerTest/TrigScanFiles.py")
+###############################
+doTrigger=True
+TriggerModernConfig=True
+rec.doWriteAOD=True
+rec.doWriteESD=False
+rec.doWriteTAG=False
+rec.doAOD=True
+#rec.doESD.set_Value_and_Lock(False) 
+rec.doESD=True
+doTAG=False
+rec.doCBNT=False 
+rec.doTruth=True
+
+#-----------------------------------------------------------
+include("RecExCond/RecExCommon_flags.py")
+#-----------------------------------------------------------
+
+# set up trigger monitoring                                                                                                                                                        
+if not ('RunningRTT' in dir()):
+    TriggerFlags.enableMonitoring = [ 'Validation', 'Time' , 'Log' ]
+else:
+    TriggerFlags.enableMonitoring = [ 'Validation', 'Time' ]
+
+#------------ This is for ATN/RTT tests only ---------
+#TriggerFlags.triggerMenuSetup = 'default'
+TriggerFlags.readHLTconfigFromXML=False
+TriggerFlags.readLVL1configFromXML=False
+if  ('menu' in dir()):
+    TriggerFlags.triggerMenuSetup=menu 
+
+TriggerFlags.doHLT=True
+TriggerFlags.L1PrescaleSet  = '' 
+TriggerFlags.HLTPrescaleSet = '' 
+
+TriggerFlags.AODEDMSet="AODSLIM"
+
+#-------------end of flag for tests-------------------
+
+#------------ This is a temporary fix ---------------
+#from RecExConfig.RecConfFlags import recConfFlags
+#recConfFlags.AllowIgnoreConfigError=False
+#athenaCommonFlags.AllowIgnoreConfigError=False
+#-------------end of temporary fix-------------------
+
+#from ParticleBuilderOptions.AODFlags import AODFlags 
+#AODFlags.FastSimulation=False 
+# see comments in https://savannah.cern.ch/bugs/?83735
+#AODFlags.MuonTrackSlimmer=False
+#print AODFlags.Print()
+
+#-----------------------------------------------------------
+include("RecExCommon/RecExCommon_topOptions.py")
+#-----------------------------------------------------------
+
+# abort when there is an unchecked status code
+StatusCodeSvc.AbortOnError=False
+
+include("TriggerTest/TriggerTestCommon.py")
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py
index ffe78da922c..63e3cf5a09c 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoBS.py
@@ -30,13 +30,14 @@ rec.doWriteESD=False
 rec.doWriteTAG=False
 rec.doAOD=False
 rec.doDPD=False
-rec.doESD=False
+#rec.doESD=False
+rec.doESD.set_Value_and_Lock(False)
 doTAG=False
 
 rec.doTruth=True
 
 #-----------------------------------------------------------
-include("RecExCommon/RecExCommon_flags.py")
+include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------
 
 #TriggerFlags.readHLTconfigFromXML=False
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoESDAOD.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoESDAOD.py
index bc8390b466d..83e60d6796a 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoESDAOD.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoESDAOD.py
@@ -26,7 +26,7 @@ rec.doCBNT=False
 rec.doTruth=True
 
 #-----------------------------------------------------------
-include("RecExCommon/RecExCommon_flags.py")
+include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------
 
 # set up trigger monitoring                                                                                                                                                        
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoTAG.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoTAG.py
index d5794bb0e85..bf08b1c9d99 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoTAG.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigRDOtoTAG.py
@@ -11,7 +11,6 @@ if not acf.EvtMax.is_locked():
     acf.EvtMax=10
 if not ('OutputLevel' in dir()):
     rec.OutputLevel=INFO
-
 ###############################
 rec.doCBNT=False
 
@@ -31,7 +30,7 @@ doTAG=True
 rec.doTruth=True
 
 #-----------------------------------------------------------
-include("RecExCommon/RecExCommon_flags.py")
+include("RecExCond/RecExCommon_flags.py")
 #-----------------------------------------------------------
 
 TriggerFlags.readHLTconfigFromXML=False
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml b/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
index 0ca147b2376..25e7a39db48 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
@@ -43,7 +43,7 @@
         
         <TEST name="AthenaTrigRDOtoTAG" type="script" suite="triganalysis_val"> 
             <options_atn>trigtest.pl --test AthenaTrigRDOtoTAG --run AthenaTrigRDOtoTAG --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>20</timelimit> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
@@ -61,6 +61,15 @@
             </expectations> 
         </TEST> 
         
+        <TEST name="AthenaTrigRDOtoAOD_SLIM" type="script" suite="triganalysis_val"> 
+            <options_atn>trigtest.pl --test AthenaTrigRDOtoAOD_SLIM --run AthenaTrigRDOtoAOD_SLIM --conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
+            <author>TrigAnalysis validation</author> 
+            <expectations> 
+                <errorMessage>FAILURE </errorMessage> 
+                <returnValue>0</returnValue> 
+            </expectations> 
+        </TEST> 
         
         <TEST name="AthenaTrigRDO_TDT" type="script" suite="triganalysis_val"> 
             <options_atn>trigtest.pl --test AthenaTrigRDO_TDT --run AthenaTrigRDO_TDT --conf TrigAnalysisTest.conf</options_atn> 
@@ -84,7 +93,7 @@
         
         <TEST name="AthenaTrigESD_HLTMonitoring" type="script" suite="triganalysis_val"> 
             <options_atn>trigtest.pl --test AthenaTrigESD_HLTMonitoring --run AthenaTrigESD_HLTMonitoring --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>20</timelimit> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
@@ -94,7 +103,7 @@
         
         <!--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>20</timelimit> 
+         <timelimit>30</timelimit> 
          <author>TrigAnalysis validation</author> 
          <expectations> 
          <errorMessage>FAILURE </errorMessage> 
@@ -104,7 +113,7 @@
         
         <TEST name="AthenaTrigBStoESD" type="script" suite="triganalysis_val"> 
             <options_atn>trigtest.pl --test AthenaTrigBStoESD --run AthenaTrigBStoESD --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>20</timelimit> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
@@ -113,9 +122,9 @@
         </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>10</timelimit> 
+        <!--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> 
             <author>TrigAnalysis validation</author> 
             <mailto> Benjamin.Smith@cern.ch</mailto> 
             <expectations> 
@@ -125,10 +134,10 @@
         </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> 
-            <timelimit>10</timelimit> 
+            <options_atn>trigtest.pl - -test AthenaTrigAODtoAOD_TrigNavSlimming - -run AthenaTrigAODtoAOD_TrigNavSlimming - -conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
-            <mailto> Benjamin.Smith@cern.ch</mailto> 
+            <mailto> tbold@mail.cern.ch</mailto> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
                 <returnValue>0</returnValue> 
@@ -136,8 +145,8 @@
         </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>10</timelimit> 
+            <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> 
@@ -147,8 +156,8 @@
         </TEST> 
         
         <TEST name= "AthenaTrigAODtoAOD_TrigNavSqueeze" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigAODtoAOD_TrigNavSqueeze --run AthenaTrigAODtoAOD_TrigNavSqueeze --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>10</timelimit> 
+            <options_atn>trigtest.pl - -test AthenaTrigAODtoAOD_TrigNavSqueeze - -run AthenaTrigAODtoAOD_TrigNavSqueeze - -conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <mailto> Benjamin.Smith@cern.ch</mailto> 
             <expectations> 
@@ -158,8 +167,8 @@
         </TEST> 
         
         <TEST name= "AthenaTrigAOD_TrigSqueezeValidation" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigAOD_TrigSqueezeValidation --run AthenaTrigAOD_TrigSqueezeValidation --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>10</timelimit> 
+            <options_atn>trigtest.pl - -test AthenaTrigAOD_TrigSqueezeValidation - -run AthenaTrigAOD_TrigSqueezeValidation - -conf TrigAnalysisTest.conf</options_atn> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <mailto> Benjamin.Smith@cern.ch</mailto> 
             <expectations> 
@@ -169,15 +178,15 @@
         </TEST> 
         
         <TEST name= "AthenaTrigAOD_Trigslimval" type="script" suite="triganalysis_val"> 
-            <options_atn>trigtest.pl --test AthenaTrigAOD_Trigslimval --run AthenaTrigAOD_Trigslimval --conf TrigAnalysisTest.conf</options_atn> 
-            <timelimit>10</timelimit> 
+            <options_atn>trigtest.pl - -test AthenaTrigAOD_Trigslimval - -run AthenaTrigAOD_Trigslimval - -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--> 
         
         <TEST name="AthenaTrigRDOtoAOD_Physics" type="script" suite="triganalysis_val"> 
             <options_atn>trigtest.pl --test AthenaTrigRDOtoAOD_Physics --run AthenaTrigRDOtoAOD_Physics --conf TrigAnalysisTest.conf</options_atn> 
@@ -189,6 +198,17 @@
             </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> 
+            <timelimit>30</timelimit> 
+            <author>TrigAnalysis validation</author> 
+            <mailto> tbold@mail.cern.ch</mailto> 
+            <expectations> 
+                <errorMessage>FAILURE </errorMessage> 
+                <returnValue>0</returnValue> 
+            </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> 
             <timelimit>30</timelimit> 
@@ -253,7 +273,7 @@
         
         <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>20</timelimit> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
@@ -263,7 +283,7 @@
         
         <!--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>20</timelimit> 
+         <timelimit>30</timelimit> 
          <author>TrigAnalysis validation</author> 
          <expectations> 
          <errorMessage>FAILURE </errorMessage> 
@@ -274,7 +294,7 @@
         
         <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>20</timelimit> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <expectations> 
                 <errorMessage>FAILURE </errorMessage> 
@@ -285,7 +305,7 @@
         
         <!--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> 
-         <timelimit>20</timelimit> 
+         <timelimit>30</timelimit> 
          <author>TrigAnalysis validation</author> 
          <expectations> 
          <errorMessage>FAILURE </errorMessage> 
@@ -295,9 +315,20 @@
         
         <!-- 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>20</timelimit> 
+            <timelimit>45</timelimit> 
             <author>TrigAnalysis validation</author> 
             <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
             <expectations> 
@@ -308,7 +339,7 @@
         
         <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>14</timelimit> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
             <expectations> 
@@ -319,7 +350,7 @@
         
         <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>14</timelimit> 
+            <timelimit>30</timelimit> 
             <author>TrigAnalysis validation</author> 
             <mailto> p.f.salvatore@sussex.ac.uk </mailto> 
             <expectations> 
@@ -379,47 +410,50 @@
                 <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  userJobId="AthenaTrigRDOtoAOD_Physics" doMonitoring="True">
+            <athena  userJobId="RDOtoAOD_Physics" doMonitoring="True">
                 <doc>
                     Menu: Physics_pp_v5 Sample: top - produces AOD 100 events
                 </doc>
-                <displayName>AthenaTrigRDOtoAOD_Physics</displayName>
+                <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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]
+                    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] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue>
+                <queue>long</queue>
                 <alwaysRunPostProc />
             </athena>
-            <athena  userJobId="AthenaTrigRDOtoAOD_MC" doMonitoring="True">
+            
+            <athena  userJobId="RDOtoAOD_MC" doMonitoring="True">
                 <doc>
                     Menu: MC_pp_v5 Sample: top - produces AOD 100 events
                 </doc>
-                <displayName>AthenaTrigRDOtoAOD_MC</displayName>
+                <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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]
+                    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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue>
+                <queue>long</queue>
                 <alwaysRunPostProc />
             </athena>
-            <athena  userJobId="AthenaTrigRDOtoAOD_LS1" doMonitoring="True">
+            <athena  userJobId="RDOtoAOD_LS1" doMonitoring="True">
                 <doc> 
-                    Menu: LS1_v1 Sample: top - produces AOD 100 events
+                    Menu: LS1_v1 Sample: top - produces AOD 50 events
                 </doc>
-                <displayName>AthenaTrigRDOtoAOD_LS1</displayName>
+                <displayName>RDOtoAOD_LS1</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='LS1_v1';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]
+                    RunningRTT=TRUE;menu='LS1_v1';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(50);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] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue>
+                <queue>long</queue>
                 <alwaysRunPostProc />
             </athena>
             
@@ -428,14 +462,14 @@
              <doc>
              Menu: DC14 Sample: top - produces AOD 100 events
              </doc>
-             <displayName>AthenaTrigRDOtoAOD_DC14</displayName>
+             <displayName>RDOtoAOD_DC14</displayName>
              <commandLineFlags>
              RunningRTT=TRUE;menu='DC14';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]
              </commandLineFlags>
              <options>testAthenaTrigRDOtoAOD.py</options>
              <package>Trigger/TrigValidation/TrigAnalysisTest</package>
              <group>TrigAnalysisTestIOTests</group>
-             <queue>medium</queue>
+             <queue>long</queue>
              <alwaysRunPostProc />
              </athena-->
             
@@ -443,14 +477,14 @@
                 <doc>
                     Menu: DC14_loose_mc_prescale Sample: top - produces AOD 100 events
                 </doc>
-                <displayName>AthenaTrigRDOtoAOD_DC14_loose_mc_prescale</displayName>
+                <displayName>RDOtoAOD_DC14_loose_mc_prescale</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='DC14_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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]
+                    RunningRTT=TRUE;menu='DC14_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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue>
+                <queue>long</queue>
                 <alwaysRunPostProc />
             </athena>
             
@@ -458,14 +492,14 @@
                 <doc>
                     Menu: DC14_tight_mc_prescale Sample: top - produces AOD 100 events
                 </doc>
-                <displayName>AthenaTrigRDOtoAOD_DC14_tight_mc_prescale</displayName>
+                <displayName>RDOtoAOD_DC14_tight_mc_prescale</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='DC14_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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]
+                    RunningRTT=TRUE;menu='DC14_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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>
                 <options>testAthenaTrigRDOtoAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package>
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue>
+                <queue>long</queue>
                 <alwaysRunPostProc />
             </athena>
             
@@ -473,42 +507,42 @@
                 <doc>
                     Menu: LS1_v1 Sample: top - produces AOD and ESD 100 events
                 </doc>
-                <displayName>testAthenaTrigRDOtoESDAOD_LS1</displayName>
+                <displayName>RDOtoESDAOD_LS1</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='LS1_v1';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]
+                    RunningRTT=TRUE;menu='LS1_v1';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] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue> 
+                <queue>long</queue> 
                 <alwaysRunPostProc />  
             </athena>
             <athena userJobId="RDOtoESDAOD_MC" doMonitoring="True">
                 <doc>
                     Menu: MC_pp_v5 Sample: top - produces AOD and ESD 100 events
                 </doc>
-                <displayName>testAthenaTrigRDOtoESDAOD_MC</displayName>
+                <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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]
+                    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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue> 
+                <queue>long</queue> 
                 <alwaysRunPostProc />  
             </athena>
             <athena userJobId="RDOtoESDAOD_Physics" doMonitoring="True">
                 <doc>
                     Menu: Physics_pp_v5 Sample: top - produces AOD and ESD 100 events
                 </doc>
-                <displayName>testAthenaTrigRDOtoESDAOD_Physics</displayName>
+                <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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]
+                    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] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue> 
+                <queue>long</queue> 
                 <alwaysRunPostProc />  
             </athena>
             
@@ -516,9 +550,9 @@
                 <doc>
                     Menu: DC14 Sample: top - produces AOD and ESD 100 events
                 </doc>
-                <displayName>testAthenaTrigRDOtoESDAOD_DC14</displayName>
+                <displayName>RDOtoESDAOD_DC14</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='DC14';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]
+                    RunningRTT=TRUE;menu='DC14';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] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
@@ -530,59 +564,129 @@
                 <doc>
                     Menu: DC14_loose_mc_prescale Sample: top - produces AOD and ESD 100 events
                 </doc>
-                <displayName>testAthenaTrigRDOtoESDAOD_DC14_loose_mc_prescale</displayName>
+                <displayName>RDOtoESDAOD_DC14_loose_mc_prescale</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='DC14_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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]
+                    RunningRTT=TRUE;menu='DC14_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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue> 
+                <queue>long</queue> 
                 <alwaysRunPostProc />  
             </athena>
             <athena userJobId="RDOtoESDAOD_DC14_tight_mc_prescale" doMonitoring="True">
                 <doc>
                     Menu: DC14_tight_mc_prescale Sample: top - produces AOD and ESD 100 events
                 </doc>
-                <displayName>testAthenaTrigRDOtoESDAOD_DC14_tight_mc_prescale</displayName>
+                <displayName>RDOtoESDAOD_DC14_tight_mc_prescale</displayName>
                 <commandLineFlags>
-                    RunningRTT=TRUE;menu='DC14_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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20]
+                    RunningRTT=TRUE;menu='DC14_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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                 </commandLineFlags>    
                 <options>testAthenaTrigRDOtoESDAOD.py</options>
                 <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
                 <group>TrigAnalysisTestIOTests</group>
-                <queue>medium</queue> 
+                <queue>long</queue> 
                 <alwaysRunPostProc />  
             </athena>
             
             <chain>
-                <chainName>AthenaTrigAOD_TrigEDMandTDTCheck_chain</chainName>
+                <chainName>AthenaTrigAOD_TrigEDMandTDTCheck_Physics_pp_v5_chain</chainName>
+                <sequential>
+                    
+                    <chainElement>
+                        <athena userJobId="RDOtoAOD_Physics_pp_v5" doMonitoring="True">
+                            <doc> Menu: Physics_pp_v5 Sample: top - produces AOD 100 events</doc>
+                            <displayName>RDOtoAOD_Physics_pp_v5</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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
+                            </commandLineFlags>
+                            <options>testAthenaTrigRDOtoAOD.py</options>
+                            <group>TrigAnalysisTestIOTests</group>
+                            <queue>long</queue>
+                            <athenaCommonFlags />
+                        </athena>
+                        <chainfileout>AOD.pool.root</chainfileout>
+                    </chainElement>
+                    
+                    <chainElement>
+                        <athena userJobId="AOD_TrigEDMCheck_Physics_pp_v5">
+                            <doc> AthenaTrigAOD_TrigEDMCheck on Menu: Physics_pp_v5 Sample: top AOD from RDO</doc>
+                            <displayName>AthenaTrigAOD_TrigEDMCheck_Physics_pp_v5</displayName>
+                            <commandLineFlags>RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=["AOD.pool.root"]</commandLineFlags>
+                            <options>testAthenaTrigAOD_TrigEDMCheck.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>
+                    
+                    <chainElement>
+                        <athena userJobId="AOD_TrigDecTool_Physics_pp_v5">
+                            <doc> AthenaTrigAOD_TrigDecTool on Menu: Physics_pp_v5 Sample: top AOD from RDO</doc>
+                            <displayName>AthenaTrigAOD_TrigDecTool_Physics_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>
+            </chain>
+            
+            <chain>
+                <chainName>AthenaTrigAOD_TrigEDMandTDTCheck_MC_pp_v5_chain</chainName>
                 <sequential>
                     
                     <chainElement>
-                        <athena userJobId="RDOtoAOD_DC14" doMonitoring="True">
-                            <doc> Menu: DC14 Sample: top - produces AOD 100 events</doc>
-                            <displayName>RDOtoAOD_DC14</displayName>
+                        <athena userJobId="RDOtoAOD_MC_pp_v5" doMonitoring="True">
+                            <doc> Menu: MC_pp_v5 Sample: top - produces AOD 100 events</doc>
+                            <displayName>RDOtoAOD_MC_pp_v5</displayName>
                             <commandLineFlags>
-                                RunningRTT=TRUE;menu='DC14';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]
+                                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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
                             </commandLineFlags>
                             <options>testAthenaTrigRDOtoAOD.py</options>
                             <group>TrigAnalysisTestIOTests</group>
-                            <queue>medium</queue>
+                            <queue>long</queue>
                             <athenaCommonFlags />
                         </athena>
                         <chainfileout>AOD.pool.root</chainfileout>
                     </chainElement>
                     
                     <chainElement>
-                        <athena userJobId="AOD_TrigEDMCheck">
-                            <doc> AthenaTrigAOD_TrigEDMCheck on Menu: DC14 Sample: top AOD from RDO</doc>
-                            <displayName>AthenaTrigAOD_TrigEDMCheck</displayName>
+                        <athena userJobId="AOD_TrigEDMCheck_MC_pp_v5">
+                            <doc> AthenaTrigAOD_TrigEDMCheck on Menu: MC_pp_v5 Sample: top AOD from RDO</doc>
+                            <displayName>AthenaTrigAOD_TrigEDMCheck_MC_pp_v5</displayName>
                             <commandLineFlags>RunningRTT=TRUE;jp.AthenaCommonFlags.PoolAODInput=["AOD.pool.root"]</commandLineFlags>
                             <options>testAthenaTrigAOD_TrigEDMCheck.py</options>
                             <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
                             <group>TrigAnalysisTestIOTests</group>
-                            <queue>medium</queue> 
+                            <queue>long</queue> 
                             <chaindataset_info>
                                 <dc2/>
                                 <chaindatasetName>AOD.pool.root</chaindatasetName>
@@ -599,14 +703,14 @@
                     </chainElement>
                     
                     <chainElement>
-                        <athena userJobId="AOD_TrigDecTool">
-                            <doc> AthenaTrigAOD_TrigDecTool on Menu: DC14 Sample: top AOD from RDO</doc>
-                            <displayName>AthenaTrigAOD_TrigDecTool</displayName>
+                        <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>medium</queue> 
+                            <queue>long</queue> 
                             <chaindataset_info>
                                 <dc2/>
                                 <chaindatasetName>AOD.pool.root</chaindatasetName>
@@ -625,12 +729,87 @@
                 </sequential>
             </chain>
             
+            <athena  userJobId="RDOtoAOD_MC_pp_v5_loose_mc_prescale" doMonitoring="True">
+                <doc>
+                    Menu: MC_pp_v5_loose_mc_prescale Sample: top - produces AOD 100 events
+                </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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
+                </commandLineFlags>
+                <options>testAthenaTrigRDOtoAOD.py</options>
+                <package>Trigger/TrigValidation/TrigAnalysisTest</package>
+                <group>TrigAnalysisTestIOTests</group>
+                <queue>long</queue>
+                <alwaysRunPostProc />
+            </athena>
+            
+            <athena  userJobId="RDOtoAOD_MC_pp_v5_tight_mc_prescale" doMonitoring="True">
+                <doc>
+                    Menu: MC_pp_v5_tight_mc_prescale Sample: top - produces AOD 100 events
+                </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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
+                </commandLineFlags>
+                <options>testAthenaTrigRDOtoAOD.py</options>
+                <package>Trigger/TrigValidation/TrigAnalysisTest</package>
+                <group>TrigAnalysisTestIOTests</group>
+                <queue>long</queue>
+                <alwaysRunPostProc />
+            </athena>
+            
+            
+            <athena  userJobId="RDOtoAODSLIM_MC_pp_v5_tight_mc_prescale" doMonitoring="True">
+                <doc>
+                    Menu: MC_pp_v5_tight_mc_prescale Sample: top - produces AODSLIM 100 events
+                </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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
+                </commandLineFlags>
+                <options>testAthenaTrigRDOtoAODSLIM.py</options>
+                <package>Trigger/TrigValidation/TrigAnalysisTest</package>
+                <group>TrigAnalysisTestIOTests</group>
+                <queue>long</queue>
+                <alwaysRunPostProc />
+            </athena>
+            
+            <athena userJobId="RDOtoESDAOD_MC_pp_v5_loose_mc_prescale" doMonitoring="True">
+                <doc>
+                    Menu: MC_pp_v5_loose_mc_prescale Sample: top - produces AOD and ESD 100 events
+                </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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
+                </commandLineFlags>    
+                <options>testAthenaTrigRDOtoESDAOD.py</options>
+                <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
+                <group>TrigAnalysisTestIOTests</group>
+                <queue>long</queue> 
+                <alwaysRunPostProc />  
+            </athena>
+            
+            <athena userJobId="RDOtoESDAOD_MC_pp_v5_tight_mc_prescale" doMonitoring="True">
+                <doc>
+                    Menu: MC_pp_v5_tight_mc_prescale Sample: top - produces AOD and ESD 100 events
+                </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/mc12_8TeV.105200.McAtNloJimmy_CT10_ttbar_LeptonFilter.digit.RDO.e1513_s1499_s1504_d700_tid01177880_00';fileRange=[1,20] <!--;from AthenaCommon.GlobalFlags import jobproperties;jobproperties.Global.DetDescrVersion='ATLAS-R2-2015-01-05-00';from AthenaCommon.AthenaCommonFlags import athenaCommonFlags;import glob;athenaCommonFlags.FilesInput=glob.glob('/afs/cern.ch/user/p/physval/validafs/disk2/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e2928_s1982_s2008_r5787_tid01606245_00/*')-->
+                </commandLineFlags>    
+                <options>testAthenaTrigRDOtoESDAOD.py</options>
+                <package>Trigger/TrigValidation/TrigAnalysisTest</package> 
+                <group>TrigAnalysisTestIOTests</group>
+                <queue>long</queue> 
+                <alwaysRunPostProc />  
+            </athena>
             
             <athena  userJobId="RDO_ElectronSlice_xAOD" doMonitoring="True">
                 <doc>
                     Menu:MC, Sample:top - produces xAOD 1000 events
                 </doc>
-                <displayName>testAthenaTrigRDO_ElectronSlice_xAOD</displayName>
+                <displayName>RDO_ElectronSlice_xAOD</displayName>
                 <commandLineFlags>
                     RunningRTT=TRUE;jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(1000);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/proj-sit/trigindet/mc12_14TeV.147806.PowhegPythia8_AU2CT10_Zee.recon.RDO.e1564_s1682_s1691_r4710_tid01288183_00';fileRange=[1,10]
                 </commandLineFlags>
@@ -686,15 +865,15 @@
                         <argvalue>check_log.pl --conf checklogTriggerTest.conf  %JOBLOG</argvalue>
                     </arg>
                 </test>
+                <!--test position="3">
+                 <modulename>TruncateLog_TrigAnalysisTest</modulename>
+                 <testname>TruncateLog_TrigAnalysisTest</testname>
+                 <arg>
+                 <argname>command</argname>
+                 <argvalue>mv %JOBLOG tmp.delete; head -n150000 tmp.delete  >%JOBLOG; rm tmp.delete</argvalue>
+                 </arg>
+                 </test-->
                 <test position="3">
-                    <modulename>TruncateLog_TrigAnalysisTest</modulename>
-                    <testname>TruncateLog_TrigAnalysisTest</testname>
-                    <arg>
-                        <argname>command</argname>
-                        <argvalue>mv %JOBLOG tmp.delete; head -n150000 tmp.delete  >%JOBLOG; rm tmp.delete</argvalue>
-                    </arg>
-                </test>
-                <test position="4">
                     <modulename>RttLibraryTools</modulename>
                     <testname>PerfMonRunner</testname>
                     <arg>
@@ -716,14 +895,16 @@
                  <keepFilePattern info="">RttLibraryTools_RTTPerfmonPlotter.postprocessing.log</keepFilePattern>
                  </test-->
                 
-                <!--test position="6"> commented till fix!!!
-                 <modulename>checkFileTrigSize_RTT</modulename>
-                 <testname>checkFileTrigSize_RTT</testname>
-                 <arg>
-                 <argname>checkFile</argname>
-                 <argvalue>AOD.pool.root.checkFile</argvalue>
-                 </arg>
-                 </test-->
+                <!-- rm noalarm label once this thing is fixed ... -->
+                <test position="4"> 
+                    <modulename>checkFileTrigSize_RTT</modulename>
+                    <testname>checkFileTrigSize_RTT</testname>
+                    <arg>
+                        <argname>checkFile</argname>
+                        <argvalue>AOD.pool.root.checkFile</argvalue>
+                    </arg>
+                    <noalarm />
+                </test>
                 
                 <testToRemove>
                     <jobGroupName>RTT:Top</jobGroupName>
-- 
GitLab