Commit in slic on MAIN
slic.cc+3-31.14 -> 1.15
include/G4Application.hh+9-131.34 -> 1.35
       /G4ApplicationMessenger.hh+6-11.6 -> 1.7
       /SlicApplication.hh-491.31 removed
       /SlicMessenger.hh-411.7 removed
src/G4Application.cc+193-21.50 -> 1.51
   /G4ApplicationMessenger.cc+22-11.8 -> 1.9
   /SlicApplication.cc-2381.39 removed
   /SlicMessenger.cc-481.10 removed
+233-396
4 removed + 5 modified, total 9 files
Moved everything in SlicApplication and SlicMessenger into G4Application and G4ApplicationMessenger class.

slic
slic.cc 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- slic.cc	16 Sep 2005 23:04:34 -0000	1.14
+++ slic.cc	28 Sep 2005 18:52:26 -0000	1.15
@@ -1,7 +1,7 @@
-// $Header: /cvs/lcd/slic/slic.cc,v 1.14 2005/09/16 23:04:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/slic.cc,v 1.15 2005/09/28 18:52:26 jeremy Exp $
 
 // SLIC
-#include "SlicApplication.hh"
+#include "G4Application.hh"
 
 // std
 #include <iostream>
@@ -23,7 +23,7 @@
   try {
 
     // create new slic simulator app
-    slicApp = new SlicApplication(argc, argv);
+    slicApp = new G4Application(argc, argv);
 
     // run with CL args
     slicApp->run();

slic/include
G4Application.hh 1.34 -> 1.35
diff -u -r1.34 -r1.35
--- G4Application.hh	22 Sep 2005 21:38:57 -0000	1.34
+++ G4Application.hh	28 Sep 2005 18:52:27 -0000	1.35
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.34 2005/09/22 21:38:57 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.35 2005/09/28 18:52:27 jeremy Exp $
 #ifndef slic_G4Application_hh
 #define slic_G4Application_hh 1
 
@@ -29,25 +29,24 @@
 
   /**
    * @class G4Application
-   * @brief Singleton class for an extendable Geant4 application.
+   * @brief Singleton class for a Geant4 application.
    * @note  Instantiates manager and messenger classes, including
    *        user actions, G4RunManager, CmdManager, GeneratorManager
    *        and PhysicsListManager.
    */
-  /* FIXME: G4Application -> SlicAppliation classing/delegation is weird! */
   class G4Application
   {
 
   public:
 
-    virtual ~G4Application();
+    ~G4Application();
 
     /* Indicates batch or interactive mode */
     enum ERunMode { eBatch=1, eInteractive=2 };
 
     typedef int ReturnCodeType;
 
-  protected:
+  public:
 
     G4Application(int, char**);
 
@@ -61,12 +60,12 @@
     RunManager* getRunManager();
 
     // initialize the application
-    virtual void initialize();
+    void initialize();
 
     // run the application
-    virtual void run();
+    void run();
 
-    virtual void printOutUsage(std::ostream& os);
+    void printOutUsage(std::ostream& os);
 
     void printSplashScreen(std::ostream& os) const;
 
@@ -102,12 +101,9 @@
 
   protected:
 
-    virtual void setupFromCommandLine(int, char**);
+    void setupFromCommandLine(int, char**);
 
-    virtual void registerCmdLineOpts()
-    {
-      // includes no CL ops by default
-    }
+    void registerCmdLineOpts();
 
     void setReturnCode(ReturnCodeType rc)
     {

slic/include
G4ApplicationMessenger.hh 1.6 -> 1.7
diff -u -r1.6 -r1.7
--- G4ApplicationMessenger.hh	22 Sep 2005 21:38:57 -0000	1.6
+++ G4ApplicationMessenger.hh	28 Sep 2005 18:52:27 -0000	1.7
@@ -1,10 +1,11 @@
-// $Header: /cvs/lcd/slic/include/G4ApplicationMessenger.hh,v 1.6 2005/09/22 21:38:57 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/G4ApplicationMessenger.hh,v 1.7 2005/09/28 18:52:27 jeremy Exp $
 
 #ifndef slic_G4ApplicationMessenger_hh
 #define slic_G4ApplicationMessenger_hh 1
 
 // geant4
 #include "G4UImessenger.hh"
+#include "G4UIdirectory.hh"
 #include "G4UIcommand.hh"
 
 namespace slic
@@ -32,7 +33,11 @@
 
     G4Application* m_app;
 
+    G4UIdirectory* m_slicDir;
+
     G4UIcommand* m_interactive;
+    G4UIcommand* m_slicUsage;
+    G4UIcommand* m_slicVersion;
   };
 };
 

slic/include
SlicApplication.hh removed after 1.31
diff -N SlicApplication.hh
--- SlicApplication.hh	22 Sep 2005 21:38:59 -0000	1.31
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,49 +0,0 @@
-// $Header: /cvs/lcd/slic/include/Attic/SlicApplication.hh,v 1.31 2005/09/22 21:38:59 jeremy Exp $
-#ifndef slic_SlicApplication_hh
-#define slic_SlicApplication_hh 1
-
-// geant4
-#include "G4Application.hh"
-
-// std
-#include <string>
-
-namespace slic
-{
-
-  class SlicMessenger;
-
-  /**
-   * @class SlicApplication
-   * @brief SLIC application class for control, CL options, and app metadata.
-   * @note  G4-based control flow is implemented in the G4Application parent class.
-   *
-   * This class uses the PACKAGE vars defined by Autoconf for all "meta" info.
-   */
-  class SlicApplication : public G4Application
-  {
-  public:
-    virtual ~SlicApplication();
-    SlicApplication(int, char**);
-
-  public:
-
-    virtual void setupFromCommandLine(int argc, char** argv);
-
-    virtual void initialize();
-    virtual void run();
-
-    virtual void registerCmdLineOpts();
-
-    virtual void printOutUsage(std::ostream& os);
-
-  private:
-
-    SlicMessenger* m_messenger;
-
-    std::string sMacroFile;
-  };
-};
-
-#endif
-

slic/include
SlicMessenger.hh removed after 1.7
diff -N SlicMessenger.hh
--- SlicMessenger.hh	22 Sep 2005 21:38:59 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-// $Header: /cvs/lcd/slic/include/Attic/SlicMessenger.hh,v 1.7 2005/09/22 21:38:59 jeremy Exp $
-#ifndef slic_SlicMessenger_hh
-#define slic_SlicMessenger_hh 1
-
-// geant4
-#include "G4UImessenger.hh"
-#include "G4UIcommand.hh"
-#include "G4UIdirectory.hh"
-
-namespace slic
-{
-
-  class SlicApplication;
-
-  /**
-     @class SlicMessenger
-     @brief G4UImessenger for SLIC commands.
-  */
-  class SlicMessenger : public G4UImessenger
-  {
-  public:
-    SlicMessenger(SlicApplication*);
-    virtual ~SlicMessenger();
-
-  public:
-    virtual void SetNewValue(G4UIcommand* cmd, G4String newVals);
-
-  private:
-    void defineCommands();
-
-  private:
-
-    SlicApplication* m_app;
-
-    G4UIdirectory* m_slicDir;
-    G4UIcommand* m_slicUsage;
-    G4UIcommand* m_slicVersion;
-  };
-};
-
-#endif

slic/src
G4Application.cc 1.50 -> 1.51
diff -u -r1.50 -r1.51
--- G4Application.cc	22 Sep 2005 21:39:05 -0000	1.50
+++ G4Application.cc	28 Sep 2005 18:52:28 -0000	1.51
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.50 2005/09/22 21:39:05 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.51 2005/09/28 18:52:28 jeremy Exp $
 #include "G4Application.hh"
 
 // slic
@@ -55,7 +55,7 @@
 
   G4Application* G4Application::m_instance = 0 ;
 
-  G4Application::G4Application(int, char**)
+  G4Application::G4Application(int argc, char** argv)
     : m_runManager(0),
       m_session(0),
       m_mode(G4Application::eBatch),
@@ -86,6 +86,11 @@
 
     // init event gen manager
     EventSourceManager::instance();
+
+    registerCmdLineOpts();
+
+    /* Setup the Geant4 command queue from the CL args. */
+    setupFromCommandLine(argc, argv);
   }
 
   /* FIXME: Are all deletions being done here??? */
