slic/src

PhysicsListManager.cc 1.24 -> 1.25

diff -u -r1.24 -r1.25
--- PhysicsListManager.cc	23 Nov 2009 23:13:34 -0000	1.24
+++ PhysicsListManager.cc	8 Jan 2010 23:18:56 -0000	1.25
@@ -1,8 +1,7 @@

-// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.24 2009/11/23 23:13:34 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/PhysicsListManager.cc,v 1.25 2010/01/08 23:18:56 jeremy Exp $

 #include "PhysicsListManager.hh"
 
 // geant4

-#include "G4ParticleTable.hh"

 #include "G4UserSpecialCuts.hh"
 #include "G4StepLimiter.hh"
 #include "G4RunManager.hh"

@@ -11,13 +10,11 @@

 // slic
 #include "LCOpticalPhysics.hh"
 #include "HepPDTManager.hh"

-#include "LCSUSYPhysics.hh"

 #include "LCExtendedParticles.hh"
 
 namespace slic
 {

-
-    // QGSP_BERT is the default physics list when none is selected at runtime.

+    // QGSP_BERT is the default physics list.

     const std::string PhysicsListManager::m_defaultListName = std::string("QGSP_BERT");
 
     PhysicsListManager::PhysicsListManager()

@@ -34,9 +31,6 @@

 
         // Create the messenger class for the manager.
         m_messenger = new PhysicsMessenger();

-
-        // Initialize a default (or dummy) physics list, for Geant4 initialization ordering.
-        G4RunManager::GetRunManager()->SetUserInitialization( PhysicsListFactory::instance()->create( m_defaultListName ) );

     }
 
     PhysicsListManager::~PhysicsListManager()

@@ -44,58 +38,53 @@

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

