diff -u -r1.36 -r1.37
--- G4Application.hh	19 Oct 2005 22:51:08 -0000	1.36
+++ G4Application.hh	19 Dec 2005 21:41:39 -0000	1.37
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.36 2005/10/19 22:51:08 jeremy Exp $

+// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.37 2005/12/19 21:41:39 jeremy Exp $

 #ifndef slic_G4Application_hh
 #define slic_G4Application_hh 1
 

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

 #include "RunManager.hh"
 #include "StringUtil.hh"
 

-// Makoto's material scanner
-#include "G4MaterialScanner.hh"
-

 // geant4
 #include "G4ApplicationState.hh"
 #ifdef G4VIS_USE

@@ -122,8 +119,6 @@

 
     void initializeRunManager();
 

-    void initializeMaterialScanner();
-

   protected:
 
     // instance

@@ -155,9 +150,6 @@

     // hack to make aborting G4 work (doesn't seem to function properly)
     bool m_setRunAbort;
 

-    // material scanner
-    G4MaterialScanner* scanner;
-

     /* Has the application been initialized yet? */
     bool m_isInitialized;
   };

diff -u -r1.59 -r1.60
--- G4Application.cc	9 Dec 2005 01:57:38 -0000	1.59
+++ G4Application.cc	19 Dec 2005 21:41:39 -0000	1.60
@@ -1,4 +1,4 @@

-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.59 2005/12/09 01:57:38 jeremy Exp $

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

 #include "G4Application.hh"
 
 // slic

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

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

-#include "StoreInspector.hh" // TEST

 
 // lcdd
 #include "LCDDParser.hh"

@@ -127,8 +126,6 @@

 
     delete TrajectoryManager::instance();
 

-    delete scanner;
-

     printEndTime(cout);
   }
 

@@ -189,22 +186,15 @@

     }
   }
 

-  void G4Application::initializeMaterialScanner()
-  {
-    scanner = new G4MaterialScanner();
-  }
-

 #ifndef G4UI_NONE
   void G4Application::initializeUI()
   {
     // tcsh setup
 #ifdef G4UI_USE_TCSH

-//   G4cout << "using TCSH" << G4endl;

     m_session = new G4UIterminal(new G4UItcsh);
 
     // csh setup
 #elif G4UI_USE_CSH

-//    G4cout << "using CSH" << G4endl;

     m_session = new G4UIterminal(new G4UIcsh);
 
     // Gag setup

@@ -222,7 +212,6 @@

       ui->ApplyCommand("/gui/addButton file Exit \"exit\"");
     }
 #else

-//    G4cout << "using plain G4UIterminal" << G4endl;

     m_session = new G4UIterminal();
 #endif
 

@@ -276,9 +265,6 @@

       m_runManager->SetUserAction(new EventAction);
       m_runManager->SetUserAction(new TrackingAction);
       m_runManager->SetUserAction(new SteppingAction);

-
-      // material scanner
-      initializeMaterialScanner();

     }
     else {
       G4Exception("G4Application::initializeDefaultSetup() - RunManager is NULL!");