@@ -156,6 +161,12 @@
   {
     if (!m_isInitialized) {
 
+#ifdef SLIC_VERBOSE
+      std::cout << "SLIC verbose system is enabled." << std::endl;
+#else
+      std::cout << "SLIC verbose system is disabled." << std::endl;
+#endif
+
       // create new Geant4 RunManager
       m_runManager = new RunManager();
 
@@ -313,7 +324,29 @@
 
   void G4Application::printOutUsage(std::ostream& os)
   {
+    os << std::endl;
+    os << "**************" << std::endl;
+    os << "* SLIC Usage *" << std::endl;
+    os << "**************" << std::endl;
+
+    os << std::endl;
+    os << "Command line usage: " << std::endl;
+    os << std::endl;
+    os << "slic [single_macro_path]" << std::endl;
+    os << "slic [options]" << std::endl;
+
+    os << std::endl;
+
+    os << "Interactive usage: " << std::endl;
+    os << std::endl;
+    os << "slic -n" << std::endl;
+
+    os << std::endl;
+
+    // print out cmd registry
     CmdManager::instance()->getCmdRegistry()->printOut( os );
+
+    os << std::endl;
   }
 
   void G4Application::printSplashScreen(std::ostream& os) const
@@ -342,4 +375,162 @@
   {
     os << "End Time <" << TimeUtil::getAscTime() << ">" << endl;
   }
+
+  void G4Application::registerCmdLineOpts()
+  {
+    CmdManager* cmd_mgr = CmdManager::instance();
+
+    // usage
+    CmdLineOpt* cmd_usage = new CmdLineOpt("h",
+					   "help",
+					   "Print SLIC usage directions.",
+					   0,
+					   0);
+    cmd_mgr->addCmd(cmd_usage, "/slic/usage" );
+
+    // interactive mode
+    CmdLineOpt* cmd_iact = new CmdLineOpt("n",
+					  "interactive",
+					  "Start a Geant4 interactive session.",
+					  0,
+					  0);
+    cmd_mgr->addCmd(cmd_iact, "/control/interactive");
+
+    // print SLIC version info
+    CmdLineOpt* cmd_version = new CmdLineOpt("v",
+					     "version",
+					     "Print SLIC version.",
+					     0,
+					     0);
+    cmd_mgr->addCmd(cmd_version, "/slic/version");
+
+    // exec macro
+    CmdLineOpt* cmd_exec = new CmdLineOpt("m",
+					  "macro",
+					  "Execute Geant4 commands from a file.",
+					  1,
+					  1);
+    cmd_mgr->addCmd(cmd_exec, "/control/execute" );
+
+    // set LCDD URI
+    CmdLineOpt* cmd_lcddURL = new CmdLineOpt("g",
+					     "lcdd-url",
+					     "Set LCDD geometry file URL.",
+					     1,
+					     1);
+    cmd_mgr->addCmd(cmd_lcddURL, "/lcdd/url" );
+
+    // set LCDD setup name
+    CmdLineOpt* cmd_lcddSetup = new CmdLineOpt("S",
+					       "lcdd-setup",
+					       "Set LCDD geometry setup name.",
+					       1,
+					       1);
+    cmd_mgr->addCmd(cmd_lcddSetup, "/lcdd/setupName" );
+
+    /* set LCDD setup name */
+    CmdLineOpt* cmd_lcddVersion = new CmdLineOpt("V",
+						 "lcdd-version",
+						 "Set LCDD geometry version.",
+						 1,
+						 1);
+    cmd_mgr->addCmd(cmd_lcddVersion, "/lcdd/version" );
+
+    // set the generator input file
+    CmdLineOpt* cmd_stdhep = new CmdLineOpt("i",
+					    "event-file",
+					    "Set event input file full path.",
+					    1,
+					    1 );
+
+    cmd_mgr->addCmd(cmd_stdhep, "/generator/filename" );
+
+    // set name of LCIO output file
+    CmdLineOpt* cmd_lcio = new CmdLineOpt("o",
+					  "lcio-file",
+					  "Set name of LCIO output file.",
+					  1,
+					  1);
+    cmd_mgr->addCmd(cmd_lcio, "/lcio/filename" );
+
+    // set Lcio path
+    CmdLineOpt* cmd_lcio_path = new CmdLineOpt("p",
+					       "lcio-path",
+					       "Set directory for LCIO output.",
+					       1,
+					       1);
+    cmd_mgr->addCmd(cmd_lcio_path, "/lcio/path" );
+
+    // automatically name the LCIO output file
+    CmdLineOpt* cmd_autoname = new CmdLineOpt("O",
+					      "autoname",
+					      "Automatically name the LCIO output file.",
+					      0,
+					      0);
+    cmd_mgr->addCmd(cmd_autoname, "/lcio/autoname" );
+
+    // overwrite an LCIO output file if it exists already
+    CmdLineOpt* delLcio = new CmdLineOpt("x",
+					 "lcio-delete",
+					 "Delete an existing LCIO file.",
+					 0,
+					 0);
+    cmd_mgr->addCmd(delLcio, "/lcio/fileExists delete");
+
+    // beamOn
+    CmdLineOpt* cmd_beamon = new CmdLineOpt("r",
+					    "run-events",
+					    "Run # of events. (Should be last arg if batch!)",
+					    1,
+					    1);
+    cmd_mgr->addCmd(cmd_beamon, "/run/beamOn");
+
+    // set num input events to skip
+    CmdLineOpt* cmd_skip_evt = new CmdLineOpt("s",
+					      "skip-events",
+					      "Set number of events to skip.",
+					      1,
+					      1);
+    cmd_mgr->addCmd(cmd_skip_evt, "/generator/skipEvents" );
+
+    // set G4 physics list
+    CmdLineOpt* cmd_phys = new CmdLineOpt("l",
+					  "physics-list",
+					  "Set G4 physics list.",
+					  1,
+					  1);
+    cmd_mgr->addCmd(cmd_phys, "/physics/select");
+
+    // logfile
+    CmdLineOpt* cmd_log = new CmdLineOpt("L",
+					 "log-file",
+					 "Set logfile name.",
+					 0,
+					 0);
+    cmd_mgr->addCmd(cmd_log, "/log/filename");
+
+    // user limits
+    CmdLineOpt* cmd_limits = new CmdLineOpt("c",
+					    "limits",
+					    "Enable physics limits specified in the LCDD file.",
+					    0,
+					    0);
+    cmd_mgr->addCmd(cmd_limits, "/physics/enableLimits");
+
+    // tracker momentum
+    CmdLineOpt* cmd_mom = new CmdLineOpt("t",
+					 "momentum",
+					 "Enable storage of momentum in LCIO tracker hits.",
+					 0,
+					 0);
+    cmd_mgr->addCmd(cmd_mom, "/lcio/storeMomentum");
+
+    // random seed
+    CmdLineOpt* rndSeed = new CmdLineOpt("d",
+					 "seed",
+					 "Set the random seed.  (No argument seeds with time.)",
+					 1,
+					 0);
+    cmd_mgr->addCmd(rndSeed, "/random/seed");
+  }
 };

slic/src
G4ApplicationMessenger.cc 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- G4ApplicationMessenger.cc	20 Apr 2005 00:11:21 -0000	1.8
+++ G4ApplicationMessenger.cc	28 Sep 2005 18:52:28 -0000	1.9
@@ -1,6 +1,9 @@
-// $Header: /cvs/lcd/slic/src/G4ApplicationMessenger.cc,v 1.8 2005/04/20 00:11:21 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4ApplicationMessenger.cc,v 1.9 2005/09/28 18:52:28 jeremy Exp $
 #include "G4ApplicationMessenger.hh"
+
+// slic
 #include "G4Application.hh"
+#include "PackageInfo.hh"
 
 namespace slic
 {
@@ -19,6 +22,12 @@
     if ( cmd == m_interactive ) {
       m_app->setMode(G4Application::eInteractive);
     }
+    else if ( cmd == m_slicVersion ) {
+      std::cout << std::endl << PackageInfo::getFullApplicationString() << std::endl << std::endl;
+    }
+    else if ( cmd == m_slicUsage ) {
+      m_app->printOutUsage( std::cout );
+    }
     else {
       std::cerr << "Unknown command to G4ApplicationMessenger." << std::endl;
     }
@@ -29,5 +38,17 @@
     // interactive mode
     m_interactive = new G4UIcommand( "/control/interactive", this);
     m_interactive->SetGuidance( "Set interactive mode to G4 UI session." );
+
+    // SLIC dir
+    m_slicDir = new G4UIdirectory( "/slic/" );
+    m_slicDir->SetGuidance( "SLIC simulator commands." );
+
+    // print SLIC usage
+    m_slicUsage = new G4UIcommand( "/slic/usage", this );
+    m_slicUsage->SetGuidance( "Print SLIC usage instructions." );
+
+    // print SLIC version
+    m_slicVersion = new G4UIcommand( "/slic/version", this );
+    m_slicVersion->SetGuidance( "Print SLIC version information." );
   }
 };

