diff -u -r1.72 -r1.73
--- G4Application.cc	5 Sep 2006 23:21:56 -0000	1.72
+++ G4Application.cc	18 Oct 2006 22:32:13 -0000	1.73
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.72 2006/09/05 23:21:56 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.73 2006/10/18 22:32:13 jeremy Exp $

 #include "G4Application.hh"
 
 // slic

@@ -6,7 +6,6 @@

 #include "EventAction.hh"
 #include "EventDebugger.hh"
 #include "EventSourceManager.hh"

-//#include "FieldMessenger.hh"

 #include "FieldManager.hh"
 #include "G4ApplicationMessenger.hh"
 #include "LcioManager.hh"

@@ -25,8 +24,6 @@

 // lcdd
 #include "LCDDDetectorConstruction.hh"
 #include "LCDDObjectStoreInspector.hh"

-#include "LCDDParser.hh"
-#include "StoreInspector.hh"

 
 // geant4
 #include "G4ApplicationState.hh"

@@ -75,8 +72,6 @@

 
   G4Application::~G4Application()
   {

-    // FIXME: The ModuleManager should be handling these deletions.
-

 #ifdef G4VIS_USE
     if (m_visManager != 0) {
       delete m_visManager;

@@ -128,11 +123,9 @@

       m_appMessenger = new G4ApplicationMessenger(this);
 
       // Initialize the log manager.

-      //m_logManager = LogManager::instance();

       LogManager::instance();
 
       // Initialize the event generation manager.

-      //m_genManager = EventSourceManager::instance();

       EventSourceManager::instance();
 
 #ifdef SLIC_VERBOSE

@@ -144,12 +137,7 @@

       // Create a new RunManager.
       m_runManager = new RunManager();
 

-      // Object store manager.
-      //m_objManager = new LCDDObjectStoreInspector();
-      new LCDDObjectStoreInspector();
-

       // Initialize the physics list manager.

-      //m_physicsManager = PhysicsListManager::instance();

       PhysicsListManager::instance();
 
       // Setup the default event source AFTER PHYSICS.

@@ -159,15 +147,12 @@

       printSplashScreen( cout );
 
       // Initialize the LcioManager.

-      //m_lcioManager = LcioManager::instance();

       LcioManager::instance();
 
       // Initialize the EventDebugger.

-      //m_eventDebugger = EventDebugger::instance();

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

-      //m_fieldMessenger = new FieldMessenger();

       FieldManager::instance();
 
       // Construct and register the UserAction classes.

@@ -249,6 +234,7 @@

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

+      new LCDDObjectStoreInspector();

 
       // SLIC's UserAction handlers.
       m_runManager->SetUserAction(new RunAction);