Merge branch 'eventinfo-fix' into '21.0'

xAOD::EventInfo conversion fix in PileUpEventLoopMgr (ATLASSIM-4081)

See merge request atlas/athena!21828

Control/PileUpComps/src/PileUpEventLoopMgr.cxx

@@ -498,7 +498,7 @@ StatusCode PileUpEventLoopMgr::nextEvent(int maxevt)
       std::unique_ptr< xAOD::EventAuxInfo > pxAODEventAuxInfo(new xAOD::EventAuxInfo());
       std::unique_ptr< xAOD::EventInfo > pxAODEventInfo( new xAOD::EventInfo());
       pxAODEventInfo->setStore( pxAODEventAuxInfo.get() );
-      CHECK(m_xAODCnvTool->convert( pOverEvent, pxAODEventInfo.get(), true, false ));
+      CHECK(m_xAODCnvTool->convert( pOverEvent, pxAODEventInfo.get(), false, false ));
        // Before the record, keep a pointer to the EventInfo object, to be able
       // to add ElementLinks to it afterwards.
       xAOD::EventInfo* pLocalXAODEventInfo = pxAODEventInfo.get();

Tools/PROCTools/python/RunTier0TestsTools.py

@@ -23,7 +23,7 @@ ciRefFileMap = {
                 's3126-21.9'           : 'v1',
                 's3126-22.0'           : 'v1',
                 # OverlayTier0Test_required-test
-                'overlay-d1498-21.0'   : 'v2',
+                'overlay-d1498-21.0'   : 'v3',
                 'overlay-d1498-22.0'   : 'v1',
                 'overlay-bkg-21.0'     : 'v1',
                 'overlay-bkg-22.0'     : 'v1',