slic/src

diff -u -r1.13 -r1.14
--- EventSourceManager.cc	18 Nov 2005 19:24:27 -0000	1.13
+++ EventSourceManager.cc	19 Dec 2005 23:53:31 -0000	1.14
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/EventSourceManager.cc,v 1.13 2005/11/18 19:24:27 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/EventSourceManager.cc,v 1.14 2005/12/19 23:53:31 jeremy Exp $

 #include "EventSourceManager.hh"
 
 // slic

@@ -46,7 +46,7 @@

     m_unknownStr     = std::string("unknown");
 
     // setup default source

-    setupEventSource();

+    //    setupEventSource();

   }
 
   EventSourceManager::~EventSourceManager()

slic/src

diff -u -r1.60 -r1.61
--- G4Application.cc	19 Dec 2005 21:41:39 -0000	1.60
+++ G4Application.cc	19 Dec 2005 23:53:31 -0000	1.61
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.60 2005/12/19 21:41:39 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.61 2005/12/19 23:53:31 jeremy Exp $

 #include "G4Application.hh"
 
 // slic

@@ -21,6 +21,9 @@

 #include "EventDebugger.hh"
 #include "TrajectoryManager.hh"
 

+#include "PhysicsListFactory.hh"
+#include "LHEP.hh"
+

 // lcdd
 #include "LCDDParser.hh"
 

@@ -168,6 +171,12 @@

       // create new Geant4 RunManager
       m_runManager = new RunManager();
 

+      // DEBUG - setup a dummy physics list
+      m_runManager->SetUserInitialization( PhysicsListFactory::create( "LHEP" ) );
+
+      // DEBUG - setup the default event source after physics
+      EventSourceManager::instance()->setupEventSource();
+

       // print app splash screen
       printSplashScreen( cout );
 

slic/src

diff -u -r1.13 -r1.14
--- PhysicsListManager.cc	19 Dec 2005 21:55:07 -0000	1.13
+++ PhysicsListManager.cc	19 Dec 2005 23:53:31 -0000	1.14
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.13 2005/12/19 21:55:07 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.14 2005/12/19 23:53:31 jeremy Exp $

 #include "PhysicsListManager.hh"
 
 // geant4

@@ -35,9 +35,6 @@

 
     // new messenger
     m_messenger = new PhysicsMessenger();

-
-    /* Initialize with a default list, because physics initialization must be set first. */
-    G4RunManager::GetRunManager()->SetUserInitialization( PhysicsListFactory::create( m_currentListName ) );

   }
 
   void PhysicsListManager::setCurrentListName(const std::string& n)

slic/src

diff -u -r1.11 -r1.12
--- RunManager.cc	6 Dec 2005 02:28:12 -0000	1.11
+++ RunManager.cc	19 Dec 2005 23:53:31 -0000	1.12
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/RunManager.cc,v 1.11 2005/12/06 02:28:12 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/RunManager.cc,v 1.12 2005/12/19 23:53:31 jeremy Exp $

 #include "RunManager.hh"
 
 // lcdd

@@ -17,19 +17,18 @@

 
   void RunManager::InitializePhysics()
   {

-    /* initialize the physics list */

+    /* Initialize the physics list in SLIC. */

     PhysicsListManager::instance()->initializePhysicsList();
 

-    /* call parent's init function to setup physics */

+    /* Call G4RunManager's init function to setup physics. */

     G4RunManager::InitializePhysics();
 

-    /* check if LCDD subsystem got some limits from the input file */

+    /* Check if the LCDD subsystem got some limits from the input file. */

     LCDDProcessor* lcdd = LCDDProcessor::instance();
     PhysicsListManager* pmgr = PhysicsListManager::instance();
     if ( lcdd->getLimitSetsBegin() != lcdd->getLimitSetsEnd() ) {
       pmgr->enableLimits(true);
     }

-

     /* enable physics limits, if necessary */
     if ( pmgr->enableLimits() )  {
       pmgr->setupUserLimitsProcesses();

@@ -48,8 +47,7 @@

 
   void RunManager::BeamOn(G4int n_event, const char* macroFile, G4int n_select)
   {

-
-    /* if the simulator is not in Idle, then attempt init */

+    /* Attempt to initialize Geant4 if not in idle state. */

     if ( G4StateManager::GetStateManager()->GetCurrentState() != G4State_Idle ) {
       this->Initialize();
     }