diff --git a/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
new file mode 100755
index 0000000000000000000000000000000000000000..20b559c737ff88b85784f139a1d2cdacf3e97245
--- /dev/null
+++ b/Trigger/TrigValidation/TrigAnalysisTest/test/test_trigAna_BStoBStoESDAOD_mt1_build.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+# art-description: Run Trigger on data with athena and write ByteStream output, then run offline reco
+# art-type: build
+# art-include: master/Athena
+
+from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+from TrigAnalysisTest.TrigAnalysisSteps import add_analysis_steps
+
+def findFile(pattern):
+ '''Bash inline file name finder'''
+ return '`find . -name \'{:s}\' | tail -n 1`'.format(pattern)
+
+# Run athena BS->BS job
+BStoBS = ExecStep.ExecStep("BStoBS")
+BStoBS.type = 'athena'
+BStoBS.job_options = 'TriggerJobOpts/runHLT_standalone.py'
+BStoBS.input = 'data'
+BStoBS.threads = 1
+BStoBS.args += ' -c "setMenu=\'LS2_v1\';doWriteBS=True;doWriteRDOTrigger=False;forceEnableAllChains=True;"'
+
+# Extract the Main stream data
+filterBS = ExecStep.ExecStep('FilterBS')
+filterBS.type = 'other'
+filterBS.executable = 'athenaHLT-select-PEB-stream.py'
+filterBS.input = ''
+filterBS.args = '-s Main ' + findFile('data_test.*.Single_Stream.daq.RAW.*.data')
+
+# Reconstruction step, BS->ESD->AOD
+recoPreExec = ' '.join([
+ "from TriggerJobOpts.TriggerFlags import TriggerFlags;",
+ "TriggerFlags.configForStartup=\'HLToffline\';",
+ "TriggerFlags.triggerMenuSetup=\'PhysicsP1_pp_run3_v1\';",
+ "TriggerFlags.inputHLTconfigFile.set_Value_and_Lock(\'NONE\');",
+ "TriggerFlags.AODEDMSet.set_Value_and_Lock(\'AODFULL\');"])
+reco = ExecStep.ExecStep('Tier0Reco')
+reco.type = 'Reco_tf'
+reco.threads = 1
+reco.input = ''
+reco.explicit_input = True
+reco.args = '--inputBSFile=' + findFile('*.physics_Main*.data') # output of the previous step
+reco.args += ' --outputESDFile=ESD.pool.root --outputAODFile=AOD.pool.root'
+reco.args += ' --conditionsTag=\'CONDBR2-BLKPA-2018-11\' --geometryVersion=\'ATLAS-R2-2016-01-00-01\''
+reco.args += ' --preExec="{:s}"'.format(recoPreExec)
+reco.args += ' --postInclude="TriggerTest/disableChronoStatSvcPrintout.py"'
+
+# Test definition
+test = Test.Test()
+test.art_type = 'build'
+test.exec_steps = [BStoBS, filterBS, reco]
+test.check_steps = CheckSteps.default_check_steps(test)
+add_analysis_steps(test)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index a58a97fef84b47c8644b727b4eec72755a826ac1..62a312769c9bcf3477e446ac516dd0042e6d8011 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -24,7 +24,7 @@ atlas_add_component( TrigUpgradeTest
atlas_install_joboptions( share/*.py )
atlas_install_data( share/*.ref share/*.conf )
atlas_install_python_modules( python/*.py )
-atlas_install_scripts( test/exec*.sh test/test*.sh test/test*.py )
+atlas_install_scripts( test/exec*.sh test/test*.sh )
# Check python syntax:
atlas_add_test( flake8
@@ -36,22 +36,6 @@ atlas_add_test( ViewSchedule1 SCRIPT test/test_view_schedule.sh ENVIRONMENT THR
atlas_add_test( ViewSchedule2 SCRIPT test/test_view_schedule.sh ENVIRONMENT THREADS=2 POST_EXEC_SCRIPT nopost.sh )
atlas_add_test( ViewSchedule64 SCRIPT test/test_view_schedule.sh ENVIRONMENT THREADS=64 POST_EXEC_SCRIPT nopost.sh )
-
-# Helper to define unit tests running in a separate directory
-# The test name is derived from the test script name: test/test_${name}.sh
-function( _add_test name )
- set( rundir ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_${name} )
- file( REMOVE_RECURSE ${rundir} ) # cleanup to avoid interference with previous run
- file( MAKE_DIRECTORY ${rundir} )
- atlas_add_test( ${name}
- SCRIPT test/test_${name}.sh
- PROPERTIES TIMEOUT 1000
- PROPERTIES WORKING_DIRECTORY ${rundir}
- ${ARGN} )
-endfunction( _add_test )
-
-
-
# Unit tests of the test scripts
atlas_add_test( flake8_test_dir
SCRIPT flake8 --select=ATL,F,E7,E9,W6 --enable-extension=ATL900,ATL901 ${CMAKE_CURRENT_SOURCE_DIR}/test
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/HLTCF.py b/Trigger/TrigValidation/TrigUpgradeTest/share/HLTCF.py
deleted file mode 100644
index 78fe78142a09a6c4ac2d1a3262752433b3474a66..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/HLTCF.py
+++ /dev/null
@@ -1,104 +0,0 @@
-
-##### obsolete functions for ctests
-
-allAlgs={}
-def useExisting(name):
- global allAlgs
- return allAlgs[name]
-
-def AlgExisting(name):
- global allAlgs
- return name in allAlgs
-
-
-def remember(name, instance):
- global allAlgs
- allAlgs[name] = instance
- return instance
-
-
-
-
-from AthenaCommon.CFElements import parOR, seqAND, stepSeq
-from TriggerMenuMT.HLTMenuConfig.Menu.HLTCFConfig import *
-
-def seqFilter(name, Inputs=[], Outputs=[], Chains=[]):
- from DecisionHandling.DecisionHandlingConf import RoRSeqFilter, DumpDecisions
- global allAlgs
- input_list = list(set(Inputs))
- output_list = list (set(Outputs))
- chain_list = list (set(Chains))
- fname = "F_"+name
- f = RoRSeqFilter(fname, Input=input_list, Output=output_list, Chains=chain_list)
- if "Step1" in name: # so that we see events running through, will be gone once L1 emulation is included
- f.AlwaysPass = True
- allAlgs[name] = f
- return f
-
-
-
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestRecoAlg
-def TestRecoAlg(name, Output, FileName="noreco.dat", Input=""):
- fname = "R_"+name
- a = HLTTest__TestRecoAlg(fname, FileName=FileName, Output=Output, Input=Input)
- allAlgs[name] = a
- return a
-
-
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoAlg
-def TestHypoAlg(name, Input, Output):
- fname = "H_"+name
- h = HLTTest__TestHypoAlg(fname, HypoInputDecisions=Input, HypoOutputDecisions=Output)
- allAlgs[name] = h
- return h
-
-
-def merger(name, Inputs, Output ):
- from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestInputMaker
- outdec=["%s_decision"%i for i in Output]
- return remember(name, HLTTest__TestInputMaker( "M_"+name, InputMakerInputDecisions=Inputs, Output=Output, InputMakerOutputDecisions=outdec, LinkName="initialRoI" ) )
-
-
-def addSteps(s):
- return seqAND("HLTChainsSeq", s)
-
-
-
-
-
-##### new
-
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestRecoAlg
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoAlg
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoTool
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestComboHypoAlg
-
-
-def TestHypoTool(name, prop):
- threshold_value=''.join(filter(lambda x: x.isdigit(), name))
- value = int(threshold_value)*1000
- h = HLTTest__TestHypoTool(name, Threshold=value, Property=prop)
- return h
-
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestInputMaker
-def InputMakerAlg(name):
- return HLTTest__TestInputMaker(name, LinkName="initialRoI")
-
-
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestRoRSeqFilter
-def SeqFilterNew(name):
- return HLTTest__TestRoRSeqFilter(name)
-
-
-def TestRecAlgNew(name, FileName="noreco.dat"):
- return HLTTest__TestRecoAlg(name=name, FileName=FileName)
-
-def TestHypoAlgNew(name):
- return HLTTest__TestHypoAlg(name=name)
-
-def muTestHypoTool(name):
- return TestHypoTool(name, "pt")
-
-def elTestHypoTool(name):
- return TestHypoTool(name, "et")
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/L1CF.py b/Trigger/TrigValidation/TrigUpgradeTest/share/L1CF.py
deleted file mode 100644
index 2df71c60f61e694fd3ed3b466a4d08ba3f9fda2c..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/L1CF.py
+++ /dev/null
@@ -1,33 +0,0 @@
-from AthenaCommon.AlgSequence import AlgSequence, AthSequencer
-topSequence = AlgSequence()
-
-from AthenaCommon.CFElements import parOR, seqAND
-
-TopHLTSeq = seqAND("TopHLTSeq")
-topSequence += TopHLTSeq
-
-
-
-
-L1UnpackingSeq = parOR("L1UnpackingSeq")
-from L1Decoder.L1DecoderConf import CTPUnpackingEmulationTool, RoIsUnpackingEmulationTool, L1Decoder
-l1Decoder = L1Decoder( RoIBResult="", L1TriggerResult="" )
-
-ctpUnpacker = CTPUnpackingEmulationTool( ForceEnableAllChains=False , InputFilename="ctp.dat" )
-#ctpUnpacker.CTPToChainMapping = [ "0:HLT_g100", "1:HLT_e20", "2:HLT_mu20", "3:HLT_2mu8", "3:HLT_mu8", "33:HLT_2mu8", "15:HLT_mu8_e8" ]
-l1Decoder.ctpUnpacker = ctpUnpacker
-
-from L1Decoder.L1DecoderConfig import mapThresholdToL1DecisionCollection, mapThresholdToL1RoICollection
-
-emUnpacker = RoIsUnpackingEmulationTool("EMRoIsUnpackingTool", InputFilename="l1emroi.dat", OutputTrigRoIs=mapThresholdToL1RoICollection("EM"), Decisions=mapThresholdToL1DecisionCollection("EM") )
-emUnpacker.ThresholdToChainMapping = ["EM7 : HLT_mu8_e8", "EM20 : HLT_e20", "EM50 : HLT_2g50", "EM100 : HLT_g100" ]
-
-muUnpacker = RoIsUnpackingEmulationTool("MURoIsUnpackingTool", InputFilename="l1muroi.dat", OutputTrigRoIs=mapThresholdToL1RoICollection("MU"), Decisions=mapThresholdToL1DecisionCollection("MU") )
-muUnpacker.ThresholdToChainMapping = ["MU6 : HLT_mu6", "MU8 : HLT_mu8", "MU8 : HLT_2mu8", "MU8 : HLT_mu8_e8", "MU10 : HLT_mu20", "EM100 : HLT_g100" ]
-
-l1Decoder.roiUnpackers = [emUnpacker, muUnpacker]
-
-#print l1Decoder
-L1UnpackingSeq += l1Decoder
-
-TopHLTSeq += L1UnpackingSeq
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/cfTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/cfTest.py
deleted file mode 100644
index d6bdfaf53397a7ca2c6fc309888234053202da46..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/cfTest.py
+++ /dev/null
@@ -1,184 +0,0 @@
-###############################################################
-#
-# Job options file
-#
-# Based on AthExStoreGateExamples
-#
-#==============================================================
-
-#--------------------------------------------------------------
-# ATLAS default Application Configuration options
-#--------------------------------------------------------------
-
-# Configure the scheduler
-from AthenaCommon.AlgScheduler import AlgScheduler
-AlgScheduler.ShowControlFlow( True )
-AlgScheduler.ShowDataFlow( True )
-
-# include( "ByteStreamCnvSvc/BSEventStorageEventSelector_jobOptions.py" )
-# svcMgr.ByteStreamInputSvc.FullFileName = [ "./input.data" ]
-
-# # This is the list of proxies to set up so that retrieval attempt will trigger the BS conversion
-# if not hasattr( svcMgr, "ByteStreamAddressProviderSvc" ):
-# from ByteStreamCnvSvcBase.ByteStreamCnvSvcBaseConf import ByteStreamAddressProviderSvc
-# svcMgr += ByteStreamAddressProviderSvc()
-# svcMgr.ByteStreamAddressProviderSvc.TypeNames += [ "ROIB::RoIBResult/RoIBResult" ]
-
-# Event-level algorithm sequence
-
-
-# from SGComps.SGCompsConf import SGInputLoader
-# topSequence += SGInputLoader( OutputLevel=INFO, ShowEventDump=False )
-# topSequence.SGInputLoader.Load = [ ('ROIB::RoIBResult','RoIBResult') ]
-
-from AthenaCommon.CFElements import stepSeq
-
-
-data = {'noreco': [';', ';', ';']} # in the lists there are the events
-
-data['emclusters'] = ['eta:1,phi:1,et:180000; eta:1,phi:-1.2,et:35000;',
- 'eta:0.5,phi:0,et:120000; eta:1,phi:-1.2,et:65000;',
- 'eta:-0.6,phi:1.7,et:9000;']
-
-data['msmu'] = [';',
- 'eta:-1.2,phi:0.7,pt:6500; eta:-1.1,phi:0.6,pt:8500;',
- 'eta:-1.7,phi:-0.2,pt:9500;']
-
-data['ctp'] = [ 'HLT_g100', 'HLT_2g50 HLT_e20', 'HLT_mu20 HLT_mu8 HLT_2mu8 HLT_mu8_e8' ]
-
-data['l1emroi'] = ['1,1,0,EM3,EM7,EM15,EM20,EM50,EM100; 1,-1.2,0,EM3,EM7',
- '-0.6,0.2,0,EM3,EM7,EM15,EM20,EM50,EM100; 1,-1.1,0,EM3,EM7,EM15,EM20,EM50',
- '-0.6,1.5,0,EM3,EM7,EM7']
-
-data['l1muroi'] = ['0,0,0,MU0;',
- '-1,0.5,0,MU6,MU8; -1,0.5,0,MU6,MU8,MU10',
- '-1.5,-0.1,0,MU6,MU8']
-
-data['tracks'] = ['eta:1,phi:1,pt:120000; eta:1,phi:-1.2,et:32000;',
- 'eta:0.5,phi:0,pt:130000; eta:1,phi:-1.2,pt:60000;eta:-1.2,phi:0.7,pt:6700; eta:-1.1,phi:0.6,pt:8600;',
- 'eta:-0.6,phi:1.7,et:9000;'] # no MU track for MS candidate 'eta:-1.7,phi:-0.2,pt:9500;'
-
-data['mucomb'] = [';',
- 'eta:-1.2,phi:0.7,pt:6600; eta:-1.1,phi:0.6,pt:8600;',
- ';']
-
-data['electrons'] = ['eta:1,phi:1,pt:120000; eta:1,phi:-1.2,et:32000;',
- ';',
- ';']
-data['photons'] = ['eta:1,phi:1,pt:130000;',
- ';',
- ';']
-
-
-from TrigUpgradeTest.TestUtils import writeEmulationFiles
-writeEmulationFiles(data)
-
-include("TrigUpgradeTest/L1CF.py")
-include("TrigUpgradeTest/HLTCF.py")
-
-
-
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestHypoTool
-def emHTool(name):
- v = int(name[5:])*1000
- return HLTTest__TestHypoTool(name, OutputLevel=DEBUG, Threshold=v, Property="et")
-
-
-muChains = [ 'HLT_mu20', 'HLT_mu8', 'HLT_2mu8' ]
-eChains = [ 'HLT_e20' ]
-gChains = [ 'HLT_g100', 'HLT_2g50' ]
-mueChains = [ 'HLT_mu8_e8' ]
-
-
-from L1Decoder.L1DecoderConfig import mapThresholdToL1DecisionCollection, mapThresholdToL1RoICollection
-
-steps = [ parOR("step%i" % i) for i in range(5)]
-stepNo = 0
-steps[stepNo] += seqFilter( "Step1MU", Inputs=[mapThresholdToL1DecisionCollection("MU")], Outputs=["step0MU"], Chains=muChains )
-steps[stepNo] += seqFilter( "Step1MU_E", Inputs=[mapThresholdToL1DecisionCollection("MU"), mapThresholdToL1DecisionCollection("EM")], Outputs=["step0MU","step0EM"], Chains=mueChains )
-steps[stepNo] += seqFilter( "Step1EM", Inputs=[mapThresholdToL1DecisionCollection("EM")], Outputs=["step0EM"], Chains=(eChains + gChains) )
-
-emHypo = hypo("Step1ElGamHypo", Input="EMClusters", Output="EMDecisions")
-emHypoTools = [ emHTool("HLT_e2"), emHTool("HLT_e3"), emHTool("HLT_e5"),
- emHTool("HLT_g5"), emHTool("HLT_g7"), emHTool("HLT_g15") ]
-emHypo.HypoTools = emHypoTools
-emHypo += emHypoTools
-
-def msMuHTool(name):
- v = int(name[6:])*1000
- return HLTTest__TestHypoTool(name, OutputLevel=DEBUG, Threshold=v, Property="pt")
-
-msMuHypo = hypo("Step1MuHypo", Input="MSMuons", Output="MSMUonDecisions")
-msMuHypoTools = [ msMuHTool("HLT_mu6"), msMuHTool("HLT_mu8"), msMuHTool("HLT_mu10") ]
-msMuHypo.HypoTools = msMuHypoTools
-msMuHypo += msMuHypoTools
-
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestComboHypoAlg
-
-stepNo += 1
-em1 = stepSeq( "em1", useExisting("Step1EM"), [ reco("EMRoIs", Output="EMRoIs"),
- reco("CaloClustering", FileName="emclusters.dat", Output="EMClusters"),
- emHypo ] )
-steps[stepNo] += em1
-mu1 = stepSeq("mu1", useExisting("Step1MU"), [ reco("MURoIs", Output="MURoIs"),
- reco("muMSRecAlg", FileName="msmu.dat", Output="MSMuons"),
- msMuHypo ] )
-steps[stepNo] += mu1
-
-mue1 = stepSeq("mue1", useExisting("Step1MU_E"), [ useExisting("CaloClustering"), useExisting("muMSRecAlg"),
- HLTTest__TestComboHypoAlg("mueHypo1", OutputLevel=DEBUG, Input1="EMClusters", Input2="MSMuons",
- Output1="step1MUEDecisionsEM", Output2="step1MUEDecisionsMU",
- Property1="et", Property2="pt", Threshold1=8000, Threshold2=8000,
- DecisionLabel="HLT_mu8_e8" ) ])
-steps[stepNo] += mue1
-
-
-stepNo += 1
-steps[stepNo] += seqFilter("Step2MU", Inputs=["step1MUDecisions"], Outputs=["step2MU"], Chains=muChains )
-steps[stepNo] += seqFilter("Step2MU_E", Inputs=[ "step1MUEDecisionsEM", "step1MUEDecisionsMU"], Outputs=["step2MUE_EM", "step2MUE_MU"], Chains=mueChains )
-steps[stepNo] += seqFilter("Step2E", Inputs=["step1EDecisions"], Outputs=["step2E"], Chains=eChains )
-steps[stepNo] += seqFilter("Step2G", Inputs=["step1GDecisions"], Outputs=["step2G"], Chains=gChains )
-
-
-muCombHypo = hypo("Step2MuHypo", Input="CombMuons", Output="CombMuonDecisions")
-muCombHypoTools = [ msMuHTool("HLT_mu6"), msMuHTool("HLT_mu8"), msMuHTool("HLT_mu10") ] # this tools are the same as MS ones,
-muCombHypo.HypoTools = muCombHypoTools
-muCombHypo += muCombHypoTools
-
-
-eHypo = hypo("Step2ElHypo", Input="Electrons", Output="ElectronDecisions")
-eHypoTools = [ emHTool("HLT_e2"), emHTool("HLT_e3"), emHTool("HLT_e5") ]
-eHypo.HypoTools = emHypoTools
-eHypo += emHypoTools
-
-gHypo = hypo("Step2GammHypo", Input="Photons", Output="PhotonDecisions")
-gHypoTools = [ emHTool("HLT_e2"), emHTool("HLT_e3"), emHTool("HLT_e5") ]
-gHypo.HypoTools = emHypoTools
-gHypo += emHypoTools
-
-from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestMerger
-def merger(name, Inputs, Output ):
- m = HLTTest__TestMerger( "M_"+name, Inputs=Inputs, Output=Output )
- allAlgs[name] = m
- return m
-
-stepNo += 1
-mu2 = stepSeq("mu2", useExisting("Step2MU"), [ reco("TrigFastTrackFinder", FileName="tracks.dat", Output="Tracks"), reco("MuonRecAlg", FileName="mucomb.dat", Output="CombMuons"), muCombHypo ] )
-steps[stepNo] += mu2
-
-e2 = stepSeq( "e2" , useExisting("Step2E"), [ useExisting("TrigFastTrackFinder"), reco("ElectronRecAlg", FileName="electrons.dat", Output="Electrons"), eHypo ] )
-steps[stepNo] += e2
-
-g2 = stepSeq("g2", useExisting("Step2G"), [ reco("GRoIs", "noreco.dat"), reco("PhotonRecAlg", FileName="photons.dat", Output="Photons"), gHypo ])
-steps[stepNo] += g2
-stepNo += 1
-
-#mue2 = stepSeq("mue2", useExisting("Step2MU_E"), [ useExisting("TrkRoIs", "noreco.dat"), useExisting("TrigFastTrackFinder"), reco("MuonRecAlg", "mucomb.dat"), reco("ElectronRecAlg"), hypo("Step2MuEHypo") ])
-#steps[stepNo] += mue2
-
-
-theApp.EvtMax = 3
-
-TopHLTSeq += addSteps(steps)
-
-
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/checkAOD.py b/Trigger/TrigValidation/TrigUpgradeTest/share/checkAOD.py
deleted file mode 100644
index 2c066b6d5b5780624bb10704cf05edb9b26371fe..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/checkAOD.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import AthenaPoolCnvSvc.ReadAthenaPool
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1")
-Stream1.OutputFile = "ESDout.pool.root"
-
-svcMgr.EventSelector.InputCollections = [ "/eos/atlas/atlascerngroupdisk/data-art/grid-output/21.0/Athena/x86_64-slc6-gcc62-opt/2018-12-08T2201/TrigAnalysisTest/test_physics_pp_v7_rdotoesdaod_grid/AOD.pool.root" ]
-#svcMgr.EventSelector.InputCollections = [ "myESD.pool.root" ]
-from TrigValAlgs.TrigValAlgsConf import TrigEDMChecker
-MessageSvc.defaultLimit = 9999999
-MessageSvc.useColors = True
-checker = TrigEDMChecker()
-checker.OutputLevel = DEBUG
-checker.doDumpAll = False
-checker.doDumpStoreGate = False
-checker.doDumpNavigation = True
-checker.doDumpTrigCompsiteNavigation = True
-
-checker.Decisions = "exportTest"
-checker.dumpTrigCompositeContainers = [ "exportTest" ]
-
-
-from AthenaCommon.AppMgr import topSequence
-topSequence += checker
-
-theApp.EvtMax = 10
-svcMgr.EventSelector.SkipEvents = 9
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/checkESD.py b/Trigger/TrigValidation/TrigUpgradeTest/share/checkESD.py
deleted file mode 100644
index d1f94bfe668ffa108f99f9a2d187a61c64677bb8..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/checkESD.py
+++ /dev/null
@@ -1,36 +0,0 @@
-import AthenaPoolCnvSvc.ReadAthenaPool
-from AthenaPoolCnvSvc.WriteAthenaPool import AthenaPoolOutputStream
-Stream1 = AthenaPoolOutputStream( "Stream1")
-Stream1.OutputFile = "ESDout.pool.root"
-
-svcMgr.EventSelector.InputCollections = [ "myESD.pool.root" ]
-
-from AthenaCommon.AppMgr import topSequence
-from AthenaCommon.AppMgr import ToolSvc
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
-from TrigConfxAOD.TrigConfxAODConf import TrigConf__xAODConfigSvc
-from TrigDecisionTool.TrigDecisionToolConf import Trig__TrigDecisionTool
-from TrigEDMConfig.TriggerEDM import EDMLibraries
-
-cvgsvc = TrigConf__xAODConfigSvc('xAODConfigSvc')
-svcMgr += cvgsvc
-
-tdt = Trig__TrigDecisionTool('TrigDecisionTool')
-tdt.TrigConfigSvc = cvgsvc
-tdt.NavigationFormat = "TrigComposite"
-tdt.Navigation.Dlls = [e for e in EDMLibraries if 'TPCnv' not in e]
-ToolSvc += tdt
-
-from TrigValAlgs.TrigValAlgsConf import TrigEDMChecker
-MessageSvc.defaultLimit = 9999999
-MessageSvc.useColors = True
-checker = TrigEDMChecker()
-checker.OutputLevel = DEBUG
-checker.doDumpAll = False
-checker.doDumpxAODTrigElectronContainer = True
-checker.doDumpxAODTrackParticle = True
-checker.doDumpTrigCompsiteNavigation = True
-checker.doDumpAllTrigComposite = True
-checker.doDumpStoreGate = False
-checker.doTDTCheck = True
-topSequence += checker
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/dummy_regtest.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/dummy_regtest.ref
deleted file mode 100644
index ef4f2acce475c182a57d3427074d13f44fdd91d9..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/dummy_regtest.ref
+++ /dev/null
@@ -1 +0,0 @@
-Py:Athena INFO leaving with code 0: "successful run"
\ No newline at end of file
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
deleted file mode 100644
index 7d1f0225de17f19af765708c094c38a7e313141a..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref
+++ /dev/null
@@ -1,438 +0,0 @@
-TrigSignatureMoniMT INFO HLT_2e17_etcut_L12EM15VH #3136730292
-TrigSignatureMoniMT INFO -- #3136730292 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3136730292 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_2e17_lhvloose_L12EM3 #1767768251
-TrigSignatureMoniMT INFO -- #1767768251 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1767768251 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_2e3_etcut_L12EM3 #2613484113
-TrigSignatureMoniMT INFO -- #2613484113 Events 20 20 13 13 13 - - 13
-TrigSignatureMoniMT INFO -- #2613484113 Features 46 155 86 - -
-TrigSignatureMoniMT INFO HLT_2g20_tight_L12EM20VH #2426612258
-TrigSignatureMoniMT INFO -- #2426612258 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2426612258 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_2g35_etcut_L12EM20VH #58053304
-TrigSignatureMoniMT INFO -- #58053304 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #58053304 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_2g35_medium_L12EM20VH #3965466087
-TrigSignatureMoniMT INFO -- #3965466087 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3965466087 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_2j330_a10t_lcw_jes_35smcINF_L1J100 #1295975955
-TrigSignatureMoniMT INFO -- #1295975955 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1295975955 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 #2619091790
-TrigSignatureMoniMT INFO -- #2619091790 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2619091790 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_2mu15_L12MU10 #557204938
-TrigSignatureMoniMT INFO -- #557204938 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #557204938 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_2mu4_muonqual_L12MU4 #1584776935
-TrigSignatureMoniMT INFO -- #1584776935 Events 20 20 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1584776935 Features 4 0 0 0 -
-TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 #2046267508
-TrigSignatureMoniMT INFO -- #2046267508 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2046267508 Features 0 0 - - -
-TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 #1316992871
-TrigSignatureMoniMT INFO -- #1316992871 Events 20 20 0 0 0 0 0 0
-TrigSignatureMoniMT INFO -- #1316992871 Features 0 0 0 0 0
-TrigSignatureMoniMT INFO HLT_2mu6_Dr_L12MU4 #3304584056
-TrigSignatureMoniMT INFO -- #3304584056 Events 20 20 1 0 - - - 0
-TrigSignatureMoniMT INFO -- #3304584056 Features 4 0 - - -
-TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 #1747073535
-TrigSignatureMoniMT INFO -- #1747073535 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1747073535 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_2mu6_muonqual_L12MU6 #2398136098
-TrigSignatureMoniMT INFO -- #2398136098 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2398136098 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_3j200_L1J100 #2199422919
-TrigSignatureMoniMT INFO -- #2199422919 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2199422919 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_3j200_L1J20 #493765146
-TrigSignatureMoniMT INFO -- #493765146 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #493765146 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_3mu6_L13MU6 #1832399408
-TrigSignatureMoniMT INFO -- #1832399408 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1832399408 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_3mu6_msonly_L13MU6 #1199773318
-TrigSignatureMoniMT INFO -- #1199773318 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1199773318 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_3mu8_msonly_L13MU6 #424835335
-TrigSignatureMoniMT INFO -- #424835335 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #424835335 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_4mu4_L14MU4 #1834383636
-TrigSignatureMoniMT INFO -- #1834383636 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1834383636 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_5j70_0eta240_L14J20 #1175391812
-TrigSignatureMoniMT INFO -- #1175391812 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1175391812 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_beamspot_allTE_trkfast_BeamSpotPEB_L1J15 #3989372080
-TrigSignatureMoniMT INFO -- #3989372080 Events 20 20 20 20 - - - 20
-TrigSignatureMoniMT INFO -- #3989372080 Features 20 20 - - -
-TrigSignatureMoniMT INFO HLT_costmonitor_CostMonDS_L1All #843341480
-TrigSignatureMoniMT INFO -- #843341480 Events 20 20 20 20 - - - 20
-TrigSignatureMoniMT INFO -- #843341480 Features 20 20 - - -
-TrigSignatureMoniMT INFO HLT_e140_lhloose_L1EM24VHI #2512605388
-TrigSignatureMoniMT INFO -- #2512605388 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #2512605388 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_e26_etcut_L1EM22VHI #1703681121
-TrigSignatureMoniMT INFO -- #1703681121 Events 20 20 1 1 0 - - 0
-TrigSignatureMoniMT INFO -- #1703681121 Features 1 3 0 - -
-TrigSignatureMoniMT INFO HLT_e26_lhtight_L1EM24VHI #3494457106
-TrigSignatureMoniMT INFO -- #3494457106 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3494457106 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_e300_etcut_L1EM24VHI #3481091923
-TrigSignatureMoniMT INFO -- #3481091923 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3481091923 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_e3_etcut1step_mu6fast_L1EM8I_MU10 #2086577378
-TrigSignatureMoniMT INFO -- #2086577378 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2086577378 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_e3_etcut_L1EM3 #683953566
-TrigSignatureMoniMT INFO -- #683953566 Events 20 20 15 14 14 - - 14
-TrigSignatureMoniMT INFO -- #683953566 Features 48 156 87 - -
-TrigSignatureMoniMT INFO HLT_e5_etcut_L1EM3 #324908483
-TrigSignatureMoniMT INFO -- #324908483 Events 20 20 13 13 13 - - 13
-TrigSignatureMoniMT INFO -- #324908483 Features 41 141 47 - -
-TrigSignatureMoniMT INFO HLT_e5_lhloose_noringer_L1EM3 #1053337356
-TrigSignatureMoniMT INFO -- #1053337356 Events 20 20 10 10 10 0 - 0
-TrigSignatureMoniMT INFO -- #1053337356 Features 15 48 29 0 -
-TrigSignatureMoniMT INFO HLT_e5_lhmedium_noringer_L1EM3 #176627878
-TrigSignatureMoniMT INFO -- #176627878 Events 20 20 9 9 9 0 - 0
-TrigSignatureMoniMT INFO -- #176627878 Features 13 49 28 0 -
-TrigSignatureMoniMT INFO HLT_e5_lhtight_noringer_L1EM3 #2758326765
-TrigSignatureMoniMT INFO -- #2758326765 Events 20 20 9 9 9 0 - 0
-TrigSignatureMoniMT INFO -- #2758326765 Features 13 49 28 0 -
-TrigSignatureMoniMT INFO HLT_e60_lhmedium_L1EM24VHI #713054523
-TrigSignatureMoniMT INFO -- #713054523 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #713054523 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_e7_etcut_L1EM3 #1959043579
-TrigSignatureMoniMT INFO -- #1959043579 Events 20 20 13 13 11 - - 11
-TrigSignatureMoniMT INFO -- #1959043579 Features 26 90 20 - -
-TrigSignatureMoniMT INFO HLT_g140_etcut_L1EM24VHI #1045486446
-TrigSignatureMoniMT INFO -- #1045486446 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1045486446 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_g140_loose_L1EM24VHI #3534544568
-TrigSignatureMoniMT INFO -- #3534544568 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #3534544568 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_g20_etcut_LArPEB_L1EM15 #2706532790
-TrigSignatureMoniMT INFO -- #2706532790 Events 20 20 4 4 3 3 - 3
-TrigSignatureMoniMT INFO -- #2706532790 Features 5 5 4 4 -
-TrigSignatureMoniMT INFO HLT_g35_medium_g25_medium_L12EM20VH #1158879722
-TrigSignatureMoniMT INFO -- #1158879722 Events 20 20 0 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1158879722 Features 0 0 0 0 -
-TrigSignatureMoniMT INFO HLT_g5_etcut_L1EM3 #471243435
-TrigSignatureMoniMT INFO -- #471243435 Events 20 20 13 13 13 - - 13
-TrigSignatureMoniMT INFO -- #471243435 Features 41 41 50 - -
-TrigSignatureMoniMT INFO HLT_g5_etcut_LArPEB_L1EM3 #3486231698
-TrigSignatureMoniMT INFO -- #3486231698 Events 20 20 13 13 13 13 - 13
-TrigSignatureMoniMT INFO -- #3486231698 Features 41 41 50 36 -
-TrigSignatureMoniMT INFO HLT_g5_loose_L1EM3 #3230088967
-TrigSignatureMoniMT INFO -- #3230088967 Events 20 20 10 10 10 2 - 2
-TrigSignatureMoniMT INFO -- #3230088967 Features 15 15 31 2 -
-TrigSignatureMoniMT INFO HLT_g5_medium_L1EM3 #385248610
-TrigSignatureMoniMT INFO -- #385248610 Events 20 20 9 9 9 2 - 2
-TrigSignatureMoniMT INFO -- #385248610 Features 13 13 30 2 -
-TrigSignatureMoniMT INFO HLT_g5_tight_L1EM3 #3280865118
-TrigSignatureMoniMT INFO -- #3280865118 Events 20 20 9 9 9 1 - 1
-TrigSignatureMoniMT INFO -- #3280865118 Features 13 13 30 1 -
-TrigSignatureMoniMT INFO HLT_j0_vbenfSEP30etSEP34mass35SEP50fbet_L1J20 #4034799151
-TrigSignatureMoniMT INFO -- #4034799151 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #4034799151 Features 34 - - - -
-TrigSignatureMoniMT INFO HLT_j225_ftf_subjesgscIS_bmv2c1040_split_L1J100 #3992507557
-TrigSignatureMoniMT INFO -- #3992507557 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3992507557 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J20 #3084792704
-TrigSignatureMoniMT INFO -- #3084792704 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3084792704 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j260_320eta490_L1J75_31ETA49 #3769257182
-TrigSignatureMoniMT INFO -- #3769257182 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3769257182 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j275_ftf_subjesgscIS_bmv2c1060_split_L1J100 #1211559599
-TrigSignatureMoniMT INFO -- #1211559599 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1211559599 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j300_ftf_subjesgscIS_bmv2c1070_split_L1J100 #3706723666
-TrigSignatureMoniMT INFO -- #3706723666 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3706723666 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j360_ftf_subjesgscIS_bmv2c1077_split_L1J100 #1837565816
-TrigSignatureMoniMT INFO -- #1837565816 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1837565816 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_j420_L1J100 #2659902019
-TrigSignatureMoniMT INFO -- #2659902019 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2659902019 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j420_L1J20 #2205518067
-TrigSignatureMoniMT INFO -- #2205518067 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2205518067 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j420_ftf_subjesgscIS_L1J20 #4179085188
-TrigSignatureMoniMT INFO -- #4179085188 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #4179085188 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j45_L1J15 #1364976160
-TrigSignatureMoniMT INFO -- #1364976160 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #1364976160 Features 6 - - - -
-TrigSignatureMoniMT INFO HLT_j45_cssktc_nojcalib_L1J20 #3295122398
-TrigSignatureMoniMT INFO -- #3295122398 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #3295122398 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_L1J15 #868405538
-TrigSignatureMoniMT INFO -- #868405538 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #868405538 Features 6 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_csskpf_nojcalib_L1J20 #3533281867
-TrigSignatureMoniMT INFO -- #3533281867 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #3533281867 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_pf_L1J20 #1335156103
-TrigSignatureMoniMT INFO -- #1335156103 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #1335156103 Features 5 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_pf_nojcalib_L1J20 #3658890913
-TrigSignatureMoniMT INFO -- #3658890913 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #3658890913 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_011jvt_L1J15 #2857031468
-TrigSignatureMoniMT INFO -- #2857031468 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #2857031468 Features 5 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_015jvt_L1J15 #2938374624
-TrigSignatureMoniMT INFO -- #2938374624 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #2938374624 Features 5 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_059jvt_L1J15 #1593009344
-TrigSignatureMoniMT INFO -- #1593009344 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #1593009344 Features 5 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_L1J15 #3341539267
-TrigSignatureMoniMT INFO -- #3341539267 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #3341539267 Features 6 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_bmv2c1070_split_L1J20 #991419339
-TrigSignatureMoniMT INFO -- #991419339 Events 20 20 5 5 5 - - 5
-TrigSignatureMoniMT INFO -- #991419339 Features 5 5 5 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_boffperf_split_L1J20 #1961149049
-TrigSignatureMoniMT INFO -- #1961149049 Events 20 20 5 5 5 - - 5
-TrigSignatureMoniMT INFO -- #1961149049 Features 5 5 5 - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subjesgscIS_pf_L1J20 #761060030
-TrigSignatureMoniMT INFO -- #761060030 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #761060030 Features 5 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_L1J15 #1509925407
-TrigSignatureMoniMT INFO -- #1509925407 Events 20 20 6 - - - - 6
-TrigSignatureMoniMT INFO -- #1509925407 Features 6 - - - -
-TrigSignatureMoniMT INFO HLT_j45_ftf_subresjesgscIS_pf_L1J20 #4012311417
-TrigSignatureMoniMT INFO -- #4012311417 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #4012311417 Features 5 - - - -
-TrigSignatureMoniMT INFO HLT_j45_nojcalib_L1J20 #2042444294
-TrigSignatureMoniMT INFO -- #2042444294 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #2042444294 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_j45_sktc_nojcalib_L1J20 #1542468090
-TrigSignatureMoniMT INFO -- #1542468090 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #1542468090 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J100 #3327656707
-TrigSignatureMoniMT INFO -- #3327656707 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3327656707 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j460_a10_lcw_subjes_L1J20 #215408633
-TrigSignatureMoniMT INFO -- #215408633 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #215408633 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j460_a10r_L1J100 #1151767619
-TrigSignatureMoniMT INFO -- #1151767619 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1151767619 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j460_a10r_L1J20 #3875082669
-TrigSignatureMoniMT INFO -- #3875082669 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3875082669 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_30smcINF_L1J100 #2296827117
-TrigSignatureMoniMT INFO -- #2296827117 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2296827117 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j460_a10t_lcw_jes_L1J100 #436385969
-TrigSignatureMoniMT INFO -- #436385969 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #436385969 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j80_0eta240_2j60_320eta490_j0_dijetSEP80j1etSEP0j1eta240SEP80j2etSEP0j2eta240SEP700djmass_L1J20 #3634067472
-TrigSignatureMoniMT INFO -- #3634067472 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #3634067472 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j80_j60_L1J15 #582699527
-TrigSignatureMoniMT INFO -- #582699527 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #582699527 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_j85_L1J20 #510475538
-TrigSignatureMoniMT INFO -- #510475538 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #510475538 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_j85_ftf_L1J20 #877042532
-TrigSignatureMoniMT INFO -- #877042532 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #877042532 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_j85_ftf_pf_L1J20 #1538535401
-TrigSignatureMoniMT INFO -- #1538535401 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #1538535401 Features 2 - - - -
-TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED #4097312640
-TrigSignatureMoniMT INFO -- #4097312640 Events 20 20 - - - - - 19
-TrigSignatureMoniMT INFO -- #4097312640 Features - - - - -
-TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU20 #997163309
-TrigSignatureMoniMT INFO -- #997163309 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #997163309 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_mu0_muoncalib_L1MU4_EMPTY #782182242
-TrigSignatureMoniMT INFO -- #782182242 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #782182242 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_mu10_lateMu_L1MU10 #48780310
-TrigSignatureMoniMT INFO -- #48780310 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #48780310 Features 0 0 - - -
-TrigSignatureMoniMT INFO HLT_mu20_ivar_L1MU6 #2083734526
-TrigSignatureMoniMT INFO -- #2083734526 Events 20 20 1 1 1 - - 1
-TrigSignatureMoniMT INFO -- #2083734526 Features 1 1 1 - -
-TrigSignatureMoniMT INFO HLT_mu24_idperf_L1MU20 #677658909
-TrigSignatureMoniMT INFO -- #677658909 Events 20 20 1 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #677658909 Features 1 1 0 0 -
-TrigSignatureMoniMT INFO HLT_mu26_ivarmedium_L1MU20 #3411723090
-TrigSignatureMoniMT INFO -- #3411723090 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #3411723090 Features 1 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu28_ivarmedium_L1MU20 #1963262787
-TrigSignatureMoniMT INFO -- #1963262787 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #1963262787 Features 1 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu35_ivarmedium_L1MU20 #597064890
-TrigSignatureMoniMT INFO -- #597064890 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #597064890 Features 1 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu50_L1MU20 #3657158931
-TrigSignatureMoniMT INFO -- #3657158931 Events 20 20 1 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #3657158931 Features 1 1 0 0 -
-TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 #827327262
-TrigSignatureMoniMT INFO -- #827327262 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #827327262 Features 1 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 #1642591450
-TrigSignatureMoniMT INFO -- #1642591450 Events 20 20 0 0 0 - - 0
-TrigSignatureMoniMT INFO -- #1642591450 Features 0 0 0 - -
-TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 #996392590
-TrigSignatureMoniMT INFO -- #996392590 Events 20 20 1 1 - - - 1
-TrigSignatureMoniMT INFO -- #996392590 Features 1 1 - - -
-TrigSignatureMoniMT INFO HLT_mu6_L1MU6 #2560542253
-TrigSignatureMoniMT INFO -- #2560542253 Events 20 20 1 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #2560542253 Features 1 1 0 0 -
-TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 #934918532
-TrigSignatureMoniMT INFO -- #934918532 Events 20 20 1 1 0 0 - 0
-TrigSignatureMoniMT INFO -- #934918532 Features 1 1 0 0 -
-TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 #1012713062
-TrigSignatureMoniMT INFO -- #1012713062 Events 20 20 1 1 0 0 0 0
-TrigSignatureMoniMT INFO -- #1012713062 Features 1 1 0 0 0
-TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 #3895421032
-TrigSignatureMoniMT INFO -- #3895421032 Events 20 20 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #3895421032 Features 1 0 0 - -
-TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 #1713982776
-TrigSignatureMoniMT INFO -- #1713982776 Events 20 20 1 0 0 0 - 0
-TrigSignatureMoniMT INFO -- #1713982776 Features 2 0 0 0 -
-TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 #3518031697
-TrigSignatureMoniMT INFO -- #3518031697 Events 20 20 1 - - - - 1
-TrigSignatureMoniMT INFO -- #3518031697 Features 1 - - - -
-TrigSignatureMoniMT INFO HLT_mu6noL1_L1MU6 #1631468602
-TrigSignatureMoniMT INFO -- #1631468602 Events 20 20 - - - 0 0 0
-TrigSignatureMoniMT INFO -- #1631468602 Features - - - 0 0
-TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU20 #761101109
-TrigSignatureMoniMT INFO -- #761101109 Events 20 20 1 0 0 - - 0
-TrigSignatureMoniMT INFO -- #761101109 Features 1 0 0 - -
-TrigSignatureMoniMT INFO HLT_noalg_L1EM3 #4169267792
-TrigSignatureMoniMT INFO -- #4169267792 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #4169267792 Features - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1RD0_EMPTY #914660695
-TrigSignatureMoniMT INFO -- #914660695 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #914660695 Features - - - - -
-TrigSignatureMoniMT INFO HLT_noalg_L1RD0_FILLED #211699639
-TrigSignatureMoniMT INFO -- #211699639 Events 20 20 - - - - - 20
-TrigSignatureMoniMT INFO -- #211699639 Features - - - - -
-TrigSignatureMoniMT INFO HLT_sct_noise_SCTPEB_L1RD0_EMPTY #3024203296
-TrigSignatureMoniMT INFO -- #3024203296 Events 20 20 20 - - - - 20
-TrigSignatureMoniMT INFO -- #3024203296 Features 20 - - - -
-TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU100 #2342716369
-TrigSignatureMoniMT INFO -- #2342716369 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2342716369 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU12 #372992233
-TrigSignatureMoniMT INFO -- #372992233 Events 20 20 4 - - - - 4
-TrigSignatureMoniMT INFO -- #372992233 Features 5 - - - -
-TrigSignatureMoniMT INFO HLT_tau0_perf_ptonly_L1TAU60 #1376650121
-TrigSignatureMoniMT INFO -- #1376650121 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1376650121 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_tau160_idperf_track_L1TAU100 #714660857
-TrigSignatureMoniMT INFO -- #714660857 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #714660857 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwoMVA_L1TAU100 #2725693236
-TrigSignatureMoniMT INFO -- #2725693236 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2725693236 Features 0 0 - - -
-TrigSignatureMoniMT INFO HLT_tau160_idperf_tracktwo_L1TAU100 #886074432
-TrigSignatureMoniMT INFO -- #886074432 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #886074432 Features 0 0 - - -
-TrigSignatureMoniMT INFO HLT_tau160_mediumRNN_tracktwoMVA_L1TAU100 #1747754287
-TrigSignatureMoniMT INFO -- #1747754287 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1747754287 Features 0 0 - - -
-TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwoMVA_L1TAU100 #2334140248
-TrigSignatureMoniMT INFO -- #2334140248 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #2334140248 Features 0 0 - - -
-TrigSignatureMoniMT INFO HLT_tau160_perf_tracktwo_L1TAU100 #1799096347
-TrigSignatureMoniMT INFO -- #1799096347 Events 20 20 0 0 - - - 0
-TrigSignatureMoniMT INFO -- #1799096347 Features 0 0 - - -
-TrigSignatureMoniMT INFO HLT_tau25_idperf_track_L1TAU12IM #554271976
-TrigSignatureMoniMT INFO -- #554271976 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #554271976 Features 4 - - - -
-TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwoMVA_L1TAU12IM #988149859
-TrigSignatureMoniMT INFO -- #988149859 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #988149859 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_idperf_tracktwo_L1TAU12IM #3346942453
-TrigSignatureMoniMT INFO -- #3346942453 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #3346942453 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwoMVA_L1TAU12IM #169452969
-TrigSignatureMoniMT INFO -- #169452969 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #169452969 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_looseRNN_tracktwo_L1TAU12IM #2490017573
-TrigSignatureMoniMT INFO -- #2490017573 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #2490017573 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoEF_L1TAU12IM #506456080
-TrigSignatureMoniMT INFO -- #506456080 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #506456080 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwoMVA_L1TAU12IM #4055280067
-TrigSignatureMoniMT INFO -- #4055280067 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #4055280067 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_medium1_tracktwo_L1TAU12IM #1433975745
-TrigSignatureMoniMT INFO -- #1433975745 Events 20 20 3 3 - - - 1
-TrigSignatureMoniMT INFO -- #1433975745 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwoMVA_L1TAU12IM #2222894847
-TrigSignatureMoniMT INFO -- #2222894847 Events 20 20 3 3 - - - 2
-TrigSignatureMoniMT INFO -- #2222894847 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_mediumRNN_tracktwo_L1TAU12IM #698603885
-TrigSignatureMoniMT INFO -- #698603885 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #698603885 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwoMVA_L1TAU12IM #112814536
-TrigSignatureMoniMT INFO -- #112814536 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #112814536 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_perf_tracktwo_L1TAU12IM #1129072492
-TrigSignatureMoniMT INFO -- #1129072492 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #1129072492 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwoMVA_L1TAU12IM #2472860683
-TrigSignatureMoniMT INFO -- #2472860683 Events 20 20 3 3 - - - 1
-TrigSignatureMoniMT INFO -- #2472860683 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_tightRNN_tracktwo_L1TAU12IM #2537544560
-TrigSignatureMoniMT INFO -- #2537544560 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #2537544560 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwoMVA_L1TAU12IM #2992830434
-TrigSignatureMoniMT INFO -- #2992830434 Events 20 20 3 3 - - - 3
-TrigSignatureMoniMT INFO -- #2992830434 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau25_verylooseRNN_tracktwo_L1TAU12IM #1275052132
-TrigSignatureMoniMT INFO -- #1275052132 Events 20 20 3 3 - - - 0
-TrigSignatureMoniMT INFO -- #1275052132 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_tau35_mediumRNN_tracktwoMVA_L1TAU12IM #2456480859
-TrigSignatureMoniMT INFO -- #2456480859 Events 20 20 3 3 - - - 2
-TrigSignatureMoniMT INFO -- #2456480859 Features 4 3 - - -
-TrigSignatureMoniMT INFO HLT_xe100_mht_L1XE50 #532175988
-TrigSignatureMoniMT INFO -- #532175988 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #532175988 Features 2 - - - -
-TrigSignatureMoniMT INFO HLT_xe100_pfsum_L1XE50 #1890237897
-TrigSignatureMoniMT INFO -- #1890237897 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1890237897 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_xe100_tcpufit_L1XE50 #2803198799
-TrigSignatureMoniMT INFO -- #2803198799 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #2803198799 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_xe100_trkmht_L1XE50 #1055916731
-TrigSignatureMoniMT INFO -- #1055916731 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #1055916731 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_xe30_cell_L1XE10 #1649696554
-TrigSignatureMoniMT INFO -- #1649696554 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #1649696554 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_xe30_cell_xe30_tcpufit_L1XE10 #3768353779
-TrigSignatureMoniMT INFO -- #3768353779 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #3768353779 Features 2 - - - -
-TrigSignatureMoniMT INFO HLT_xe30_mht_L1XE10 #3626903018
-TrigSignatureMoniMT INFO -- #3626903018 Events 20 20 16 - - - - 16
-TrigSignatureMoniMT INFO -- #3626903018 Features 16 - - - -
-TrigSignatureMoniMT INFO HLT_xe30_pfsum_L1XE10 #998713382
-TrigSignatureMoniMT INFO -- #998713382 Events 20 20 3 - - - - 3
-TrigSignatureMoniMT INFO -- #998713382 Features 3 - - - -
-TrigSignatureMoniMT INFO HLT_xe30_tcpufit_L1XE10 #1583719916
-TrigSignatureMoniMT INFO -- #1583719916 Events 20 20 2 - - - - 2
-TrigSignatureMoniMT INFO -- #1583719916 Features 2 - - - -
-TrigSignatureMoniMT INFO HLT_xe30_trkmht_L1XE10 #2468872349
-TrigSignatureMoniMT INFO -- #2468872349 Events 20 20 5 - - - - 5
-TrigSignatureMoniMT INFO -- #2468872349 Features 5 - - - -
-TrigSignatureMoniMT INFO HLT_xe65_cell_L1XE50 #531141817
-TrigSignatureMoniMT INFO -- #531141817 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #531141817 Features 0 - - - -
-TrigSignatureMoniMT INFO HLT_xe65_cell_xe110_tcpufit_L1XE50 #115518400
-TrigSignatureMoniMT INFO -- #115518400 Events 20 20 0 - - - - 0
-TrigSignatureMoniMT INFO -- #115518400 Features 0 - - - -
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/minbias.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/minbias.ref
deleted file mode 100644
index 55c486a829db809ce17fb2a2eb51a3cefa0c2cbc..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/minbias.ref
+++ /dev/null
@@ -1,150 +0,0 @@
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : 1784 have cl size == 1 in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : 2365 have cl size == 2 in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : 4399 have cl size >= 3 in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 8548 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 6957 SP in pixel barrel in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 808 SP in pixel ECA in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 783 SP in pixel ECC in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 22469 sct spacepoints in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 6013 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 10215 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 0 0 DEBUG REGTEST : Formed 6241 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 0 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 0 0 DEBUG REGTEST found 1074 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 0 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : 1764 have cl size == 1 in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : 2252 have cl size == 2 in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : 4012 have cl size >= 3 in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 8028 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 6495 SP in pixel barrel in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 751 SP in pixel ECA in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 782 SP in pixel ECC in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 21397 sct spacepoints in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 5854 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 9875 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 1 0 DEBUG REGTEST : Formed 5668 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 1 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 1 0 DEBUG REGTEST found 1025 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 1 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : 1361 have cl size == 1 in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : 1807 have cl size == 2 in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : 3173 have cl size >= 3 in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 6341 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 5143 SP in pixel barrel in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 693 SP in pixel ECA in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 505 SP in pixel ECC in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 16996 sct spacepoints in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 3870 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 8521 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 2 0 DEBUG REGTEST : Formed 4605 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 2 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 2 0 DEBUG REGTEST found 655 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 2 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : 1292 have cl size == 1 in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : 1851 have cl size == 2 in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : 3442 have cl size >= 3 in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 6585 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 5410 SP in pixel barrel in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 611 SP in pixel ECA in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 564 SP in pixel ECC in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 18114 sct spacepoints in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 4784 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 7925 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 3 0 DEBUG REGTEST : Formed 5405 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 3 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 3 0 DEBUG REGTEST found 719 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 3 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : 1817 have cl size == 1 in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : 2672 have cl size == 2 in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : 4520 have cl size >= 3 in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 9009 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 7422 SP in pixel barrel in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 789 SP in pixel ECA in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 798 SP in pixel ECC in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 26800 sct spacepoints in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 7215 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 12765 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 4 0 DEBUG REGTEST : Formed 6820 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 4 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 4 0 DEBUG REGTEST found 1299 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 4 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : 1437 have cl size == 1 in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : 1940 have cl size == 2 in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : 3414 have cl size >= 3 in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 6791 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 5495 SP in pixel barrel in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 593 SP in pixel ECA in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 703 SP in pixel ECC in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 18197 sct spacepoints in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 4741 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 8564 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 5 0 DEBUG REGTEST : Formed 4892 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 5 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 5 0 DEBUG REGTEST found 743 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 5 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : 1715 have cl size == 1 in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : 2174 have cl size == 2 in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : 3973 have cl size >= 3 in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 7862 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 6338 SP in pixel barrel in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 781 SP in pixel ECA in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 743 SP in pixel ECC in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 22098 sct spacepoints in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 5842 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 10748 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 6 0 DEBUG REGTEST : Formed 5508 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 6 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 6 0 DEBUG REGTEST found 954 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 6 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : 2293 have cl size == 1 in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : 2866 have cl size == 2 in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : 5175 have cl size >= 3 in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 10334 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 8371 SP in pixel barrel in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 946 SP in pixel ECA in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 1017 SP in pixel ECC in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 29795 sct spacepoints in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 8201 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 14196 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 7 0 DEBUG REGTEST : Formed 7398 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 7 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 7 0 DEBUG REGTEST found 1486 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 7 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : 1554 have cl size == 1 in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : 2010 have cl size == 2 in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : 3659 have cl size >= 3 in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 7223 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 5805 SP in pixel barrel in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 707 SP in pixel ECA in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 711 SP in pixel ECC in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 18566 sct spacepoints in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 4772 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 8584 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 8 0 DEBUG REGTEST : Formed 5210 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 8 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 8 0 DEBUG REGTEST found 791 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 8 0 DEBUG REGTEST event accepted
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 2048 pixel spacepoints in total before cuts.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : 3560 have cl size == 1 in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : 4699 have cl size == 2 in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : 8696 have cl size >= 3 in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 16955 pixel spacepoints after ToT cut in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 13860 SP in pixel barrel in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 1537 SP in pixel ECA in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 1558 SP in pixel ECC in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 55158 sct spacepoints in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 15401 sct ECC spacepoints in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 24718 sct Barr spacepoints in total.
-TrigCountSpacePointsMT 9 0 DEBUG REGTEST : Formed 15039 sct ECA spacepoints in total.
-SPCountHypoAlgMT.HLT_mb_sptrk_L1RD0_F... 9 0 DEBUG REGTEST event accepted
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 9 0 DEBUG REGTEST found 3414 tracks for 'min_pt':0.100000
-TrackCountHypoAlgMT.HLT_mb_sptrk_L1RD... 9 0 DEBUG REGTEST event accepted
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_minbias.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/slice_minbias.ref
deleted file mode 100644
index 4419e447f0caa2e7a6e8c198396dfa66c0d1e89d..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/slice_minbias.ref
+++ /dev/null
@@ -1,6 +0,0 @@
-TrigSignatureMoniMT INFO HLT_mb_sp400_trk40_hmt_L1RD0_FILLED20 20 20 19 19
-TrigSignatureMoniMT INFO HLT_mb_sp400_trk40_hmt_L1RD0_FILLED decisions 20 19
-TrigSignatureMoniMT INFO HLT_mb_sp600_trk45_hmt_L1RD0_FILLED20 20 20 19 19
-TrigSignatureMoniMT INFO HLT_mb_sp600_trk45_hmt_L1RD0_FILLED decisions 20 19
-TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED 20 20 20 19 19
-TrigSignatureMoniMT INFO HLT_mb_sptrk_L1RD0_FILLED decisions 20 19
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_cosmics_cf_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_cosmics_cf_build.sh
index 98340e1e8c3dd830bd57f22fd4e300d31c442b99..6d7798da97546ce702400d8c8cae863a45645206 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_cosmics_cf_build.sh
+++ b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_cosmics_cf_build.sh
@@ -10,9 +10,6 @@ export THREADS=1
export SLOTS=1
export JOBOPTION="TrigUpgradeTest/Cosmic.py"
-# This test doesn't produce any output useful for RegTest, so do a dummy reference comparison
-export REGTESTEXP="leaving with code"
-export REGTESTREF=`find_data.py TrigUpgradeTest/dummy_regtest.ref`
#export EXTRA="isOnline=True;doEmptyMenu=True;doWriteBS=False;doWriteRDOTrigger=True;forceEnableAllChains=True"
#export EXTRA="isOnline=True;doEmptyMenu=True;doWriteBS=False"
export EXTRA="doEmptyMenu=True;doWriteBS=False;doWriteRDOTrigger=True;"
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.py b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.py
deleted file mode 100755
index 0d97978f1c57103eb50420b446cf8d58a3891c31..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_decodeBS_build.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-
-# art-description: Runs the full_menu test writing BS output and then runs BS decoding
-# art-type: build
-# art-include: master/Athena
-
-from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
-
-writeBS = ExecStep.ExecStep("WriteBS")
-writeBS.type = 'athena'
-writeBS.job_options = 'TriggerJobOpts/runHLT_standalone.py'
-writeBS.input = 'data'
-writeBS.args = '-c "isOnline=True;doWriteBS=True;doWriteRDOTrigger=False;"'
-
-decodeBS = ExecStep.ExecStep("DecodeBS")
-decodeBS.type = 'athena'
-decodeBS.job_options = 'TriggerJobOpts/decodeBS.py'
-decodeBS.input = ''
-decodeBS.explicit_input = True
-decodeBS.args = '--filesInput=data_test.00360026.Single_Stream.daq.RAW._lb0151._Athena._0000.data'
-decodeBS.perfmon = False # no need to run PerfMon for this step
-
-test = Test.Test()
-test.art_type = 'build'
-test.exec_steps = [writeBS, decodeBS]
-test.check_steps = CheckSteps.default_check_steps(test)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
deleted file mode 100755
index 0a7c29012fff62972d3847eb06e9aeb3698c7477..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test on data running no HLT menu
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=2
-export SLOTS=2
-export JOBOPTION="TriggerJobOpts/runHLT_standalone.py"
-export EXTRA="isOnline=True;doEmptyMenu=True;doWriteBS=False;doWriteRDOTrigger=True;"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
deleted file mode 100755
index 572669c04269251b50d3a78866cbfc5583b3418c..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_empty_menu_mc_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test on MC running L1 simulation and no HLT menu
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export INPUT="ttbar"
-export JOBOPTION="TriggerJobOpts/runHLT_standalone.py"
-export EXTRA="doL1Sim=True;doEmptyMenu=True;doWriteBS=False;doWriteRDOTrigger=True;"
-
-# Skip dumping chain counts because this test doesn't produce the histogram including them
-export SKIP_CHAIN_DUMP=1
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
deleted file mode 100755
index 1b31210796c412347e110664257dca72c081c86e..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TriggerJobOpts/runHLT_standalone.py"
-export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*"
-export EXTRA="isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;forceEnableAllChains=True;fpeAuditor=True"
-
-# Find the regtest reference installed with the release
-export REGTESTREF=`find_data.py TrigUpgradeTest/full_menu_build.ref`
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh
deleted file mode 100755
index b776885f110e11efd2d5b82d8ff0cd80d1b33630..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_mc_build.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export INPUT="ttbar"
-export JOBOPTION="TriggerJobOpts/runHLT_standalone.py"
-export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*"
-export EXTRA="doL1Sim=True;doWriteBS=False;doWriteRDOTrigger=True;"
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_reverse_build.sh b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_reverse_build.sh
deleted file mode 100755
index e4f77a31f7c33bd79e698f780a02e6343f1a9cff..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_reverse_build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT. Reverse EventView order to test their independence
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-export EVENTS=20
-export THREADS=1
-export SLOTS=1
-export JOBOPTION="TriggerJobOpts/runHLT_standalone.py"
-export REGTESTEXP="TriggerSummaryStep.*HLT_.*|TriggerMonitorFinal.*HLT_.*|TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*"
-export EXTRA="isOnline=True;reverseViews=True;doWriteBS=False;doWriteRDOTrigger=True;"
-
-# Find the regtest reference installed with the release
-export REGTESTREF=`find_data.py TrigUpgradeTest/full_menu_build.ref`
-
-source exec_TrigUpgradeTest_art_athenaMT.sh
-source exec_TrigUpgradeTest_art_post.sh
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_ds_build.py b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_ds_build.py
deleted file mode 100755
index 8c2429079b9bc87ade23f2d2fca0c32ef4609b82..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_peb_ds_build.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-# art-description: athenaMT trigger test of partial event building and data scouting
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
-
-ex = ExecStep.ExecStep()
-ex.type = 'athena'
-ex.job_options = 'TrigP1Test/PEBDSTest.py'
-ex.input = 'data'
-ex.args = '-c "forceEnableAllChains=True;"'
-
-test = Test.Test()
-test.art_type = 'build'
-test.exec_steps = [ex]
-test.check_steps = CheckSteps.default_check_steps(test)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_py_full_menu_build.py b/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_py_full_menu_build.py
deleted file mode 100755
index 58ca2512eac00785ceb87bd29d6ba276ae5308ad..0000000000000000000000000000000000000000
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_py_full_menu_build.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env python
-
-# art-description: athenaMT trigger test using the full LS2_v1 menu from TriggerMenuMT
-# art-type: build
-# art-include: master/Athena
-# Skipping art-output which has no effect for build tests.
-# If you create a grid version, check art-output in existing grid tests.
-
-from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
-
-ex = ExecStep.ExecStep()
-ex.type = 'athena'
-ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
-ex.input = 'data'
-ex.args = '-c "isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;"'
-
-test = Test.Test()
-test.art_type = 'build'
-test.exec_steps = [ex]
-test.check_steps = CheckSteps.default_check_steps(test)
-
-import sys
-sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py
index 0feb6229726bc88e103ee782598065f9533706d9..7aaeba65e3b4b9d852656b9edb14c8928ba48803 100755
--- a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_MT_build.py
@@ -28,7 +28,7 @@ test.art_type = 'build'
test.exec_steps = [ex]
test.check_steps = CheckSteps.default_check_steps(test)
-# Add a step comparing counts in the log against reference
+# Add a step comparing counts in the log against reference from test_trig_data_v1Dev_build
refcomp = CheckSteps.RegTestStep("CountRefComp")
refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_deps_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_deps_build.py
new file mode 100755
index 0000000000000000000000000000000000000000..14336b4b97fe47847f28fcec75321e1f8f7b78ca
--- /dev/null
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_deps_build.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+
+# art-description: Test with SGInputLoader.FailIfNoProxy=True to check for unmet data dependencies
+# art-type: build
+# art-include: master/Athena
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
+
+from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+
+ex = ExecStep.ExecStep()
+ex.type = 'athena'
+ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
+ex.input = 'data'
+ex.threads = 1
+precommand = ''.join([
+ "setMenu='LS2_v1';", # LS2_v1 soon to be renamed to Dev_pp_run3_v1
+ "doWriteBS=False;",
+ "doWriteRDOTrigger=True;",
+ "forceEnableAllChains=True;",
+ "fpeAuditor=True;",
+ "failIfNoProxy=True;"
+])
+ex.args = '-c "{:s}"'.format(precommand)
+
+test = Test.Test()
+test.art_type = 'build'
+test.exec_steps = [ex]
+test.check_steps = CheckSteps.default_check_steps(test)
+
+# Add a step comparing counts in the log against reference from test_trig_data_v1Dev_build
+refcomp = CheckSteps.RegTestStep("CountRefComp")
+refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
+refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
+refcomp.required = True # Final exit code depends on this step
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_emptyMenu_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_emptyMenu_build.py
new file mode 100755
index 0000000000000000000000000000000000000000..e45d152c1f8371729e7ad08bba6d480aaaaec268
--- /dev/null
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_emptyMenu_build.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+
+# art-description: Trigger BS->RDO_TRIG athena test without any HLT chains
+# art-type: build
+# art-include: master/Athena
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
+
+from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+
+ex = ExecStep.ExecStep()
+ex.type = 'athena'
+ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
+ex.input = 'data'
+ex.max_events = 80
+ex.threads = 4
+ex.concurrent_events = 4
+precommand = ''.join([
+ "setMenu='LS2_v1';", # LS2_v1 soon to be renamed to Dev_pp_run3_v1
+ "doEmptyMenu=True;",
+ "doWriteBS=False;",
+ "doWriteRDOTrigger=True;",
+ "forceEnableAllChains=True;",
+ "fpeAuditor=True;",
+ "failIfNoProxy=True;"
+])
+ex.args = '-c "{:s}"'.format(precommand)
+
+test = Test.Test()
+test.art_type = 'build'
+test.exec_steps = [ex]
+test.check_steps = CheckSteps.default_check_steps(test)
+
+# Skip ZeroCounts check because empty menu has no counts
+test.check_steps.remove(test.get_step("ZeroCounts"))
+
+# Overwrite default MessageCount settings
+msgcount = test.get_step("MessageCount")
+msgcount.info_threshold = 600
+msgcount.other_threshold = 50
+msgcount.required = True # make the test exit code depend on this step
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py
new file mode 100755
index 0000000000000000000000000000000000000000..107fea469e8f6b189de45c63abff0f895b3ddc36
--- /dev/null
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_data_v1Dev_reverseViews_build.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+
+# art-description: Test with reversed order of views to check their independence
+# art-type: build
+# art-include: master/Athena
+# Skipping art-output which has no effect for build tests.
+# If you create a grid version, check art-output in existing grid tests.
+
+from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
+
+ex = ExecStep.ExecStep()
+ex.type = 'athena'
+ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
+ex.input = 'data'
+ex.threads = 1
+precommand = ''.join([
+ "setMenu='LS2_v1';", # LS2_v1 soon to be renamed to Dev_pp_run3_v1
+ "doWriteBS=False;",
+ "doWriteRDOTrigger=True;",
+ "forceEnableAllChains=True;",
+ "fpeAuditor=True;",
+ "reverseViews=True;"
+])
+ex.args = '-c "{:s}"'.format(precommand)
+
+test = Test.Test()
+test.art_type = 'build'
+test.exec_steps = [ex]
+test.check_steps = CheckSteps.default_check_steps(test)
+
+# Add a step comparing counts in the log against reference from test_trig_data_v1Dev_build
+refcomp = CheckSteps.RegTestStep("CountRefComp")
+refcomp.regex = 'TrigSignatureMoniMT.*HLT_.*|TrigSignatureMoniMT.*-- #[0-9]+ (Events|Features).*'
+refcomp.reference = 'TriggerTest/ref_data_v1Dev_build.ref'
+refcomp.required = True # Final exit code depends on this step
+CheckSteps.add_step_after_type(test.check_steps, CheckSteps.LogMergeStep, refcomp)
+
+import sys
+sys.exit(test.run())
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_deps_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_emptyMenu_build.py
similarity index 60%
rename from Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_deps_build.py
rename to Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_emptyMenu_build.py
index ad2580bde1983773dcd636b6b7209998dfe60c1d..f06b8ae5336d2395ee431dea4f1f07a7a47dc96b 100755
--- a/Trigger/TrigValidation/TrigUpgradeTest/test/test_trigUpgr_full_menu_deps_build.py
+++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_emptyMenu_build.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# art-description: Test with SGInputLoader.FailIfNoProxy=True to check for unmet data dependencies
+# art-description: Trigger RDO->RDO_TRIG athena test with L1 simulation but without any HLT chains
# art-type: build
# art-include: master/Athena
# Skipping art-output which has no effect for build tests.
@@ -11,13 +11,17 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps
ex = ExecStep.ExecStep()
ex.type = 'athena'
ex.job_options = 'TriggerJobOpts/runHLT_standalone.py'
-ex.input = 'data'
-ex.args = '-c "isOnline=True;doWriteBS=False;doWriteRDOTrigger=True;failIfNoProxy=True;"'
+ex.input = 'ttbar'
+ex.threads = 1
+ex.args = '-c "setMenu=\'LS2_v1\';doL1Sim=True;doEmptyMenu=True;doWriteBS=False;doWriteRDOTrigger=True;"'
test = Test.Test()
test.art_type = 'build'
test.exec_steps = [ex]
test.check_steps = CheckSteps.default_check_steps(test)
+# Skip ZeroCounts check because empty menu has no counts
+test.check_steps.remove(test.get_step("ZeroCounts"))
+
import sys
sys.exit(test.run())