Merged branch master into master

XENON1T · Feb 28, 2017 · ee44389 · ee44389
2 parents 11a943f + 896ac8f
commit ee44389
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pax/plugins/io/WaveformSimulator.py b/pax/plugins/io/WaveformSimulator.py
@@ -291,7 +291,10 @@ def simulate_single_event(self, instructions):
         # generate the after pulse
         # currently make it simple, assuming s2 after pulses
         # will not generate further s2 after pulses.
-        self.s2_after_pulses(g4_id=q['g4_id'])
+        # If there were no instructions, there is no g4_id, but there will also be no photons,
+        # so running this is pointless.
+        if len(instructions):
+            self.s2_after_pulses(g4_id=q['g4_id'])
 
         event = self.simulator.make_pax_event()
         if hasattr(self, 'dataset_name'):