Commit c4f256d2 authored by John Kenneth Anders's avatar John Kenneth Anders
Browse files

Merge branch 'tilecal-for-21.0' into '21.0'

minor update in jobOptions_TileCalibRec.py - preparing to read new RDO

See merge request atlas/athena!16497

Former-commit-id: 6236fd6e3172352a3867eb670fa571a5c837d64c
parents 8388446f 0a96390b
......@@ -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
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment