diff --git a/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf b/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf
index 38688e1e4cd64ac8ca882e2b97fb05ed0f9e5e09..6b86c34783a6845e1c49d99a8939100ad9c25fa5 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf
+++ b/Trigger/TrigValidation/TrigAnalysisTest/Testing/TrigAnalysisTest.conf
@@ -161,7 +161,7 @@ test 16
joboptions testAthenaTrigRDOtoAOD.py
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
- athena_cmd athena.py -c 'jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD.reference
regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_HLT.TrigChainMoniValidation.reference
# edmcheck diffPoolFiles.py AOD.pool.root /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AOD.pool.root
@@ -179,7 +179,7 @@ test 17
checklog --config checklogTriggerTest.conf --showexcludestats
# compresslog
pre_command RecExCommon_links.sh
- athena_cmd athena.py -c 'menu="Physics_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="Physics_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
post_command rm -f raw._0001.data
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoBS.reference
rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoBS.root
@@ -192,7 +192,7 @@ test 18
joboptions testAthenaTrigRDOtoESDAOD.py
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
- athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD.reference
# edmcheck diffPoolFiles.py AOD.pool.root /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_AOD.pool.root
# edmcheck diffPoolFiles.py ESD.pool.root /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_ESD.pool.root
@@ -209,7 +209,7 @@ test 19
joboptions testAthenaTrigRDOtoTAG.py
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
- athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoTAG.reference
rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoTAG.root
checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoTAG.root 1
@@ -250,7 +250,7 @@ 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"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="Physics_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
#pre_command get_files -jo checkFileTrigSize_RTT.py
@@ -268,7 +268,7 @@ 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_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
#pre_command get_files -jo checkFileTrigSize_RTT.py
@@ -286,7 +286,7 @@ 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"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="LS1_v1"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
#pre_command get_files -jo checkFileTrigSize_RTT.py
@@ -316,7 +316,7 @@ 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"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="Physics_pp_v5"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD_Physics.reference
@@ -333,7 +333,7 @@ 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_v6";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD_MC.reference
@@ -350,7 +350,7 @@ 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"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="LS1_v1"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD_LS1.reference
@@ -381,7 +381,7 @@ test 31
joboptions testAthenaTrigRDOtoAODSLIM.py
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
- athena_cmd athena.py -c 'menu="MC_pp_v6";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
regtest TrigSteer_HLT.TrigChainMoniValidation REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAODSLIM_HLT.TrigChainMoniValidation.reference
# edmcheck diffPoolFiles.py AOD.pool.root /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoAOD_AODSLIM.pool.root
post_command checkFile.py AOD.pool.root > AOD.pool.root.checkFile
@@ -410,7 +410,7 @@ test 33
doc runs trigger from RDO writes AOD, MC_pp_v6_loose_mc_prescales menu
name AthenaTrigRDOtoAOD_MC_pp_v6_loose_mc_prescales
joboptions testAthenaTrigRDOtoAOD.py
- athena_cmd athena.py -c 'menu="MC_pp_v6_loose_mc_prescales"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6_loose_mc_prescales"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC_pp_v6_loose_mc_prescales.reference
@@ -424,7 +424,7 @@ test 34
doc runs trigger from RDO writes AOD, MC_pp_v6_tight_mc_prescales menu
name AthenaTrigRDOtoAOD_MC_pp_v6_tight_mc_prescales
joboptions testAthenaTrigRDOtoAOD.py
- athena_cmd athena.py -c 'menu="MC_pp_v6_tight_mc_prescales"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6_tight_mc_prescales"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC_pp_v6_tight_mc_prescales.reference
@@ -455,7 +455,7 @@ test 36
checklog --config checklogTriggerTest.conf --showexcludestats
# compresslog
pre_command RecExCommon_links.sh
- athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
post_command rm -f raw._0001.data
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoBS_MC.reference
rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoBS_MC.root
@@ -582,7 +582,7 @@ test 47
doc runs trigger from RDO writes AOD, MC menu
name AthenaTrigRDOtoAOD_MC_pp_v6
joboptions testAthenaTrigRDOtoAOD.py
- athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6"; jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoAOD_MC_pp_v6.reference
@@ -598,7 +598,7 @@ test 48
name AthenaTrigRDOtoESDAOD_MC_pp_v6
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_v6";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid3.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2579_r6164_tid05062245_00/RDO.05062245._000001.pool.root.1"]'
+ athena_cmd athena.py -c 'menu="MC_pp_v6";jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(10); from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf;acf.FilesInput=["root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00/RDO.07644622._000001.pool.root.1"]'
checklog --config checklogTriggerTest.conf --showexcludestats
pre_command RecExCommon_links.sh
fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaRDOtoESDAOD_MC_pp_v6.reference
@@ -608,3 +608,13 @@ test 48
rootcomp /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_MC_pp_v6.root
checkcount /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaTrigRDOtoESDAOD_MC_pp_v6.root 1
post_command chainDump.py -n -S
+
+test 49
+ name AthenaTrigAOD_TrigEDMAuxCheck
+ doc TrigEDMCheck on ../AthenaTrigRDOtoAOD_MC/AOD.pool.root
+ pre_condition if [[ $(find ../AthenaTrigRDOtoAOD_MC/AOD.pool.root -type f -size +1000000c 2>/dev/null) ]] ; then test -e ../AthenaTrigRDOtoAOD_MC/AOD.pool.root ; else test -e non_existing_file ; fi
+ joboptions testAthenaTrigAOD_TrigEDMAuxCheck.py
+ checklog --config checklogTriggerTest.conf --showexcludestats
+ pre_command RecExCommon_links.sh
+ athena_cmd athena.py -c 'fileList=["../AthenaTrigRDOtoAOD_MC/AOD.pool.root"]'
+#fullregtest REGTEST /afs/cern.ch/atlas/project/trigger/pesa-sw/validation/references/ATN/postrel20/latest/triganalysistest_AthenaAOD_TrigEDMCheck.reference
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ValidateRun1BStoxAOD_jobOptions.py b/Trigger/TrigValidation/TrigAnalysisTest/share/ValidateRun1BStoxAOD_jobOptions.py
index 2caadba2f0da8b72f54c51191d02396d7e1e28d8..47a851867ea773e1264400938d279460efd3cc58 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ValidateRun1BStoxAOD_jobOptions.py
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ValidateRun1BStoxAOD_jobOptions.py
@@ -17,13 +17,19 @@ s_ref_file = 'root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/
print "check if the ATN output file exists..."
s_file = "";
-import os.path
+import os
if not (os.path.isfile(s_nightly_aod_yesterday)):
print "WARNING: it seems that the yesterday's ATN TrigHLT_Run1BStoxAOD in AtlasAnalysis,20.7.X-VAL was unsuccessful, going to use input file from the eos space"
s_file = s_ref_file
else:
s_file = s_nightly_aod_yesterday
+# if this is AthAnalysisBase,2.3, it won't work with the root file prepared in current 20.7.X-VAL due to different xAOD schema version
+rc_release = os.environ['ROOTCORE_RELEASE_SERIES']
+if int(rc_release) == 23:
+ print "This is ROOTCORE_RELEASE_SERIES = 23, will use the corresponding input file"
+ s_file = s_ref_file
+
print s_file," will be used as the input for this test"
import AthenaPoolCnvSvc.ReadAthenaPool
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py
new file mode 100644
index 0000000000000000000000000000000000000000..44c8512fca258f20dd3d1e44cb13ee4c4293c4e2
--- /dev/null
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/testAthenaTrigAOD_TrigEDMAuxCheck.py
@@ -0,0 +1,114 @@
+
+#PoolAODInput=['/afs/cern.ch/atlas/project/trigger/pesa-sw/validation/data130003002/AOD.015446._00012.pool.root.2']
+
+from RecExConfig.RecFlags import rec
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags as acf
+
+rec.readAOD=True
+
+# different input files for ATN and RTT tests
+if not acf.EvtMax.is_locked():
+ acf.EvtMax=10
+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()):
+ #default = "../AthenaTrigRDOtoAOD/AOD.pool.root"
+ #summary = "../AthenaTrigRDOtoAOD/summary.log"
+ #just for now take the DC14 as default input
+ #
+ default = "../AthenaTrigRDOtoAOD/AOD.pool.root"
+ summary = "../AthenaTrigRDOtoAOD/summary.log"
+ RDOtoAODokay = False
+ from os.path import exists
+ if exists(summary):
+ fsummary = open(summary)
+ if "ATHENA_BAD_EXIT" in fsummary.read():
+ print "WARNING: RDOtoAOD step bad, searching alternatives"
+ else:
+ if exists(default):
+ print "INFO: ouptut from RDOtoAOD step exists: ",default
+ RDOtoAODokay = True
+ if RDOtoAODokay:
+ fileList = [default]
+ else:
+ print "WARNING: default AOD file doesn't exist or is bad, searching alternatives"
+ import glob
+ pattern="../AthenaTrig*toESDAOD*/AOD*.pool.root"
+ files=glob.glob(pattern)
+ if (len(files)==0):
+ log.fatal(" ERROR FATAL No input AOD file could be found matching '" + pattern + "'")
+ exit(-1)
+ elif (len(files)>1):
+ log.warning("Multiple input AOD files found, taking last one: " + files[-1])
+ print "All matches to pattern '" + pattern + "': ", files
+ fileList=[files[-1]]
+ else:
+ log.info("Using input AOD file " + files[0])
+ fileList=files
+
+
+#added for RTT-chainstore conmpatibility
+if not ('RunningRTT' in dir()):
+ acf.FilesInput=fileList
+#acf.FilesInput=fileList
+
+
+
+
+###############################
+rec.doCBNT=False
+
+
+#doTrigger=False
+rec.doTrigger=False
+from RecExConfig.RecAlgsFlags import recAlgs
+recAlgs.doTrigger=False
+
+
+rec.doWriteAOD=False
+rec.doWriteESD=False
+rec.doWriteTAG=False
+rec.doAOD=False
+rec.doDPD=False
+rec.doESD=False
+doTAG=False
+
+#rec.doTruth=True
+
+
+#-----------------------------------------------------------
+include("RecExCommon/RecExCommon_topOptions.py")
+#-----------------------------------------------------------
+
+# abort when there is an unchecked status code
+StatusCodeSvc.AbortOnError=False
+
+
+####NOTE this still needs to updated for the DC14 menu!!! check what the TrigEDMChecker supports!!! rm L2 etc ..
+from TrigValAlgs.TrigValAlgsConfig import TrigEDMAuxChecker
+TrigEDMAuxChecker = TrigEDMAuxChecker("TrigEDMAuxChecker")
+
+from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
+ToolSvc += Trig__TrigDecisionTool( "TrigDecisionTool" )
+
+from TrigEDMConfig.TriggerEDM import EDMLibraries
+ToolSvc.TrigDecisionTool.Navigation.Dlls = EDMLibraries
+
+from AthenaCommon.AlgSequence import AlgSequence
+topSequence = AlgSequence()
+topSequence += TrigEDMAuxChecker
+
+
+
+include("TriggerTest/TriggerTestCommon.py")
+
+
+# get the name auditor
+#theAuditorSvc = AuditorSvc()
+#theAuditorSvc.Auditors += [ "NameAuditor"]
+
+
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml b/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
index 29545b3ef7359bb87a668b5fad3c61ff31fd6253..e561c751c72903c6be80cd72f68a5dd381deff35 100755
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/TrigAnalysisTest_TestConfiguration.xml
@@ -200,7 +200,6 @@
</expectations>
</TEST>
-
<TEST name="AthenaTrigAOD_TrigEDMCheck" type="script" suite="tat_MCSlim">
<options_atn>trigtest.pl --test AthenaTrigAOD_TrigEDMCheck --run AthenaTrigAOD_TrigEDMCheck --conf TrigAnalysisTest.conf</options_atn>
<timelimit>30</timelimit>
@@ -212,6 +211,17 @@
</expectations>
</TEST>
+ <TEST name="AthenaTrigAOD_TrigEDMAuxCheck" type="script" suite="tat_MCSlim">
+ <options_atn>trigtest.pl --test AthenaTrigAOD_TrigEDMAuxCheck --run AthenaTrigAOD_TrigEDMAuxCheck --conf TrigAnalysisTest.conf</options_atn>
+ <timelimit>30</timelimit>
+ <author>TrigAnalysis validation</author>
+ <project_exclude>AthAnalysis</project_exclude>
+ <expectations>
+ <errorMessage>FAILURE </errorMessage>
+ <returnValue>0</returnValue>
+ </expectations>
+ </TEST>
+
<TEST name="AthenaTrigAOD_TrigDecTool" type="script" suite="tat_MCSlim">
<options_atn>trigtest.pl --test AthenaTrigAOD_TrigDecTool --run AthenaTrigAOD_TrigDecTool --conf TrigAnalysisTest.conf</options_atn>
<timelimit>30</timelimit>
@@ -349,7 +359,7 @@
</doc>
<displayName>RDOtoAOD_Physics</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -364,7 +374,7 @@
</doc>
<displayName>RDOtoAOD_MC</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -379,7 +389,7 @@
</doc>
<displayName>RDOtoESDAOD_MC</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoESDAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -394,7 +404,7 @@
</doc>
<displayName>RDOtoESDAOD_Physics</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='Physics_pp_v5';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoESDAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -413,7 +423,7 @@
<doc> Menu: MC_pp_v6 Sample: top - produces AOD 100 events</doc>
<displayName>RDOtoAOD_MC_pp_v6</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAOD.py</options>
<group>TrigAnalysisTestIOTests</group>
@@ -499,7 +509,7 @@
<doc> Menu: MC_pp_v6 Sample: top - produces AOD 100 events</doc>
<displayName>RDOtoAOD_MC_pp_v6</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAOD.py</options>
<group>TrigAnalysisTestIOTests</group>
@@ -518,7 +528,7 @@
<doc> Menu: MC_pp_v6 Sample: top - produces AOD 100 events</doc>
<displayName>RDOtoAOD_MC_pp_v6</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAOD.py</options>
<group>TrigAnalysisTestIOTests</group>
@@ -627,13 +637,13 @@
- <athena userJobId="RDOtoAOD_MC_pp_v6_loose_mc_prescale" doMonitoring="True">
+ <!--athena userJobId="RDOtoAOD_MC_pp_v6_loose_mc_prescale" doMonitoring="True">
<doc>
Menu: MC_pp_v6_loose_mc_prescale Sample: top - produces AOD 100 events
</doc>
<displayName>RDOtoAOD_MC_pp_v6_loose_mc_prescale</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6_loose_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6_loose_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -648,7 +658,7 @@
</doc>
<displayName>RDOtoAOD_MC_pp_v6_tight_mc_prescale</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -664,7 +674,7 @@
</doc>
<displayName>RDOtoAOD_MC_pp_v6_1000</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(1000);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(1000);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -711,7 +721,7 @@
</doc>
<displayName>RDOtoAODSLIM_MC_pp_v6_tight_mc_prescale</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoAODSLIM.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -726,7 +736,7 @@
</doc>
<displayName>RDOtoESDAOD_MC_pp_v6_loose_mc_prescale</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6_loose_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6_loose_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoESDAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -741,7 +751,7 @@
</doc>
<displayName>RDOtoESDAOD_MC_pp_v6_tight_mc_prescale</displayName>
<commandLineFlags>
- RunningRTT=TRUE;menu='MC_pp_v6_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r6727_tid05522624_00';fileRange=[1,2]
+ RunningRTT=TRUE;menu='MC_pp_v6_tight_mc_prescale';jp.AthenaCommonFlags.EvtMax.set_Value_and_Lock(100);jp.Rec.OutputLevel=WARNING;LVL1OutputLevel=WARNING;HLTOutputLevel=WARNING;dsName='/eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/valid1.110401.PowhegPythia_P2012_ttbar_nonallhad.recon.RDO.e3099_s2578_r7572_tid07644622_00';fileRange=[1,2]
</commandLineFlags>
<options>testAthenaTrigRDOtoESDAOD.py</options>
<package>Trigger/TrigValidation/TrigAnalysisTest</package>
@@ -763,7 +773,7 @@
<group>TrigAnalysisTestIOTests</group>
<queue>long</queue>
<alwaysRunPostProc />
- </athena>
+ </athena-->
</jobList>
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/ut_validate_run1_bs_to_xaod.cxx b/Trigger/TrigValidation/TrigAnalysisTest/test/ut_validate_run1_bs_to_xaod.cxx
index 04b260ee150ae2c7d40b373f2ec74f1193516d09..81254707074048e6ee9d123a4ec12ce507b9a1ac 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/test/ut_validate_run1_bs_to_xaod.cxx
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/ut_validate_run1_bs_to_xaod.cxx
@@ -29,8 +29,9 @@ int main()
s_nightly_aod_yesterday.Form("/afs/cern.ch/atlas/software/builds/nightlies/20.7.X-VAL/AtlasAnalysis/rel_%i/NICOS_area/NICOS_atntest207XVAL64BS6G49AnlOpt/triganalysistest_testconfiguration_work/TrigHLT_Run1BStoxAOD/myAOD.pool.root", i_yesterday);
std::cout << "the path for AOD from yesterday's ATN is: " << s_nightly_aod_yesterday << std::endl;
// use this file if the ATN test upstream was not successful
+ // it is also used for ROOTCORE_RELEASE_SERIES = 23
TString s_ref_file = "root://eosatlas//eos/atlas/atlascerngroupdisk/trig-daq/validation/test_data/data12_xAODmadeWithAtlasAnalysis207XVAL151124_forATNAnalysisBase.root";
-
+
std::cout << "check if the ATN output file exists..." << std::endl;
Long_t id,size,flags,modtime;
TString s_file = "";
@@ -41,6 +42,13 @@ int main()
s_file = s_nightly_aod_yesterday;
}
+ // if this is AnalysisBase,2.3, it won't work with the root file prepared in current 20.7.X-VAL due to different xAOD schema version
+ int rc_release = atoi(gSystem->Getenv("ROOTCORE_RELEASE_SERIES"));
+ if(rc_release == 23) {
+ std::cout << "This is ROOTCORE_RELEASE_SERIES = 23, will use the corresponding input file" << std::endl;
+ s_file = s_ref_file;
+ }
+
std::cout << s_file << " will be used as the input for this test" << std::endl;
gSystem->Setenv("ROOTCORE_TEST_FILE", s_file);