Merge branch 'mainevgen-xaodconvert' into 'main'

MainEvgenServicesCfg: Remove explicit xAOD::EventInfo conversion

See merge request atlas/athena!70663

AtlasTest/DatabaseTest/AthenaPoolTest/python/EventInfoWrite.py

@@ -30,6 +30,9 @@ StreamName="EventInfoPoolFile1"
 from AthenaConfiguration.MainServicesConfig import MainEvgenServicesCfg
 acc=MainEvgenServicesCfg(flags)
 
+from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
+acc.merge(EventInfoCnvAlgCfg(flags, disableBeamSpot=True), sequenceName="AthAlgSeq")
+
 #Add some LAr and Tile conditions,  this is the payload obj for this test
 from LArGeoAlgsNV.LArGMConfig import LArGMCfg
 acc.merge(LArGMCfg(flags))

Control/AthenaConfiguration/python/MainServicesConfig.py

@@ -320,7 +320,7 @@ def MainServicesCfg(flags, LoopMgr='AthenaEventLoopMgr'):
     return cfg
 
 
-def MainEvgenServicesCfg(flags, LoopMgr='AthenaEventLoopMgr',seqName="AthAlgSeq"):
+def MainEvgenServicesCfg(flags, LoopMgr="AthenaEventLoopMgr"):
     """ComponentAccumulator-based equivalent of:
     import AthenaCommon.AtlasUnixGeneratorJob
 
@@ -331,9 +331,6 @@ def MainEvgenServicesCfg(flags, LoopMgr='AthenaEventLoopMgr',seqName="AthAlgSeq"
     cfg = MainServicesCfg(flags, LoopMgr)
     from McEventSelector.McEventSelectorConfig import McEventSelectorCfg
     cfg.merge (McEventSelectorCfg (flags))
-    # Temporarily inject the xAOD::EventInfo converter here to allow for adiabatic migration of the clients
-    cfg.addEventAlgo(CompFactory.xAODMaker.EventInfoCnvAlg(AODKey = 'McEventInfo'),sequenceName=seqName)
-
     return cfg
 
 

Control/AthenaConfiguration/share/FPEAndCoreDump.ref

@@ -37,7 +37,6 @@ FPEAuditor                                        WARNING FPE DIVBYZERO in [Exec
 FPEAuditor                                        WARNING FPE DIVBYZERO in [Execute] of [AthAllAlgSeq] on event 3 0 0
 AthenaEventLoopMgr                                   INFO   ===>>>  done processing event #3, run #284500 3 events processed so far  <<<===
 ApplicationMgr                                       INFO Application Manager Stopped successfully
-ToolSvc                                              INFO Removing all tools created by ToolSvc
 FPEAuditor                                           INFO FPE summary for this job
 FPEAuditor                                           INFO  FPE OVERFLOWs  : 0
 FPEAuditor                                           INFO  FPE INVALIDs   : 0

Simulation/SimuJobTransforms/python/CommonSimulationSteering.py

@@ -38,6 +38,9 @@ def CommonSimulationCfg(flags, log):
         # Cases 3a, 3b
         from AthenaConfiguration.MainServicesConfig import MainEvgenServicesCfg
         cfg = MainEvgenServicesCfg(flags)
+        # Make sure we get xAOD::EventInfo
+        from xAODEventInfoCnv.xAODEventInfoCnvConfig import EventInfoCnvAlgCfg
+        cfg.merge(EventInfoCnvAlgCfg(flags))
         # For Simulation we need to override the RunNumber to pick up
         # the right conditions. These next two lines are required for
         # this to work.