slic/src
SlicApplication.cc removed after 1.39
diff -N SlicApplication.cc
--- SlicApplication.cc	22 Sep 2005 22:59:46 -0000	1.39
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,238 +0,0 @@
-// $Header: /cvs/lcd/slic/src/Attic/SlicApplication.cc,v 1.39 2005/09/22 22:59:46 jeremy Exp $
-#include "SlicApplication.hh"
-
-// slic
-#include "SlicMessenger.hh"
-#include "CmdManager.hh"
-#include "CmdLineOpt.hh"
-
-// geant4
-#include "G4UImanager.hh"
-
-namespace slic
-{
-
-  SlicApplication::SlicApplication(int argc, char** argv)
-    : G4Application(argc, argv),
-      sMacroFile("")
-  {
-    m_messenger = new SlicMessenger(this);
-
-    /* Setup CL options for this application. */
-    registerCmdLineOpts();
-
-    /* Setup the Geant4 command queue from the CL args. */
-    setupFromCommandLine(argc, argv);
-  }
-
-  SlicApplication::~SlicApplication()
-  {}
-
-  void SlicApplication::setupFromCommandLine(int argc, char** argv)
-  {
-    G4Application::setupFromCommandLine( argc, argv );
-  }
-
-  void SlicApplication::initialize()
-  {
-
-#ifdef SLIC_VERBOSE
-    std::cout << "SLIC verbose system is enabled." << std::endl;
-#else
-    std::cout << "SLIC verbose system is disabled." << std::endl;
-#endif
-
-    G4Application::initialize();
-  }
-
-  void SlicApplication::run()
-  {
-    // parent execs G4 cmd queue and starts UI if interactive mode
-    G4Application::run();
-  }
-
-  void SlicApplication::registerCmdLineOpts()
-  {
-    CmdManager* cmd_mgr = CmdManager::instance();
-
-    // usage
-    CmdLineOpt* cmd_usage = new CmdLineOpt("h",
-					   "help",
-					   "Print SLIC usage directions.",
-					   0,
-					   0);
-    cmd_mgr->addCmd(cmd_usage, "/slic/usage" );
-
-    // interactive mode
-    CmdLineOpt* cmd_iact = new CmdLineOpt("n",
-					  "interactive",
-					  "Start a Geant4 interactive session.",
-					  0,
-					  0);
-    cmd_mgr->addCmd(cmd_iact, "/control/interactive");
-
-    // print SLIC version info
-    CmdLineOpt* cmd_version = new CmdLineOpt("v",
-					     "version",
-					     "Print SLIC version.",
-					     0,
-					     0);
-    cmd_mgr->addCmd(cmd_version, "/slic/version");
-
-    // exec macro
-    CmdLineOpt* cmd_exec = new CmdLineOpt("m",
-					  "macro",
-					  "Execute Geant4 commands from a file.",
-					  1,
-					  1);
-    cmd_mgr->addCmd(cmd_exec, "/control/execute" );
-
-    // set LCDD URI
-    CmdLineOpt* cmd_lcddURL = new CmdLineOpt("g",
-					     "lcdd-url",
-					     "Set LCDD geometry file URL.",
-					     1,
-					     1);
-    cmd_mgr->addCmd(cmd_lcddURL, "/lcdd/url" );
-
-    // set LCDD setup name
-    CmdLineOpt* cmd_lcddSetup = new CmdLineOpt("S",
-					       "lcdd-setup",
-					       "Set LCDD geometry setup name.",
-					       1,
-					       1);
-    cmd_mgr->addCmd(cmd_lcddSetup, "/lcdd/setupName" );
-
-    /* set LCDD setup name */
-    CmdLineOpt* cmd_lcddVersion = new CmdLineOpt("V",
-						 "lcdd-version",
-						 "Set LCDD geometry version.",
-						 1,
-						 1);
-    cmd_mgr->addCmd(cmd_lcddVersion, "/lcdd/version" );
-
-    // set the generator input file
-    CmdLineOpt* cmd_stdhep = new CmdLineOpt("i",
-					    "event-file",
-					    "Set event input file full path.",
-					    1,
-					    1 );
-
-    cmd_mgr->addCmd(cmd_stdhep, "/generator/filename" );
-
-    // set name of LCIO output file
-    CmdLineOpt* cmd_lcio = new CmdLineOpt("o",
-					  "lcio-file",
-					  "Set name of LCIO output file.",
-					  1,
-					  1);
-    cmd_mgr->addCmd(cmd_lcio, "/lcio/filename" );
-
-    // set Lcio path
-    CmdLineOpt* cmd_lcio_path = new CmdLineOpt("p",
-					       "lcio-path",
-					       "Set directory for LCIO output.",
-					       1,
-					       1);
-    cmd_mgr->addCmd(cmd_lcio_path, "/lcio/path" );
-
-    // automatically name the LCIO output file
-    CmdLineOpt* cmd_autoname = new CmdLineOpt("O",
-					      "autoname",
-					      "Automatically name the LCIO output file.",
-					      0,
-					      0);
-    cmd_mgr->addCmd(cmd_autoname, "/lcio/autoname" );
-
-    // overwrite an LCIO output file if it exists already
-    CmdLineOpt* delLcio = new CmdLineOpt("x",
-					 "lcio-delete",
-					 "Delete an existing LCIO file.",
-					 0,
-					 0);
-    cmd_mgr->addCmd(delLcio, "/lcio/fileExists delete");
-
-    // beamOn
-    CmdLineOpt* cmd_beamon = new CmdLineOpt("r",
-					    "run-events",
-					    "Run # of events. (Should be last arg if batch!)",
-					    1,
-					    1);
-    cmd_mgr->addCmd(cmd_beamon, "/run/beamOn");
-
-    // set num input events to skip
-    CmdLineOpt* cmd_skip_evt = new CmdLineOpt("s",
-					      "skip-events",
-					      "Set number of events to skip.",
-					      1,
-					      1);
-    cmd_mgr->addCmd(cmd_skip_evt, "/generator/skipEvents" );
-
-    // set G4 physics list
-    CmdLineOpt* cmd_phys = new CmdLineOpt("l",
-					  "physics-list",
-					  "Set G4 physics list.",
-					  1,
-					  1);
-    cmd_mgr->addCmd(cmd_phys, "/physics/select");
-
-    // logfile
-    CmdLineOpt* cmd_log = new CmdLineOpt("L",
-					 "log-file",
-					 "Set logfile name.",
-					 0,
-					 0);
-    cmd_mgr->addCmd(cmd_log, "/log/filename");
-
-    // user limits
-    CmdLineOpt* cmd_limits = new CmdLineOpt("c",
-					    "limits",
-					    "Enable physics limits specified in the LCDD file.",
-					    0,
-					    0);
-    cmd_mgr->addCmd(cmd_limits, "/physics/enableLimits");
-
-    // tracker momentum
-    CmdLineOpt* cmd_mom = new CmdLineOpt("t",
-					 "momentum",
-					 "Enable storage of momentum in LCIO tracker hits.",
-					 0,
-					 0);
-    cmd_mgr->addCmd(cmd_mom, "/lcio/storeMomentum");
-
-    // random seed
-    CmdLineOpt* rndSeed = new CmdLineOpt("d",
-					 "seed",
-					 "Set the random seed.  (No argument seeds with time.)",
-					 1,
-					 0);
-    cmd_mgr->addCmd(rndSeed, "/random/seed");
-  }
-
-  void SlicApplication::printOutUsage(std::ostream& os)
-  {
-    os << std::endl;
-    os << "**************" << std::endl;
-    os << "* SLIC Usage *" << std::endl;
-    os << "**************" << std::endl;
-
-    os << std::endl;
-    os << "Command line usage: " << std::endl;
-    os << std::endl;
-    os << "slic [single_macro_path]" << std::endl;
-    os << "slic [options]" << std::endl;
-
-    os << std::endl;
-
-    os << "Interactive usage: " << std::endl;
-    os << std::endl;
-    os << "slic -n" << std::endl;
-
-    os << std::endl;
-
-    // print out cmd registry
-    G4Application::printOutUsage( os );
-
-    os << std::endl;
-  }
-}

