From 1c1e997439e3ce65741a0fcbc4b13c9efbd945cd Mon Sep 17 00:00:00 2001
From: John Chapman <jchapman@cern.ch>
Date: Mon, 28 Jan 2019 16:38:38 +0100
Subject: [PATCH] Extend AthenaConfiguration modules to better support EVNT and
HITS inputs
Update Output ConfigFlags in AllConfigFlags module.
- Replace `Output.HITFileName` with `Output.HITSFileName` to match
grid output naming convention.
- Add `Output.EVNTFileName`.
Add default HITS and EVNT and ESD input files for tests to AthenaConfiguration.TestDefaults module
---
Control/AthenaConfiguration/python/AllConfigFlags.py | 3 ++-
Control/AthenaConfiguration/python/TestDefaults.py | 4 +++-
Simulation/BeamEffects/python/BeamEffectsAlgConfig.py | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/Control/AthenaConfiguration/python/AllConfigFlags.py b/Control/AthenaConfiguration/python/AllConfigFlags.py
index 135e9ca10c1..b9f440f1443 100644
--- a/Control/AthenaConfiguration/python/AllConfigFlags.py
+++ b/Control/AthenaConfiguration/python/AllConfigFlags.py
@@ -36,7 +36,8 @@ def _createCfgFlags():
acf.addFlag('Output.doESD', False) # produce ESD containers
- acf.addFlag('Output.HITFileName','myHIT.pool.root')
+ acf.addFlag('Output.EVNTFileName','myEVNT.pool.root')
+ acf.addFlag('Output.HITSFileName','myHITS.pool.root')
acf.addFlag('Output.RDOFileName','myROD.pool.root')
acf.addFlag('Output.ESDFileName','myESD.pool.root')
acf.addFlag('Output.AODFileName','myAOD.pool.root')
diff --git a/Control/AthenaConfiguration/python/TestDefaults.py b/Control/AthenaConfiguration/python/TestDefaults.py
index 0a984d5f1ed..17e7a4e639b 100644
--- a/Control/AthenaConfiguration/python/TestDefaults.py
+++ b/Control/AthenaConfiguration/python/TestDefaults.py
@@ -4,7 +4,9 @@ class defaultTestFiles():
import os
d = os.environ.get ('ATLAS_REFERENCE_DATA',
'/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art')
+ EVNT= [d + "/SimCoreTests/mcatnlojimmy_ttbar_leptonfilter.19.2.5.37.EVNT.pool.root"] #find an official file.
+ HITS= [d + "/Tier0ChainTests/valid1.410000.PowhegPythiaEvtGen_P2012_ttbar_hdamp172p5_nonallhad.simul.HITS.e4993_s3091/HITS.10504490._000425.pool.root.1"]
RAW = [d + "/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1"]
RDO = ["myRDO.pool.root"]#needs a test RDO
+ ESD = [d + '/RecExRecoTest/mc16_13TeV.361022.Pythia8EvtGen_A14NNPDF23LO_jetjet_JZ2W.recon.ESD.e3668_s3170_r10572_homeMade.pool.root']
AOD = [d + '/CommonInputs/data16_13TeV.00311321.physics_Main.recon.AOD.r9264/AOD.11038520._000001.pool.root.1']
- ESD = ["myESD.pool.root"]#needs a test ESD
diff --git a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
index 1ed6d057681..c94e0699ec6 100755
--- a/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
+++ b/Simulation/BeamEffects/python/BeamEffectsAlgConfig.py
@@ -156,7 +156,7 @@ if __name__ == "__main__":
# Specify output
- ConfigFlags.Output.HITFileName = "myHITS.pool.root" #todo change the flag name in AllConfigFlags
+ ConfigFlags.Output.HITSFileName = "myHITS.pool.root"
#set the source of vertex positioning
#ConfigFlags.Vertex.Source = "VertexOverrideFile.txt"# Vertex.OverrideFile/Vertex.OverrideEventFile
--
GitLab