diff options
Diffstat (limited to 'generator/vertex.py')
| -rw-r--r-- | generator/vertex.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/generator/vertex.py b/generator/vertex.py index 5521d6b..b4e2d23 100644 --- a/generator/vertex.py +++ b/generator/vertex.py @@ -4,7 +4,7 @@ from itertools import izip, count from chroma.pi0 import pi0_decay from chroma import event from chroma.sample import uniform_sphere -from chroma.itertoolset import repeat_func +from chroma.itertoolset import repeatfunc # generator parts for use with gun() @@ -13,7 +13,7 @@ def from_histogram(h): pdf = h.hist/h.hist.sum() cdf = np.cumsum(pdf) - for x in repeat_func(np.random.random_sample): + for x in repeatfunc(np.random.random_sample): yield h.bincenters[np.searchsorted(cdf, x)] def constant(obj): @@ -43,14 +43,14 @@ def flat(e_lo, e_hi): def particle_gun(particle_name_iter, pos_iter, dir_iter, ke_iter, start_id=0): for i, particle_name, pos, dir, ke in izip(count(start_id), particle_name_iter, pos_iter, dir_iter, ke_iter): dir /= np.linalg.norm(dir) - vertex = event.Vertex(particle_name, pos, dir, None, ke) + vertex = event.Vertex(particle_name, pos, dir, ke) ev_vertex = event.Event(i, vertex, [vertex]) yield ev_vertex def pi0_gun(pos_iter, dir_iter, ke_iter, start_id=0): for i, pos, dir, ke in izip(count(start_id), pos_iter, dir_iter, ke_iter): dir /= np.linalg.norm(dir) - primary_vertex = event.Vertex('pi0', pos, dir, None, ke) + primary_vertex = event.Vertex('pi0', pos, dir, ke) cos_theta_rest = np.random.random_sample() * 2 - 1 theta_rest = np.arccos(cos_theta_rest) @@ -59,8 +59,8 @@ def pi0_gun(pos_iter, dir_iter, ke_iter, start_id=0): (gamma1_e, gamma1_dir), (gamma2_e, gamma2_dir) = \ pi0_decay(ke+134.9766, dir, theta_rest, phi_rest) - gamma1_vertex = event.Vertex('gamma', pos, gamma1_dir, None, gamma1_e) - gamma2_vertex = event.Vertex('gamma', pos, gamma2_dir, None, gamma2_e) + gamma1_vertex = event.Vertex('gamma', pos, gamma1_dir, gamma1_e) + gamma2_vertex = event.Vertex('gamma', pos, gamma2_dir, gamma2_e) ev_vertex = event.Event(i, primary_vertex, [gamma1_vertex, gamma2_vertex]) |