diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.AMSB.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.AMSB.py index 37e3dc578a75aecad26ee73aceff0b813c9d419c..7e20c489e3504d87d02ec0019fe1a221908b9bbb 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.AMSB.py +++ b/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 diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.GMSB.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.GMSB.py index 8905312b620ecfd10535d15fa18900d14996b8c5..c4b5c83df62f5784783b8a1132ab3e2a807ce81b 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.GMSB.py +++ b/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 diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py index 48a7b52fe438e468db1302256586b666d44f2ceb..90acc66cbca63e5447771783abfc0a8c9f685a2a 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Monopole.py +++ b/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 diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py index 384c1cd5a8df90755e3d554cd67531760ee7d6af..c3deb1dadd0b774fdcf0960dc1619df218f7b08b 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Qball.py +++ b/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 diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Quirks.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Quirks.py index 7d4d74f20056d43e9f15ed4d65e3cdd4e6e5a1ea..5143a54763d0e6b7068d0d30b3465556690fb49c 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.Quirks.py +++ b/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 diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.RHadronsPythia8.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.RHadronsPythia8.py index 99a701e537cb24e7fec2e3a786d1c9335a5c80a4..043f8764b6fc0a566a545ee68e30134a054a98c2 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.RHadronsPythia8.py +++ b/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 diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.SleptonsLLP.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.SleptonsLLP.py index 1733f71bb31f4ae6cc4931e784496a3289a263b6..66d9361fb3aa7b074c2454eb91586bcdbe7bc317 100644 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.SleptonsLLP.py +++ b/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 diff --git a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.fcp.py b/Simulation/SimulationJobOptions/share/specialConfig/preInclude.fcp.py index 3ec70f10da37a818ac8ae00247f737715b8e3834..10b725d6770c81efdacbdf540eb5794cdfbfa75b 100755 --- a/Simulation/SimulationJobOptions/share/specialConfig/preInclude.fcp.py +++ b/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