slic/src
SlicMessenger.cc removed after 1.10
diff -N SlicMessenger.cc
--- SlicMessenger.cc	22 Sep 2005 21:39:07 -0000	1.10
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-// $Header: /cvs/lcd/slic/src/Attic/SlicMessenger.cc,v 1.10 2005/09/22 21:39:07 jeremy Exp $
-#include "SlicMessenger.hh"
-
-// slic
-#include "SlicApplication.hh"
-#include "PackageInfo.hh"
-
-namespace slic
-{
-
-  SlicMessenger::SlicMessenger(SlicApplication* app)
-  {
-    m_app = app;
-
-    defineCommands();
-  }
-
-  SlicMessenger::~SlicMessenger()
-  {}
-
-  void SlicMessenger::SetNewValue(G4UIcommand* cmd, G4String)
-  {
-    if ( cmd == m_slicVersion ) {
-      std::cout << std::endl << PackageInfo::getFullApplicationString() << std::endl << std::endl;
-    }
-    else if ( cmd == m_slicUsage ) {
-      m_app->printOutUsage( std::cout );
-    }
-    else {
-      std::cerr << "Unknown command to SlicMessenger." << std::endl;
-    }
-  }
-
-  void SlicMessenger::defineCommands()
-  {
-    // SLIC dir
-    m_slicDir = new G4UIdirectory( "/slic/" );
-    m_slicDir->SetGuidance( "SLIC simulator commands." );
-
-    // print SLIC usage
-    m_slicUsage = new G4UIcommand( "/slic/usage", this );
-    m_slicUsage->SetGuidance( "Print SLIC usage instructions." );
-
-    // print SLIC version
-    m_slicVersion = new G4UIcommand( "/slic/version", this );
-    m_slicVersion->SetGuidance( "Print SLIC version information." );
-  }
-};
CVSspam 0.2.8