-        log().okay("Setting physics list <" + n + ">");

         m_currentListName = n;
         m_isFromDefault = false;
     }
 
     void PhysicsListManager::initializePhysicsList()
     {

-        if ( !m_isInitialized ) {
-

+        if ( !m_isInitialized ) 
+        {

 #ifdef SLIC_LOG

-            if ( m_isFromDefault ) {

+            if ( m_isFromDefault ) 
+            {

                 log() << LOG::okay << "Using default physics list <" << m_defaultListName << ">." << LOG::done;
             }
 #endif
 
             // Create the physics list from the name argument.

-            m_currentList = PhysicsListFactory::instance()->create( m_currentListName );
-
-            // Support for extended set of particles from PDT.
-            setupExtended();

+            m_currentList = PhysicsListFactory::instance()->create(m_currentListName);

 
             // Enable optical processes.

-            if ( enableOptical() ) {

+            if ( enableOptical() ) 
+            {

                 setupOpticalProcesses();
             }

-            G4RunManager::GetRunManager()->SetUserInitialization( m_currentList );

+            // Support for extended set of particles from PDT.
+            setupExtended();                       
+
+            // Register the physics list with the run manager.
+            G4RunManager::GetRunManager()->SetUserInitialization(m_currentList);

-#ifdef SLIC_LOG
-            log().okay( "Registered physics list <" + m_currentListName + "> with G4RunManager" );
-            log() << LOG::debug << "Dumping Geant4 particle table ..." << LOG::done;
-            // Use log level to determine whether particle table should be dumped.
-            if ( log().getOutputLevel() >= LOG::verbose )
-                G4ParticleTable::GetParticleTable()->DumpTable(); // FIXME: Goes to G4cout.
-#endif

+            // Print out particle table.
+            //G4cout << "Dumping Geant4 particle table ..." << G4endl;
+            //G4ParticleTable::GetParticleTable()->DumpTable();

 
             m_isInitialized = true;
         }
 #ifdef SLIC_LOG

-        // Don't allow this to be called twice.
-        else {
-            log().error("Ignoring additional call to PhysicsListManager::initializePhysics()");

+        // Don't allow initialization to be called more than once.
+        else 
+        {
+            log().error("Ignoring additional call to PhysicsListManager::initializePhysics() !!!");

         }
 #endif
     }
 
     void PhysicsListManager::setupUserLimitsProcesses()

-    {
-#ifdef SLIC_LOG
-        log() << LOG::okay << "Enabling user physics limits." << LOG::done;
-#endif
-

+    {

         G4ParticleTable* ptbl = G4ParticleTable::GetParticleTable();
         
         G4ParticleTable::G4PTblDicIterator* piter = ptbl->GetIterator();

@@ -109,8 +98,9 @@

             G4ParticleDefinition* pdef = piter->value();
             G4ProcessManager* pmgr = pdef->GetProcessManager();

-            // add user limit processes for steps and special cuts
-            if ( pmgr ) {

+            // Add user limit processes for steps and special cuts.
+            if ( pmgr ) 
+            {

                 pmgr->AddProcess( slim,
                                   -1,
                                   -1,

@@ -121,8 +111,9 @@

                                   -1,
                                   4);
             }

-            else {
-                G4Exception( "ERROR: G4ProcessManager is null!" );

+            else 
+            {
+                G4Exception("ERROR: G4ProcessManager is null!");

             }
         }               
     }

@@ -132,38 +123,20 @@

 #ifdef SLIC_LOG
         log() << LOG::always << "Enabling optical physics processes for the current physics list." << LOG::done;
 #endif

-        G4VModularPhysicsList* l = dynamic_cast<G4VModularPhysicsList*> ( m_currentList );
-        l->RegisterPhysics( new LCOpticalPhysics("optical"));
-    }
-    
-    void PhysicsListManager::setupSUSY()
-    {
-#ifdef SLIC_LOG
-        log() << LOG::always << "Enabling SUSY particles for the current physics list." << LOG::done;
-#endif
-        G4VModularPhysicsList* l = dynamic_cast<G4VModularPhysicsList*> ( m_currentList );
-        if ( HepPDTManager::instance()->getParticleDataTable() )
-        {
-            l->RegisterPhysics( new LCSUSYPhysics() );
-        }
-#ifdef SLIC_LOG
-        else
-        {
-            log() << LOG::error << "HepPDTManager could not load particle data, so SUSY will not be enabled!" << LOG::done;
-        }
-#endif
-    }

+        G4VModularPhysicsList* l = dynamic_cast<G4VModularPhysicsList*>(m_currentList);
+        l->RegisterPhysics(new LCOpticalPhysics("optical"));
+    }

 
     void PhysicsListManager::setupExtended()
     {
 #ifdef SLIC_LOG

-        log() << LOG::always << "Enabling extended PDT particles for the current physics list." << LOG::done;

+        log().always("Enabling extended PDT particles for the current physics list.");

 #endif

-        G4VModularPhysicsList* l = dynamic_cast<G4VModularPhysicsList*> ( m_currentList );
-        if ( HepPDTManager::instance()->getParticleDataTable() )

+        G4VModularPhysicsList* l = dynamic_cast<G4VModularPhysicsList*>(m_currentList);
+        if (HepPDTManager::instance()->getParticleDataTable())

-            l->RegisterPhysics( new LCExtendedParticles() );

+            l->RegisterPhysics(new LCExtendedParticles());

         }
 #ifdef SLIC_LOG
         else

slic/src

SlicApplication.cc 1.48 -> 1.49

diff -u -r1.48 -r1.49
--- SlicApplication.cc	7 Jul 2009 21:39:19 -0000	1.48
+++ SlicApplication.cc	8 Jan 2010 23:18:56 -0000	1.49
@@ -1,27 +1,20 @@

-// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.48 2009/07/07 21:39:19 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.49 2010/01/08 23:18:56 jeremy Exp $

 
 #include "SlicApplication.hh"
 
 // slic
 #include "CommandLineProcessor.hh"
 #include "CommandQueue.hh"

-#include "EventAction.hh"

 #include "EventDebugger.hh"

-#include "EventSourceManager.hh"

 #include "FieldManager.hh"
 #include "SlicApplicationMessenger.hh"
 #include "LCDD.hh"
 #include "LcioManager.hh"
 #include "ModuleRegistry.hh"
 #include "PackageInfo.hh"

-#include "PhysicsListManager.hh"
-#include "PrimaryGeneratorAction.hh"
-#include "RunAction.hh"

 #include "RunManager.hh"

-#include "SteppingAction.hh"

 #include "StringUtil.hh"
 #include "TimeUtil.hh"

-#include "TrackingAction.hh"

 #include "TrajectoryManager.hh"
 #include "HepPDTManager.hh"

@@ -58,353 +51,326 @@

 #include "G4Version.hh"
 #endif

+#include "PhysicsListManager.hh"
+

 namespace slic
 {

-  SlicApplication::SlicApplication()
-    : Module("SLIC", false),
-      m_session(0),

+    SlicApplication::SlicApplication()
+        : Module("SlicApplication", false),
+          m_session(0),

 #ifdef G4VIS_USE

-      m_visManager(0),

+          m_visManager(0),
+#endif
+          m_appMessenger(0),
+          m_runManager(0),
+          m_mode(SlicApplication::eBatch),
+          m_returnCode(0),
+          m_setRunAbort(false),
+          m_isInitialized(false),
+          m_geant4VersionString(0)
+    {
+#ifdef SLIC_LOG
+        log() << LOG::okay << LOG::head << "SLIC is starting." << LOG::done;

 #endif

-      m_appMessenger(0),
-      m_runManager(0),
-      m_mode(SlicApplication::eBatch),
-      m_returnCode(0),
-      m_setRunAbort(false),
-      m_isInitialized(false),
-      m_geant4VersionString(0)
-  {
-    log() << LOG::okay << LOG::head << "SLIC is starting" << LOG::done;
-  }
-
-  SlicApplication::~SlicApplication()
-  {
-    if (m_session != 0) {
-      delete m_session;

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

+    SlicApplication::~SlicApplication()
+    {
+        if (m_session != 0) 
+        {
+            delete m_session;
+        }
+
+        if (m_appMessenger != 0) 
+        {
+            delete m_appMessenger;
+        }

-    // Delete all the modules.  Only seems to work without seg fault on Linux.
-    // https://jira.slac.stanford.edu/browse/SLIC-185

+        // Delete all the modules.  Only seems to work without seg fault on Linux.
+        // https://jira.slac.stanford.edu/browse/SLIC-185

 #ifdef linux 
 #ifdef SLIC_LOG

-    log().debug("Deleting registered modules ...");

+        log().debug("Deleting registered modules ...");

 #endif

-    ModuleRegistry::instance()->deleteModules();

+        ModuleRegistry::instance()->deleteModules();

 #endif

-    // Delete the G4RunManager, which also deletes
-    // all the Geant4-related modules, such as 
-    // RunAction.
-    log().debug("Deleting G4RunManager ...");
-    delete G4RunManager::GetRunManager();
-
-    log() << LOG::okay << LOG::head << "SLIC is exiting" << LOG::done;
-  }
-
-  void SlicApplication::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]);
-    setBinaryBasename();
-
-    // Process arguments using the CommandLineProcessor.
-    CommandLineProcessor* cmd = CommandLineProcessor::instance();
-    cmd->process(argc, argv);
-  }
-
-  void SlicApplication::initialize()
-  {
-    if (!m_isInitialized) {
-
-      // Initialize the application messenger.
-      m_appMessenger = new SlicApplicationMessenger(this);
-
-      // Initialize the event generation manager.
-      EventSourceManager::instance();

+        // Delete the G4RunManager, which also deletes all the Geant4-related modules.
+#ifdef SLIC_LOG
+        log().debug("Deleting G4RunManager ...");
+#endif
+        delete G4RunManager::GetRunManager();

 
 #ifdef SLIC_LOG

-      log().okay("SLIC logging system is enabled.");
-#else
-      log().okay("SLIC logging system is disabled.");

+        log() << LOG::okay << LOG::head << "SLIC is exiting." << LOG::done;

 #endif

+    }

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

+    void SlicApplication::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]);
+        setBinaryBasename();

-      // Initialize the physics list manager.
-      PhysicsListManager::instance();

+        // Process arguments using the CommandLineProcessor.
+        CommandLineProcessor* cmd = CommandLineProcessor::instance();
+        cmd->process(argc, argv);
+    }

-      // Setup the default event source AFTER PHYSICS.
-      EventSourceManager::instance()->setupEventSource();

+    void SlicApplication::initialize()
+    {
+        if (!m_isInitialized) 
+        {
+            // Print the SLIC splash screen.
+            printSplashScreen();

-      // Print the SLIC splash screen.
-      printSplashScreen();

+            // Initialize the application messenger.
+            m_appMessenger = new SlicApplicationMessenger(this);

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

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

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

+            // Initialize the physics list manager.
+            PhysicsListManager::instance();

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

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

-      // Setup the generator.
-      initializePrimaryGeneratorAction();

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

-      // Setup the LCDD subsystem.
-      initializeLCDD();

+            // Setup the LCDD subsystem.
+            initializeLCDD();

 
 #ifdef USE_G4NIST

-      // Setup the NIST Writer.
-      initializeNistWriter();

+            // Setup the NIST Writer.
+            initializeNistWriter();

 #endif

-      // Construct and register the UserAction classes.
-      initializeUserActions();
-
-      // Initialize visualization.

+            // Initialize visualization.

 #ifdef G4VIS_USE

-      initializeVis();

+            initializeVis();

 #endif

-      // Initialize the UI.

+            // Initialize the UI.

 #ifndef G4UI_NONE

-      initializeUI();

+            initializeUI();

 #endif

-      HepPDTManager::instance();

+            HepPDTManager::instance();

-      // Print list of registered modules.
-#ifdef SLIC_LOG
-      log().always("Printing list of registered modules ...");
-      ModuleRegistry::instance()->print();
-#endif
-
-      // Set state variable.
-      m_isInitialized = true;
-    }
-    else {
-      log().warning("Call to SlicApplication::initialize() was ignored.  SLIC is already initialized!");

+            // Set state variable.
+            m_isInitialized = true;
+        }
+        else 
+        {
+            log().warning("Call to SlicApplication::initialize() was ignored.  SLIC is already initialized!");
+        }

-  }

 
 #ifndef G4UI_NONE

-  void SlicApplication::initializeUI()
-  {
-    // A tcsh terminal.

+    void SlicApplication::initializeUI()
+    {
+        // A tcsh terminal.

 #ifdef G4UI_USE_TCSH

-    m_session = new G4UIterminal(new G4UItcsh);

+        m_session = new G4UIterminal(new G4UItcsh);

-    // A csh terminal.

+        // A csh terminal.

 #elif G4UI_USE_CSH

-    m_session = new G4UIterminal(new G4UIcsh);

+        m_session = new G4UIterminal(new G4UIcsh);

-    // GAG.

+        // GAG.

 #elif G4UI_USE_GAG

-    session = new G4UIGAG;

+        session = new G4UIGAG;

-    // Motif GUI.

+        // Motif GUI.

 #elif G4UI_USE_XM

-    m_session = new G4UIXm( 0, NULL );

+        m_session = new G4UIXm( 0, NULL );

-    // Add file and exit buttons to Motif UI
-    if ( m_session ) {
-      G4UImanager* ui = G4UImanager::GetUIpointer();
-      ui->ApplyCommand("/gui/addMenu file File");
-      ui->ApplyCommand("/gui/addButton file Exit \"exit\"");
-    }
-    // Plain terminal is the fallback.

+        // Add file and exit buttons to Motif UI
+        if ( m_session ) 
+        {
+            G4UImanager* ui = G4UImanager::GetUIpointer();
+            ui->ApplyCommand("/gui/addMenu file File");
+            ui->ApplyCommand("/gui/addButton file Exit \"exit\"");
+        }
+        // Plain terminal is the fallback.

 #else

-    m_session = new G4UIterminal();

+        m_session = new G4UIterminal();

 #endif

-    if ( !m_session ) {
-      log().fatal( "Failed to initialize UI session." );
-      G4Exception( "Failed to initialize UI session." );

+        if ( !m_session ) 
+        {
+            log().fatal( "Failed to initialize UI session." );
+            G4Exception( "Failed to initialize UI session." );
+        }

-  }

 #endif
 
 #ifdef G4VIS_USE

-  void SlicApplication::initializeVis()
-  {
-    m_visManager = new VisManager();
-    m_visManager->Initialize();

+    void SlicApplication::initializeVis()
+    {
+        m_visManager = new VisManager();
+        m_visManager->Initialize();

-    // VRML test
-    new VRML2WriterMessenger();    
-  }
-#endif
-
-  void SlicApplication::initializeLCDD()
-  {
-    // LCDD geometry subsystem.
-    m_runManager->SetUserInitialization((new LCDD())->getDetectorConstruction());
-  }
-  
-  void SlicApplication::initializePrimaryGeneratorAction()
-  {
-    // Primary generator.
-    m_runManager->SetUserAction(new PrimaryGeneratorAction);
-  }
-
-  void SlicApplication::initializeUserActions()
-  {
-    // SLIC's UserAction handlers.
-    m_runManager->SetUserAction(new RunAction);
-    m_runManager->SetUserAction(new EventAction);
-    m_runManager->SetUserAction(new TrackingAction);
-    m_runManager->SetUserAction(new SteppingAction);
-  }
-
-  void SlicApplication::setMode(SlicApplication::ERunMode rmode)
-  {
-    m_mode = rmode;
-  }
-
-  const std::string& SlicApplication::getBinaryName() const
-  {
-    return m_binaryname;
-  }
-
-  const std::string& SlicApplication::getBinaryBasename() const
-  {
-    return m_binarybasename;
-  }
-
-  int SlicApplication::getReturnCode() const
-  {
-    return m_returnCode;
-  }
-
-  void SlicApplication::setReturnCode(int rc)
-  {
-    m_returnCode = rc;
-  }
-
-  void SlicApplication::setBinaryBasename()
-  {
-    std::string::size_type sidx = m_binaryname.find_last_of('/');
-    if (sidx != std::string::npos) {
-      m_binarybasename = std::string(m_binaryname, sidx + 1);
-    }
-  }
-
-  SlicApplication::ERunMode SlicApplication::getMode() const
-  {
-    return m_mode;
-  }
-
-  void SlicApplication::setAborting(bool a)
-  {
-    if (a) {
-      // FIXME: Does this actually do anything to current G4Event?
-      G4RunManager::GetRunManager()->AbortRun(a);
-    }
-
-    m_setRunAbort = a;
-  }
-
-  bool SlicApplication::isAborting() const
-  {
-    return m_setRunAbort;
-  }
-
-  RunManager* SlicApplication::getRunManager()
-  {
-    return m_runManager;
-  }
-
-  void SlicApplication::run()
-  {
-    // Initialize if not already.
-    if (!m_isInitialized) {
-      initialize();

+        // VRML test
+        new VRML2WriterMessenger();    
+    }
+#endif
+
+    void SlicApplication::initializeLCDD()
+    {
+        // LCDD geometry subsystem.
+        m_runManager->SetUserInitialization((new LCDD())->getDetectorConstruction());
+    }   
+
+    void SlicApplication::setMode(SlicApplication::ERunMode rmode)
+    {
+        m_mode = rmode;
+    }
+
+    const std::string& SlicApplication::getBinaryName() const
+    {
+        return m_binaryname;
+    }
+
+    const std::string& SlicApplication::getBinaryBasename() const
+    {
+        return m_binarybasename;
+    }
+
+    int SlicApplication::getReturnCode() const
+    {
+        return m_returnCode;
+    }
+
+    void SlicApplication::setReturnCode(int rc)
+    {
+        m_returnCode = rc;
+    }
+
+    void SlicApplication::setBinaryBasename()
+    {
+        std::string::size_type sidx = m_binaryname.find_last_of('/');
+        if (sidx != std::string::npos) 
+        {
+            m_binarybasename = std::string(m_binaryname, sidx + 1);
+        }
+    }
+
+    SlicApplication::ERunMode SlicApplication::getMode() const
+    {
+        return m_mode;
+    }
+
+    void SlicApplication::setAborting(bool a)
+    {
+        if (a) {
+            // FIXME: Does this actually do anything to current G4Event?
+            G4RunManager::GetRunManager()->AbortRun(a);
+        }
+
+        m_setRunAbort = a;

-    // Retrieve the list of Geant4 commands created by CommandLineProcessor.
-    CommandQueue* q = CommandLineProcessor::instance()->getCommandQueue();

+    bool SlicApplication::isAborting() const
+    {
+        return m_setRunAbort;
+    }
+
+    RunManager* SlicApplication::getRunManager()
+    {
+        return m_runManager;
+    }

-    // Print, execute, and clear the CommandQueue.

+    void SlicApplication::run()
+    {
+        // Initialize if not already.
+        if (!m_isInitialized) 
+        {
+            initialize();
+        }
+
+        // Retrieve the list of Geant4 commands created by CommandLineProcessor.
+        CommandQueue* q = CommandLineProcessor::instance()->getCommandQueue();
+
+        // Print, execute, and clear the CommandQueue.

 #ifdef SLIC_LOG

-    log().verbose("Printing the Geant4 command queue ...");
-    q->printOut();

+        log().verbose("Printing the Geant4 command queue ...");
+        q->printOut();

 #endif

-    q->execute();
-    q->clear();

+        q->execute();
+        q->clear();

-    // Start the UI session if in interactive mode.

+        // Start the UI session if in interactive mode.

 #ifndef G4UI_NONE

-    if ( getMode() == eInteractive ) {
-      log().verbose("Starting interactive session ...");
-      m_session->SessionStart();
-    }

+        if ( getMode() == eInteractive ) 
+        {
+            log().verbose("Starting interactive session ...");
+            m_session->SessionStart();
+        }

 #endif

-  }

+    }

-  void SlicApplication::printVersion()
-  {
-    CommandLineProcessor::instance()->printVersion();
-  }
-
-  void SlicApplication::printSplashScreen()
-  {
-    log() << LOG::always << "*************************************************************" << LOG::done;
-    log() << LOG::always << " App     : " << PackageInfo::getNameString() << " (" << PackageInfo::getAbbrevString() << ")" << LOG::done;
-    log() << LOG::always << " Version : " << PackageInfo::getVersionString() << LOG::done;
-    log() << LOG::always << " Date    : " << PackageInfo::getChangeDateString() << LOG::done;
-    log() << LOG::always << " Authors : " << PackageInfo::getAuthorString() << LOG::done;
-    log() << LOG::always << " Inst    : " << PackageInfo::getInstitutionString() << LOG::done;
-    log() << LOG::always << " WWW     : " << PackageInfo::getWWW() << LOG::done;
-    log() << LOG::always << " Contact : " << PackageInfo::getEmail() << LOG::done;
-    log() << LOG::always << "*************************************************************" << LOG::done;
-    log() << LOG::always << LOG::done;
-  }
-
-  void SlicApplication::printUsage()
-  {
-    CommandLineProcessor::instance()->printUsage();
-  }

+    void SlicApplication::printVersion()
+    {
+        CommandLineProcessor::instance()->printVersion();
+    }
+
+    void SlicApplication::printSplashScreen()
+    {
+        log() << LOG::done;
+        log() << LOG::always << "*************************************************************" << LOG::done;
+        log() << LOG::always << " App     : " << PackageInfo::getNameString() << " (" << PackageInfo::getAbbrevString() << ")" << LOG::done;
+        log() << LOG::always << " Version : " << PackageInfo::getVersionString() << LOG::done;
+        log() << LOG::always << " Date    : " << PackageInfo::getChangeDateString() << LOG::done;
+        log() << LOG::always << " Authors : " << PackageInfo::getAuthorString() << LOG::done;
+        log() << LOG::always << " Inst    : " << PackageInfo::getInstitutionString() << LOG::done;
+        log() << LOG::always << " WWW     : " << PackageInfo::getWWW() << LOG::done;
+        log() << LOG::always << " Contact : " << PackageInfo::getEmail() << LOG::done;
+        log() << LOG::always << "*************************************************************" << LOG::done;
+    }
+
+    void SlicApplication::printUsage()
+    {
+        CommandLineProcessor::instance()->printUsage();
+    }

 
 #ifdef USE_G4NIST

-  void SlicApplication::initializeNistWriter()
-  {
-    new NistWriterMessenger();
-  }

+    void SlicApplication::initializeNistWriter()
+    {
+        new NistWriterMessenger();
+    }

 #endif

-  std::string SlicApplication::getGeant4VersionString()
-  {
-    if (m_geant4VersionString == 0) {
-      std::string g4ver;

+    std::string SlicApplication::getGeant4VersionString()
+    {
+        if (m_geant4VersionString == 0) 
+        {
+            std::string g4ver;

 #ifdef HAVE_G4VERSION

-      g4ver = StringUtil::toString(G4VERSION_NUMBER);

+            g4ver = StringUtil::toString(G4VERSION_NUMBER);

 #else

-      // Massage the string returned by G4RunManager into format
-      // returned by G4Version in recent Geant4 versions.
-      g4ver = G4RunManager::GetRunManager()->GetVersionString();
-      std::string::size_type start = g4ver.find("geant4-",0) + 7;
-      std::string::size_type end = g4ver.find(" ",start);
-      g4ver = g4ver.substr(start, end - start);
-      std::string g4major = g4ver.substr(1,1);
-      std::string g4minor = g4ver.substr(4,1);
-      std::string g4patch = "0";
-      if (g4ver.find("patch") != string::npos) {
-          g4patch = g4ver.substr(13,1);
-      }      
-      g4ver = g4major + g4minor + g4patch;
-#endif
-      std::stringstream s;
-      s << "geant4-" << "v" << g4ver[0] << "r" << g4ver[1] << "p" << g4ver[2];
-      m_geant4VersionString = new std::string(s.str());

+            // Massage the string returned by G4RunManager into format
+            // returned by G4Version in recent Geant4 versions.
+            g4ver = G4RunManager::GetRunManager()->GetVersionString();
+            std::string::size_type start = g4ver.find("geant4-",0) + 7;
+            std::string::size_type end = g4ver.find(" ",start);
+            g4ver = g4ver.substr(start, end - start);
+            std::string g4major = g4ver.substr(1,1);
+            std::string g4minor = g4ver.substr(4,1);
+            std::string g4patch = "0";
+            if (g4ver.find("patch") != string::npos) {
+                g4patch = g4ver.substr(13,1);
+            }      
+            g4ver = g4major + g4minor + g4patch;
+#endif
+            std::stringstream s;
+            s << "geant4-" << "v" << g4ver[0] << "r" << g4ver[1] << "p" << g4ver[2];
+            m_geant4VersionString = new std::string(s.str());
+        }
+        return *m_geant4VersionString;

-    return *m_geant4VersionString;
-  }

     
 } // namespace slic

Commit in `slic` on MAIN
`include/RunManager.hh`	+30	-25	1.12 -> 1.13
`/SlicApplication.hh`	+2	-2	1.35 -> 1.36
`src/CommandLineProcessor.cc`	+3	-3	1.12 -> 1.13
`/CommandQueue.cc`	+1	-2	1.2 -> 1.3
`/EventSourceManager.cc`	+11	-12	1.20 -> 1.21
`/GeneratorMessenger.cc`	+18	-11	1.13 -> 1.14
`/LCExtendedParticles.cc`	+11	-11	1.5 -> 1.6
`/ParticleGunEventSource.cc`	+35	-35	1.4 -> 1.5
`/PhysicsListManager.cc`	+35	-62	1.24 -> 1.25
`/PhysicsMessenger.cc`	+9	-5	1.23 -> 1.24
`/RunManager.cc`	+87	-44	1.16 -> 1.17
`/SlicApplication.cc`	+251	-285	1.48 -> 1.49
`/SlicMain.cc`	+7	-5	1.1 -> 1.2
	+500	-502