Merge branch 'cbk/analysis' into 'master'

Fix EventBookkeeperTools tests in AthAnalysis

See merge request !39472

Event/EventBookkeeperTools/CMakeLists.txt

@@ -75,8 +75,10 @@ if( NOT XAOD_STANDALONE )
                    PROPERTIES TIMEOUT 300
                    POST_EXEC_SCRIPT nopost.sh )
 
-   atlas_add_test( CutFlowSvcOutputMP
-                   SCRIPT athena EventBookkeeperTools/TestCutFlowSvcOutput.py --nprocs=2
-                   PROPERTIES TIMEOUT 300
-                   POST_EXEC_SCRIPT nopost.sh )
+   if( NOT XAOD_ANALYSIS )
+      atlas_add_test( CutFlowSvcOutputMP
+                      SCRIPT athena EventBookkeeperTools/TestCutFlowSvcOutput.py --nprocs=2
+                      PROPERTIES TIMEOUT 300
+                      POST_EXEC_SCRIPT nopost.sh )
+   endif()
 endif()

Event/EventBookkeeperTools/python/CutFlowHelpers.py

@@ -15,8 +15,12 @@ def GetCurrentStreamName( msg ):
         msg.info("Couldn't get input stream name from the RecFlags... trying AthFile directly.")
 
     from PyUtils.MetaReader import read_metadata
-    from AthenaCommon.AppMgr  import ServiceMgr as svcMgr
-    input_file = svcMgr.EventSelector.InputCollections[0]
+    from AthenaCommon.AppMgr import ServiceMgr as svcMgr
+    try:
+        input_file = svcMgr.EventSelector.InputCollections[0]
+    except AttributeError:
+        from AthenaCommon.AthenaCommonFlags import athenaCommonFlags
+        input_file = athenaCommonFlags.FilesInput()[0]
     metadata = read_metadata(input_file)
     metadata = metadata[input_file]  # promote all keys one level up
 

Event/EventBookkeeperTools/share/TestCutFlowSvcOutput.py

@@ -43,8 +43,11 @@ from AthenaCommon.AppMgr import theApp
 import AthenaPoolCnvSvc.ReadAthenaPool  # noqa: F401
 
 # setup some configuration
-from RecExConfig.RecFlags import rec
-rec.mergingStreamName = 'Stream1'
+try:
+    from RecExConfig.RecFlags import rec
+    rec.mergingStreamName = 'Stream1'
+except ModuleNotFoundError:
+    pass
 
 # setup the CutFlowSvc and corresponding tools
 from EventBookkeeperTools.CutFlowHelpers import CreateCutFlowSvc