diff -u -r1.44 -r1.45
--- G4Application.hh	30 Nov 2006 02:32:24 -0000	1.44
+++ G4Application.hh	18 Dec 2006 22:10:00 -0000	1.45
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.44 2006/11/30 02:32:24 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.45 2006/12/18 22:10:00 jeremy Exp $

 
 #ifndef SLIC_G4APPLICATION_HH
 #define SLIC_G4APPLICATION_HH 1

@@ -156,7 +156,17 @@

     /** 
      * Register the Geant4 user action classes with the G4RunManager.
      */

-    void setupUserActions();

+    void initializeUserActions();
+
+    /**
+     * Register the LCDDDetectorConstruction.
+     */
+    void initializeLCDDDetectorConstruction();
+
+    /**
+     * Register the PrimaryGeneratorAction.
+     */
+    void initializePrimaryGeneratorAction();

 
     /** 
      * Initialize the Geant4 user interface.

diff -u -r1.75 -r1.76
--- G4Application.cc	30 Nov 2006 02:32:27 -0000	1.75
+++ G4Application.cc	18 Dec 2006 22:10:00 -0000	1.76
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.75 2006/11/30 02:32:27 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.76 2006/12/18 22:10:00 jeremy Exp $

 
 #include "G4Application.hh"
 

@@ -81,9 +81,9 @@

       delete m_session;
     }
 

-    if (m_runManager != 0) {
-      delete m_runManager;
-    }

+    //if (m_runManager != 0) {
+    //  delete m_runManager;
+    //}

 
     if (m_appMessenger != 0) {
       delete m_appMessenger;

@@ -141,8 +141,14 @@

       // Initialize the magnetic field messenger.
       FieldManager::instance();
 

+      // Setup the generator.
+      initializePrimaryGeneratorAction();
+      
+      // Setup the LCDD subsystem.
+      initializeLCDDDetectorConstruction();
+

       // Construct and register the UserAction classes.

-      setupUserActions();

+      initializeUserActions();

 
       // Initialize visualization.
 #ifdef G4VIS_USE

@@ -211,26 +217,28 @@

   }
 #endif
 

-  void G4Application::setupUserActions()

+  void G4Application::initializeLCDDDetectorConstruction()

   {

-    if ( m_runManager != 0 ) {

+    // LCDD geometry subsystem.
+    m_runManager->SetUserInitialization(new LCDDDetectorConstruction);

-      // Primary generator.
-      m_runManager->SetUserAction(new PrimaryGeneratorAction);

+    // The object store inspector.
+    new LCDDObjectStoreInspector();
+  }
+  
+  void G4Application::initializePrimaryGeneratorAction()
+  {
+    // Primary generator.
+    m_runManager->SetUserAction(new PrimaryGeneratorAction);
+  }

-      // LCDD geometry subsystem.
-      m_runManager->SetUserInitialization(new LCDDDetectorConstruction);
-      new LCDDObjectStoreInspector();
-
-      // SLIC's UserAction handlers.
-      m_runManager->SetUserAction(new RunAction);
-      m_runManager->SetUserAction(new EventAction);
-      m_runManager->SetUserAction(new TrackingAction);
-      m_runManager->SetUserAction(new SteppingAction);
-    }
-    else {
-      G4Exception("G4Application::setupUserActions() - RunManager is NULL!");
-    }

+  void G4Application::initializeUserActions()
+  {
+    // SLIC's UserAction handlers.
+    m_runManager->SetUserAction(new RunAction);
+    m_runManager->SetUserAction(new EventAction);
+    m_runManager->SetUserAction(new TrackingAction);
+    m_runManager->SetUserAction(new SteppingAction);

   }
 
   void G4Application::setMode(G4Application::ERunMode rmode)