Merge branch 'FixLongLivedReSimulation_master' into 'master'

Fix for ReSimulation of samples with specialConfig (ATLMCPROD-10108)

See merge request atlas/athena!58997

Simulation/SimulationJobOptions/share/specialConfig/preInclude.AMSB.py

@@ -42,6 +42,9 @@ try:
     if "StreamHITS" in f.infos["stream_names"]:
         from Digitization.DigitizationFlags import digitizationFlags
         simdict = digitizationFlags.specialConfiguration.get_Value()
+        if simdict is None:
+            # Here we are in a ReSim job, so the input is a HITS file
+            raise ValueError
         doG4SimConfig = False
     else:
         from G4AtlasApps.SimFlags import simFlags

Simulation/SimulationJobOptions/share/specialConfig/preInclude.GMSB.py

@@ -120,6 +120,9 @@ try:
     if "StreamHITS" in f.infos["stream_names"]:
         from Digitization.DigitizationFlags import digitizationFlags
         simdict = digitizationFlags.specialConfiguration.get_Value()
+        if simdict is None:
+            # Here we are in a ReSim job, so the input is a HITS file
+            raise ValueError
         doG4SimConfig = False
     else:
         from G4AtlasApps.SimFlags import simFlags

Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py

@@ -44,6 +44,9 @@ try:
     if "StreamHITS" in f.infos["stream_names"]:
         from Digitization.DigitizationFlags import digitizationFlags
         simdict = digitizationFlags.specialConfiguration.get_Value()
+        if simdict is None:
+            # Here we are in a ReSim job, so the input is a HITS file
+            raise ValueError
         doG4SimConfig = False
     else:
         from G4AtlasApps.SimFlags import simFlags
@@ -52,6 +55,8 @@ try:
         simdict = simFlags.specialConfiguration.get_Value()
 except:
     from G4AtlasApps.SimFlags import simFlags
+    if not "InteractingPDGCodes" in simFlags.specialConfiguration.get_Value():
+        simFlags.specialConfiguration.get_Value()['InteractingPDGCodes'] = str([4110000,-4110000])
     simdict = simFlags.specialConfiguration.get_Value()
 
 assert "MASS" in simdict

Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py

@@ -45,6 +45,9 @@ try:
     if "StreamHITS" in f.infos["stream_names"]:
         from Digitization.DigitizationFlags import digitizationFlags
         simdict = digitizationFlags.specialConfiguration.get_Value()
+        if simdict is None:
+            # Here we are in a ReSim job, so the input is a HITS file
+            raise ValueError
         doG4SimConfig = False
     else:
         from G4AtlasApps.SimFlags import simFlags
@@ -55,6 +58,10 @@ try:
         simdict = simFlags.specialConfiguration.get_Value()
 except:
     from G4AtlasApps.SimFlags import simFlags
+    if not "InteractingPDGCodes" in simFlags.specialConfiguration.get_Value():
+        assert "CHARGE" in simFlags.specialConfiguration.get_Value()
+        CODE=10000000+int(float(simFlags.specialConfiguration.get_Value()["CHARGE"])*100)
+        simFlags.specialConfiguration.get_Value()['InteractingPDGCodes'] = str([CODE,-1*CODE])
     simdict = simFlags.specialConfiguration.get_Value()
 
 assert "MASS" in simdict

Simulation/SimulationJobOptions/share/specialConfig/preInclude.Quirks.py

@@ -21,6 +21,9 @@ if getPDGTABLE(simFlags.ExtraParticlesPDGTABLE.get_Value()):
         if "StreamHITS" in f.infos["stream_names"]:
             from Digitization.DigitizationFlags import digitizationFlags
             simdict = digitizationFlags.specialConfiguration.get_Value()
+            if simdict is None:
+                # Here we are in a ReSim job, so the input is a HITS file
+                raise ValueError
             doG4SimConfig = False
         else:
             from G4AtlasApps.SimFlags import simFlags

Simulation/SimulationJobOptions/share/specialConfig/preInclude.RHadronsPythia8.py

@@ -71,6 +71,9 @@ try:
     if "StreamHITS" in f.infos["stream_names"]:
         from Digitization.DigitizationFlags import digitizationFlags
         simdict = digitizationFlags.specialConfiguration.get_Value()
+        if simdict is None:
+            # Here we are in a ReSim job, so the input is a HITS file
+            raise ValueError
         doG4SimConfig = False
     else:
         from G4AtlasApps.SimFlags import simFlags

Simulation/SimulationJobOptions/share/specialConfig/preInclude.SleptonsLLP.py

@@ -72,6 +72,9 @@ try:
     if "StreamHITS" in f.infos["stream_names"]:
         from Digitization.DigitizationFlags import digitizationFlags
         simdict = digitizationFlags.specialConfiguration.get_Value()
+        if simdict is None:
+            # Here we are in a ReSim job, so the input is a HITS file
+            raise ValueError
         doG4SimConfig = False
     else:
         from G4AtlasApps.SimFlags import simFlags

Simulation/SimulationJobOptions/share/specialConfig/preInclude.fcp.py

@@ -43,6 +43,9 @@ try:
     if "StreamHITS" in f.infos["stream_names"]:
         from Digitization.DigitizationFlags import digitizationFlags
         simdict = digitizationFlags.specialConfiguration.get_Value()
+        if simdict is None:
+            # Here we are in a ReSim job, so the input is a HITS file
+            raise ValueError
         doG4SimConfig = False
     else:
         from G4AtlasApps.SimFlags import simFlags
@@ -55,6 +58,12 @@ try:
         simdict = simFlags.specialConfiguration.get_Value()
 except:
     from G4AtlasApps.SimFlags import simFlags
+    if not "InteractingPDGCodes" in simFlags.specialConfiguration.get_Value():
+        assert "CHARGE" in simFlags.specialConfiguration.get_Value()
+        assert "X" in simFlags.specialConfiguration.get_Value()
+        assert "Y" in simFlags.specialConfiguration.get_Value()
+        CODE=int(20000000)+int(simFlags.specialConfiguration.get_Value()["X"])*1000+int(simFlags.specialConfiguration.get_Value()["Y"])*10
+        simFlags.specialConfiguration.get_Value()['InteractingPDGCodes'] = str([CODE,-1*CODE])
     simdict = simFlags.specialConfiguration.get_Value()
 
 assert "MASS" in simdict