Merge branch 'maszyman-atlasrects-6952' into 'master'

RecExCommon_topOptions: check if ByteStreamMetadataTool in MetadataTools

Closes ATLASRECTS-6952

See merge request !58818

Event/ByteStreamCnvSvc/python/ReadByteStream.py

-# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 
 ###############################################################
 #
@@ -64,6 +64,6 @@ if not hasattr (svcMgr.ToolSvc, 'IOVDbMetaDataTool'):
     svcMgr.ToolSvc += CfgMgr.IOVDbMetaDataTool()
 
 # Enable ByteStream to read MetaData
-svcMgr.MetaDataSvc.MetaDataTools += [ "ByteStreamMetadataTool" ]
 if not hasattr (svcMgr.ToolSvc, 'ByteStreamMetadataTool'):
     svcMgr.ToolSvc += CfgMgr.ByteStreamMetadataTool()
+    svcMgr.MetaDataSvc.MetaDataTools += [ "ByteStreamMetadataTool" ]

Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py

@@ -721,21 +721,19 @@ if rec.doFileMetaData():
         ToolSvc += CfgMgr.xAODMaker__FileMetaDataTool( "FileMetaDataTool" )
         svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.FileMetaDataTool ]
 
+        try:
+            # we want ByteStreamMetadata to propagate only through ESD and AOD
+            from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamMetadataTool
+            if not hasattr (svcMgr.ToolSvc, "ByteStreamMetadataTool"):
+                ToolSvc += ByteStreamMetadataTool()
+                if "ByteStreamMetadataTool" not in str(svcMgr.MetaDataSvc.MetaDataTools):
+                    svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.ByteStreamMetadataTool ]
+        except Exception:
+            treatException("Could not load ByteStreamMetadataTool")
+
     else:
         # Create LumiBlock meta data containers *before* creating the output StreamESD/AOD
         include ("LumiBlockComps/CreateLumiBlockFromFile_jobOptions.py")
-        pass
-
-    try:
-        # ByteStreamMetadata
-        from ByteStreamCnvSvc.ByteStreamCnvSvcConf import ByteStreamMetadataTool
-        if not hasattr (svcMgr.ToolSvc, 'ByteStreamMetadataTool'):
-            ToolSvc += ByteStreamMetadataTool()
-        svcMgr.MetaDataSvc.MetaDataTools += [ ToolSvc.ByteStreamMetadataTool ]
-    except Exception:
-        treatException("Could not load ByteStreamMetadataTool")
-    pass
-
 
 ##--------------------------------------------------------
 ###=== Only run reco on events that pass selected triggers