Skip to content
Snippets Groups Projects
Commit 18251799 authored by Andreas Salzburger's avatar Andreas Salzburger Committed by Graeme Stewart
Browse files

enabling ZDC xAOD writing (RecExCommon-00-14-32-03)

parent fdc40532
No related branches found
No related tags found
No related merge requests found
......@@ -96,5 +96,6 @@ if DetFlags.readRDOBS.Lucid_on():
protectedInclude ("LUCID_RawDataByteStreamCnv/LUCID_ByteStreamRawDataCnv.py")
if DetFlags.readRDOBS.ZDC_on():
protectedInclude ("ZdcByteStream/ZdcByteStreamRawDataCnv.py")
svcMgr.ByteStreamAddressProviderSvc.TypeNames += ["ZdcDigitsCollection/ZdcDigitsCollection"]
protectedInclude ("ZdcByteStream/ZdcByteStreamRawDataCnvV2.py")
svcMgr.ByteStreamAddressProviderSvc.TypeNames += [ "xAOD::TriggerTowerContainer/ZdcTriggerTowers"]
svcMgr.ByteStreamAddressProviderSvc.TypeNames += [ "xAOD::TriggerTowerAuxContainer/ZdcTriggerTowersAux."]
......@@ -407,11 +407,10 @@ elif rec.readESD():
# still need to read in AOD content built at ESD stage
objKeyStore.readStreamAOD('RecExPers/OKS_streamAOD_fromESD.py')
# at this point all streamAOD there should already be in ESD
for k in objKeyStore['streamAOD'].list():
if not objKeyStore['inputFile'].has_item (k):
logRecExCommon_topOptions.info("Warning item %s scheduled co be copied from ESD to AOD, but missing in ESD! Dropped. " % k )
objKeyStore['streamAOD'].removeItem (k)
# for k in objKeyStore['streamAOD'].list():
# if not objKeyStore['inputFile'].has_item (k):
# logRecExCommon_topOptions.info("Warning item %s scheduled co be copied from ESD to AOD, but missing in ESD! Dropped. " % k )
# objKeyStore['streamAOD'].removeItem (k)
elif rec.readAOD():
pass
......@@ -1049,11 +1048,12 @@ if rec.doFileMetaData():
# Create LumiBlock meta data containers *before* creating the output StreamESD/AOD
include ("LumiBlockComps/CreateLumiBlockFromFile_jobOptions.py")
pass
# Add the needed stuff for cut-flow bookkeeping.
# Only the configurables that are not already present will be created
from EventBookkeeperTools.CutFlowHelpers import CreateCutFlowSvc
logRecExCommon_topOptions.debug("Going to call CreateCutFlowSvc")
CreateCutFlowSvc( svcName="CutFlowSvc", athFile=af, seq=topSequence, addMetaDataToAllOutputFiles=True )
CreateCutFlowSvc( svcName="CutFlowSvc", athFile=af, seq=topSequence, addMetaDataToAllOutputFiles=True )
if rec.readAOD() or rec.readESD():
#force CutFlowSvc execution (necessary for file merging)
theApp.CreateSvc+=['CutFlowSvc']
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment