From 6931bc907c0932ea2d395d0e4aa2be8202ea18da Mon Sep 17 00:00:00 2001
From: Alexander Solodkov <Sanya.Solodkov@cern.ch>
Date: Wed, 5 Dec 2018 16:25:00 +0100
Subject: [PATCH] minor update in jobOptions_TileCalibRec.py - preparing to
read new RDO
Former-commit-id: 7afdb1dfbec64c39a789dd7c6c393c4574236e04
---
.../share/jobOptions_TileCalibRec.py | 21 +++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
diff --git a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
index 00aa075b4b0..5956005ed0f 100644
--- a/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
+++ b/TileCalorimeter/TileExample/TileRecEx/share/jobOptions_TileCalibRec.py
@@ -637,6 +637,9 @@ from AthenaCommon.BeamFlags import jobproperties
#jobproperties.Beam.beamType.set_Value_and_Lock('cosmics')
jobproperties.Beam.beamType.set_Value_and_Lock('collisions')
+from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+athenaCommonFlags.FilesInput.set_Value_and_Lock(FileNameVec)
+
from AthenaCommon.DetFlags import DetFlags
DetFlags.Calo_setOff() #Switched off to avoid geometry
DetFlags.ID_setOff()
@@ -651,8 +654,6 @@ DetFlags.detdescr.LAr_setOn()
DetFlags.detdescr.Tile_setOn()
if TileL1CaloRun:
DetFlags.detdescr.LVL1_setOn()
- from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
- athenaCommonFlags.FilesInput.set_Value_and_Lock(FileNameVec)
if ReadPool:
DetFlags.readRDOPool.Tile_setOn()
if TileL1CaloRun:
@@ -827,8 +828,20 @@ if not OfcFromCOOL and (doTileOpt2 or doTileOptATLAS or doTileOF1):
from AthenaCommon.AlgSequence import AlgSequence
topSequence = AlgSequence()
-from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
-topSequence+=xAODMaker__EventInfoCnvAlg()
+if not 'newRDO' in dir() or newRDO is None:
+ if 'ReadRDO' in dir() and ReadRDO:
+ from RecExConfig.InputFilePeeker import inputFileSummary
+ from RecExConfig.ObjKeyStore import objKeyStore
+ objKeyStore.addManyTypesInputFile(inputFileSummary['eventdata_itemsList'])
+ newRDO = objKeyStore.isInInput( "xAOD::EventInfo" )
+ else:
+ newRDO = True
+
+if ReadPool and newRDO:
+ topSequence += CfgMgr.xAODMaker__EventInfoNonConstCnvAlg()
+else:
+ from xAODEventInfoCnv.xAODEventInfoCreator import xAODMaker__EventInfoCnvAlg
+ topSequence+=xAODMaker__EventInfoCnvAlg()
#=============================================================
#=== read ByteStream and reconstruct data
--
GitLab