slic

diff -u -r1.17 -r1.18
--- slic.cc	5 Sep 2006 23:21:41 -0000	1.17
+++ slic.cc	16 Feb 2007 02:05:36 -0000	1.18
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/slic.cc,v 1.17 2006/09/05 23:21:41 jeremy Exp $

+// $Header: /cvs/lcd/slic/slic.cc,v 1.18 2007/02/16 02:05:36 jeremy Exp $

 
 /**
    @mainpage

@@ -48,7 +48,7 @@

     slicApp = G4Application::instance();
 
     // Setup the command line arguments.

-    slicApp->setupFromCommandLine(argc, argv);

+    slicApp->initialize(argc, argv);

 
     // Run the simulator.
     slicApp->run();

slic/include

diff -u -r1.46 -r1.47
--- G4Application.hh	9 Jan 2007 00:42:26 -0000	1.46
+++ G4Application.hh	16 Feb 2007 02:05:36 -0000	1.47
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.46 2007/01/09 00:42:26 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.47 2007/02/16 02:05:36 jeremy Exp $

 
 #ifndef SLIC_G4APPLICATION_HH
 #define SLIC_G4APPLICATION_HH 1

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

 // geant4
 class G4RunManager;
 

-// lcdd
-class LCDDObjectStoreInspector;
-

 namespace slic
 {
   // slic

@@ -139,7 +136,7 @@

     /** 
      * Setup SLIC from command line arguments using the CommandLineProcessor.
      */

-    void setupFromCommandLine(int, char**);

+    void initialize(int, char**);

 
     /** 
      * Set the return code.

@@ -201,9 +198,6 @@

     // field messenger
     FieldMessenger* m_fieldMessenger;
 

-    // FIXME: Make this a module.
-    LCDDObjectStoreInspector* m_objManager;
-

     RunManager* m_runManager;
 
     // application run mode: batch or interactive

slic/src

diff -u -r1.77 -r1.78
--- G4Application.cc	9 Jan 2007 00:42:27 -0000	1.77
+++ G4Application.cc	16 Feb 2007 02:05:36 -0000	1.78
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.77 2007/01/09 00:42:27 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.78 2007/02/16 02:05:36 jeremy Exp $

 
 #include "G4Application.hh"
 

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

 
 // lcdd
 #include "LCDDDetectorConstruction.hh"

-#include "LCDDObjectStoreInspector.hh"

 #include "NistWriterMessenger.hh"
 
 // geant4

@@ -82,16 +81,12 @@

       delete m_session;
     }
 

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

     if (m_appMessenger != 0) {
       delete m_appMessenger;
     }
   }
 

-  void G4Application::setupFromCommandLine(int argc, char** argv)

+  void G4Application::initialize(int argc, char** argv)

   {
     // Set the name and basename of slic's binary from the command line arguments.
     m_binaryname = std::string(argv[0]);

@@ -225,9 +220,6 @@

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

-
-    // The object store inspector.
-    new LCDDObjectStoreInspector();

   }
   
   void G4Application::initializePrimaryGeneratorAction()