diff options
author | Anthony LaTorre <tlatorre9@gmail.com> | 2011-09-03 12:42:48 -0400 |
---|---|---|
committer | Anthony LaTorre <tlatorre9@gmail.com> | 2011-09-03 12:42:48 -0400 |
commit | 3891e1e8747e21be3911ec1f64963752a2129f7c (patch) | |
tree | 2caa7ee552880d9a9b69b4c5028812610fc05bae | |
parent | 707ca1b366f11032682cc864ca2848905e6b485c (diff) | |
download | chroma-3891e1e8747e21be3911ec1f64963752a2129f7c.tar.gz chroma-3891e1e8747e21be3911ec1f64963752a2129f7c.tar.bz2 chroma-3891e1e8747e21be3911ec1f64963752a2129f7c.zip |
Simulation.simulate() now accepts event.Vertex objects.
-rwxr-xr-x | sim.py | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -61,12 +61,18 @@ class Simulation(object): self.pdf_config = None def simulate(self, iterable, keep_photons_beg=False, keep_photons_end=False, run_daq=True, max_steps=10): - first_element, iterable = peek(iterable) + try: + first_element, iterable = peek(iterable) + except TypeError: + first_element, iterable = iterable, [iterable] if isinstance(first_element, event.Event): iterable = self.photon_generator.generate_events(iterable) elif isinstance(first_element, event.Photons): iterable = (event.Event(photons_beg=x) for x in iterable) + elif isinstance(first_element, event.Vertex): + iterable = (event.Event(vertices=[vertex]) for vertex in iterable) + iterable = self.photon_generator.generate_events(iterable) for ev in iterable: gpu_photons = gpu.GPUPhotons(ev.photons_beg) |