diff options
| author | Stan Seibert <stan@mtrr.org> | 2011-08-17 14:38:45 -0400 |
|---|---|---|
| committer | Stan Seibert <stan@mtrr.org> | 2011-08-17 14:38:45 -0400 |
| commit | b88e37c5c7de5411fb003a3c146a1b697b5813ad (patch) | |
| tree | ce6b6bc992a901da7e83097bfe22d2b1f3ced09f /generator | |
| parent | ee07d0165f86ef6942bffd6ae88057926ab4e775 (diff) | |
| parent | 11210ce25a543875eb51cff8efc06e7f02984214 (diff) | |
| download | chroma-b88e37c5c7de5411fb003a3c146a1b697b5813ad.tar.gz chroma-b88e37c5c7de5411fb003a3c146a1b697b5813ad.tar.bz2 chroma-b88e37c5c7de5411fb003a3c146a1b697b5813ad.zip | |
merge
Diffstat (limited to 'generator')
| -rw-r--r-- | generator/g4gen.py | 2 | ||||
| -rw-r--r-- | generator/vertex.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/generator/g4gen.py b/generator/g4gen.py index cec53f7..b43ce92 100644 --- a/generator/g4gen.py +++ b/generator/g4gen.py @@ -4,7 +4,7 @@ import g4py.NISTmaterials import g4py.ParticleGun import pyublas import numpy as np -import event +import chroma.event as event try: import G4chroma diff --git a/generator/vertex.py b/generator/vertex.py index 1fa61cb..3998e6e 100644 --- a/generator/vertex.py +++ b/generator/vertex.py @@ -3,8 +3,8 @@ import numpy as np from math import sin, cos, sqrt import copy -import pi0 -from event import Event, Subtrack +import chroma.pi0 as pi0 +from chroma.event import Event, Subtrack # generator parts for use with gun() |