Set up xAOD output stream formatting

  * Recognise "xAOD" stream type as needing some additional components
    and set these up.
  * This requires merging some property info in AthenaPoolCnvSvc that
    is set up by the PoolReadCfg module, so this property is added
    to UnifyProperties.py.

Control/AthenaConfiguration/python/UnifyProperties.py

@@ -41,6 +41,7 @@ _propsToUnify={"GeoModelSvc.DetectorTools":unifySet,
                "ProxyProviderSvc.ProviderNames":unifySet,
                "TagInfoMgr.ExtraTagValuePairs":unifySetOfPairs,
                "AthenaOutputStream.ItemList":unifySet,
+               "AthenaPoolCnvSvc.PoolAttributes":unifySet
                }
 
 

Database/AthenaPOOL/OutputStreamAthenaPool/python/OutputStreamConfig.py

@@ -37,6 +37,26 @@ def OutputStreamCfg(configFlags, streamName, ItemList=[] ):
    #outputStream.MetadataStore = svcMgr.MetaDataStore
    #outputStream.MetadataItemList = [ "EventStreamInfo#" + streamName, "IOVMetaDataContainer#*" ]
 
+   # For xAOD output
+   if streamName=="xAOD":
+      from xAODEventFormatCnv.xAODEventFormatCnvConf import xAODMaker__EventFormatSvc
+      # Simplifies naming 
+      result.addService(xAODMaker__EventFormatSvc())
+      outputStream.MetadataItemList.append( "xAOD::EventFormat#EventFormat" )
+
+      from xAODMetaDataCnv.xAODMetaDataCnvConf import xAODMaker__FileMetaDataMarkUpTool
+      streamMarkUpTool = xAODMaker__FileMetaDataMarkUpTool( streamName + "_FileMetaDataMarkUpTool" )
+      streamMarkUpTool.Key = streamName
+      outputStream.HelperTools += [ streamMarkUpTool ]
+      outputStream.WritingTool.SubLevelBranchName = "<key>"
+
+      from AthenaPoolCnvSvc.AthenaPoolCnvSvcConf import AthenaPoolCnvSvc
+      poolcnvsvc = AthenaPoolCnvSvc()
+      result.addService(poolcnvsvc)
+      poolcnvsvc.PoolAttributes += [ "DatabaseName = '" + fileName + "'; COMPRESSION_LEVEL = '5'" ]
+      poolcnvsvc.PoolAttributes += [ "DatabaseName = '" + fileName + "'; ContainerName = 'TTree=CollectionTree'; TREE_AUTO_FLUSH = '-10000000'" ]
+      poolcnvsvc.PoolAttributes += [ "DatabaseName = '" + fileName + "'; ContainerName = 'TTree=CollectionTree'; CONTAINER_SPLITLEVEL = '1'" ]
+      poolcnvsvc.PoolAttributes += [ "DatabaseName = '" + fileName + "'; ContainerName = 'TTree=Aux.'; CONTAINER_SPLITLEVEL = '1'"]
 
    result.addEventAlgo(outputStream)
    return result