merge

1 files changed, 9 insertions, 5 deletions

diff --git a/generator/g4gen.py b/generator/g4gen.py
index d4e79a1..cec53f7 100644
--- a/generator/g4gen.py
+++ b/generator/g4gen.py
@@ -49,7 +49,13 @@ class G4Generator(object):
         self.tracking_action = G4chroma.PhotonTrackingAction()
         gRunManager.SetUserAction(self.tracking_action)
         gRunManager.Initialize()
-
+        
+        #preinitialize the process by running a simple event
+        self.generate_photons(event.Event(event_id=0, particle_name='e-', 
+                                          gen_position=(0,0,0), 
+                                          gen_direction=(1,0,0), 
+                                          gen_total_energy=1.0))
+        
     def create_g4material(self, material):
         g4material = G4Material('world_material', material.density * g / cm3,
                                 len(material.composition))
@@ -111,8 +117,8 @@ class G4Generator(object):
         else:
             # Create temporary subtrack for single primary particle
             subtracks = [event.Subtrack(particle_name=ev.particle_name,
-                                        position=ev.gen_pos,
-                                        direction=ev.gen_dir,
+                                        position=ev.gen_position,
+                                        direction=ev.gen_direction,
                                         start_time=0.0,
                                         total_energy=ev.gen_total_energy)]
 
@@ -133,8 +139,6 @@ if __name__ == '__main__':
     import time
     import optics
     gen = G4Generator(optics.water)
-    # prime things
-    gen.generate_photons(event.Event('e-', (0,0,0), (1,0,0), 1.0))
 
     start = time.time()
     n = 0