Workaround for CA-based ReSimulation jobs

Workaround for CA-based ReSimulation jobs

This ensures that the conditions run number is available during the
initialization again. The CA-based configuration behaviour is now the
same as the legacy configuration. Further debugging is required to see
if this is correct in the case of variable beam spot simulation.
Should fix ATLASSIM-6113.

Database/AthenaPOOL/AthenaPoolCnvSvc/python/PoolReadConfig.py

@@ -54,6 +54,12 @@ def EventSelectorAthenaPoolCfg(flags):
             pass
         from AthenaKernel.EventIdOverrideConfig import EvtIdModifierSvcCfg
         result.merge(EvtIdModifierSvcCfg(flags))
+    elif flags.Common.ProductionStep in [ProductionStep.Simulation] and len(flags.Input.RunNumber) and flags.Sim.ISF.ReSimulation:
+        # ReSimulation case
+        evSel.OverrideRunNumber = True
+        evSel.RunNumber = flags.Input.RunNumber[0]
+        if flags.Input.LumiBlockNumber: evSel.FirstLB = flags.Input.LumiBlockNumber[0]
+        evSel.InitialTimeStamp = flags.IOVDb.RunToTimestampDict.get(flags.Input.RunNumber[0], 1)
 
     result.addService(evSel)
     return result

Simulation/Tests/ISF_ValidationMT/test/test_MC20_ReSimulation_FullG4MT_QS_ttbar_MT.sh

@@ -54,7 +54,7 @@ then
 
     rc1=$?
     status=$rc1
-    mv log.ReSim log.ResSim.CA
+    mv log.ReSim log.ReSim.CA
 fi
 echo "art-result: $rc1 resimCA"