From b112051fc5909b637b36b48f6cca1e2df355c6bb Mon Sep 17 00:00:00 2001 From: Stewart Martin-Haugh <stewart.martin-haugh@cern.ch> Date: Sat, 24 Oct 2020 11:51:00 +0000 Subject: [PATCH] Add eFEX to phase-1 simulation test --- .../TrigValidation/TrigValTools/share/TrigValInputs.json | 7 +++++++ .../test/test_trig_mc_v1Dev_L1SimOnly_phase1_build.py | 2 +- .../TriggerJobOpts/python/Lvl1SimulationConfig.py | 4 ++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json b/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json index 883713657388..e4a705f1de37 100644 --- a/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json +++ b/Trigger/TrigValidation/TrigValTools/share/TrigValInputs.json @@ -56,6 +56,13 @@ "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_r11315/RDO.17533168._000002.pool.root.1" ] }, + "ttbar_phase1": { + "source": "mc", + "format": "RDO", + "paths": [ + "/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TriggerTest/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.merge.RDO.e4993_s3214_d1536_tid18795273_00/RDO.18795273._000063.pool.root.1" + ] + }, "ttbar_ID": { "source": "mc", "format": "RDO", diff --git a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_phase1_build.py b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_phase1_build.py index 6acd4e74a860..f347c93b6822 100755 --- a/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_phase1_build.py +++ b/Trigger/TrigValidation/TriggerTest/test/test_trig_mc_v1Dev_L1SimOnly_phase1_build.py @@ -12,7 +12,7 @@ from TrigValTools.TrigValSteering import Test, ExecStep, CheckSteps ex = ExecStep.ExecStep() ex.type = 'athena' ex.job_options = 'TriggerJobOpts/runHLT_standalone.py' -ex.input = 'ttbar' +ex.input = 'ttbar_phase1' ex.threads = 1 precommand = ''.join([ "setMenu='LS2_v1';", # LS2_v1 soon to be renamed to Dev_pp_run3_v1 diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py index fcbf85cb1c49..463e2b07dc49 100644 --- a/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py +++ b/Trigger/TriggerCommon/TriggerJobOpts/python/Lvl1SimulationConfig.py @@ -87,6 +87,10 @@ def Lvl1SimulationSequence( flags = None ): #conddb.addFolderWithTag("TRIGGER_OFL", l1calofolder, "HEAD") conddb.addFolder( "TRIGGER_OFL", l1calofolder ) + if flags.Trigger.enableL1Phase1: + from AthenaCommon import CfgMgr + l1CaloSim += CfgMgr.LVL1__eFEXDriver('MyeFEXDriver') + ################################################## # Muons ################################################## -- GitLab