Skip to content
Snippets Groups Projects
Commit d063b693 authored by John Derek Chapman's avatar John Derek Chapman Committed by Tadej Novak
Browse files

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

Fix for ReSimulation of samples with specialConfig (ATLMCPROD-10108)
parent 6edf8550
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment