LISTSERV 16.5 - LCD-CVS Archives

+/** + @mainpage + + The SLIC simulator is a Geant4 package that uses LCDD as its geometry input. + + Refer to the + <a href="http://nicadd.niu.edu/~jeremy/docbook/projects/slic/html/jmccormick_slic_GettingStarted/t1.html">Getting Started Guide</a> + for detailed usage and installation instructions. + + Print command line usage instructions by executing <i>slic --help</i>. + + Valid LCDD is defined by the <a href="http://nicadd.niu.edu/~jeremy/lcd/lcdd/doc/schemas/lcdd.xsd.html">LCDDSchema</a>. + + <a href="http://nicadd.niu.edu/~jeremy/lcd/lcdd/doc/html/">Source code documentation</a> is also available for the LCDD package. + + Any questions can be directed to <a href="mailto:[log in to unmask]">Jeremy McCormick</a> + or posted in the <a href="http://forum.linearcollider.org/index.php?t=threadt&frm_id=7&rid=0&S=012b8714798313e7abf7c4d092eb9d0a">Full Simulations Area</a> + of the <a href="http://forum.linearcollider.org/">LinearCollider.org Forum</a>. + + --Jeremy McCormick, SLAC +*/ + +// slic

-/** - @mainpage - - The SLIC simulator is a Geant4 package that uses LCDD as its geometry input. - - Refer to the - <a href="http://nicadd.niu.edu/~jeremy/docbook/projects/slic/html/jmccormick_slic_GettingStarted/t1.html">Getting Started Guide</a> - for detailed usage and installation instructions. - - Print command line usage instructions by executing <i>slic --help</i>.

- Valid LCDD is defined by the <a href="http://nicadd.niu.edu/~jeremy/lcd/lcdd/doc/schemas/lcdd.xsd.html">LCDDSchema</a>. - - <a href="http://nicadd.niu.edu/~jeremy/lcd/lcdd/doc/html/">Source code documentation</a> is also available for the LCDD package. - - Any questions can be directed to <a href="mailto:[log in to unmask]">Jeremy McCormick</a> - or posted in the <a href="http://forum.linearcollider.org/index.php?t=threadt&frm_id=7&rid=0&S=012b8714798313e7abf7c4d092eb9d0a">Full Simulations Area</a> - of the <a href="http://forum.linearcollider.org/">LinearCollider.org Forum</a>. - - --Jeremy McCormick, SLAC -*/

- void setAborting(bool a = true) - { - if ( a ) { - // does this actually do anything to current G4Event?! - G4RunManager::GetRunManager()->AbortRun(false); - } - - m_setRunAbort = a; - } - - bool isAborting() - { - return m_setRunAbort; - }

- void setBinaryBasename() - { - std::string::size_type sidx = m_binaryname.find_last_of('/'); - if (sidx != std::string::npos) { - m_binarybasename = std::string(m_binaryname, sidx + 1); - } - }

+ + // Got a print usage. + if (curr_g4_cmd == "/slic/usage") { + m_printUsage = true; + m_cmdQueue.clear(); + m_cmdQueue.addCmd(curr_g4_cmd); + break; + } + + // Got a print version. + if (curr_g4_cmd == "/slic/version" ) { + m_printVersion = true; + m_cmdQueue.clear(); + m_cmdQueue.addCmd(curr_g4_cmd); + break; + } +

slic/src

G4Application.cc 1.66 -> 1.67

diff -u -r1.66 -r1.67
--- G4Application.cc	8 May 2006 20:08:30 -0000	1.66
+++ G4Application.cc	17 May 2006 02:51:46 -0000	1.67
@@ -1,37 +1,39 @@

-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.66 2006/05/08 20:08:30 jeremy Exp $

+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.67 2006/05/17 02:51:46 jeremy Exp $

 #include "G4Application.hh"
 
 // slic

-#include "PackageInfo.hh"

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

 #include "FieldMessenger.hh"
 #include "G4ApplicationMessenger.hh"
 #include "LcioManager.hh"

-#include "PhysicsListManager.hh"

 #include "LogManager.hh"

-#include "CmdManager.hh"

 #include "ModuleRegistry.hh"

-#include "EventSourceManager.hh"
-#include "LCDDDetectorConstruction.hh"

+#include "PackageInfo.hh"
+#include "PhysicsListManager.hh"

 #include "PrimaryGeneratorAction.hh"

-#include "EventAction.hh"

 #include "RunAction.hh"

-#include "TrackingAction.hh"

+#include "RunManager.hh"

 #include "SteppingAction.hh"
 #include "TimeUtil.hh"

-#include "EventDebugger.hh"

+#include "TrackingAction.hh"

 #include "TrajectoryManager.hh"

+// Makoto's mat scanner
+#include "G4MatScanMessenger.hh"
+#include "G4MaterialScanner.hh"
+

 // lcdd

+#include "LCDDDetectorConstruction.hh"
+#include "LCDDObjectStoreInspector.hh"

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

-#include "G4MatScanMessenger.hh"
-#include "G4MaterialScanner.hh"
-

 // geant4

-#include "G4RunManager.hh"
-#include "G4StateManager.hh"

 #include "G4ApplicationState.hh"

+#include "G4StateManager.hh"

 
 #ifndef G4UI_NONE
 #include "G4UImanager.hh"

@@ -61,70 +63,95 @@

   G4Application* G4Application::m_instance = 0 ;
 
   G4Application::G4Application(int argc, char** argv)

-    : m_runManager(0),
-      m_session(0),

+    : m_session(0),
+#ifdef G4VIS_USE
+      m_visManager(0),
+#endif
+      m_appMessenger(0),
+      m_fieldMessenger(0),
+      m_objManager(0),
+      m_cmdManager(0),
+      m_physicsManager(0),
+      m_logManager(0),
+      m_eventDebugger(0),
+      m_lcioManager(0),
+      m_trajectoryManager(0),
+      m_runManager(0),

       m_mode(G4Application::eBatch),
       m_returnCode(0),
       m_setRunAbort(false),
       m_isInitialized(false)
   {

-    /* Set the G4Application instance variable. */

+    // Set the G4Application instance variable.

     if ( 0 != m_instance ) {
       G4Exception("G4Application constructed twice.");
     }
     m_instance = this;

-    /* Initialize the application messenger. */
-    m_appMessenger = new G4ApplicationMessenger(this);
-
-    /* Initialize the log manager. */
-    LogManager::instance();
-
-    /* Initialize the command manager for handling command-line arguments. */
-    CmdManager::instance();
-
-    /* Initialize the event generation manager. */
-    EventSourceManager::instance();

+    // Register the map of command line options to Geant4 commands.
+    registerCmdLineOpts();

-    /* Setup the queue of Geant4 commands from the command-line arguments. */

+    // Setup the queue of Geant4 commands from the command-line arguments.

     setupFromCommandLine(argc, argv);
   }
 
   G4Application::~G4Application()
   {

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

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

 
 #ifdef G4VIS_USE

-    if ( sVisManager != 0 ) {
-      delete sVisManager;

+    if (m_visManager != 0) {
+      delete m_visManager;

     }
 #endif

-    if ( m_session != 0 ) {

+    if (m_session != 0) {

       delete m_session;
     }

-    delete m_runManager;

+    if (m_runManager != 0) {
+      delete m_runManager;
+    }

-    delete m_appMessenger;

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

-    delete m_fieldMessenger;

+    if (m_fieldMessenger != 0) {
+      delete m_fieldMessenger;
+    }

-    delete CmdManager::instance();

+    if (m_objManager != 0) {
+      delete m_objManager;
+    }

-    delete PhysicsListManager::instance();

+    if (m_cmdManager != 0) {
+      delete m_cmdManager;
+    }

-    delete LogManager::instance();

+    if (m_physicsManager != 0) {
+      delete m_physicsManager;
+    }

-    delete EventSourceManager::instance();

+    if (m_logManager != 0) {
+      delete m_logManager;
+    }

-    delete EventDebugger::instance();

+    if (m_genManager != 0) {
+      delete m_genManager;
+    }

-    delete LcioManager::instance();

+    if (m_eventDebugger != 0) {
+      delete m_eventDebugger;
+    }

-    delete TrajectoryManager::instance();

+    if (m_lcioManager != 0) {
+      delete m_lcioManager;
+    }

-    printEndTime(cout);

+    if (m_trajectoryManager != 0) {
+      delete m_trajectoryManager;
+    }

   }
 
   G4Application* G4Application::instance()

@@ -144,12 +171,6 @@

     m_binaryname = std::string(argv[0]);
     setBinaryBasename();

-    /*
-     * Register the mappings of command line options to Geant4 commands
-     * with the CmdManager.
-     */
-    registerCmdLineOpts();
-

     /* Get the command manager. */
     CmdManager* mgr = CmdManager::instance();

@@ -170,52 +191,64 @@

   {
     if (!m_isInitialized) {

+      // Initialize the application messenger.
+      m_appMessenger = new G4ApplicationMessenger(this);
+
+      // Initialize the log manager.
+      m_logManager = LogManager::instance();
+
+      // Initialize the event generation manager.
+      m_genManager = EventSourceManager::instance();
+

 #ifdef SLIC_VERBOSE
       std::cout << "SLIC verbose system is enabled." << std::endl;
 #else
       std::cout << "SLIC verbose system is disabled." << std::endl;
 #endif

-      /* Create a new RunManager. */

+      // Create a new RunManager.

       m_runManager = new RunManager();

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

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

-      /* Setup the default event source AFTER PHYSICS. */

+      // Initialize the physics list manager.
+      m_physicsManager = PhysicsListManager::instance();
+
+      // Setup the default event source AFTER PHYSICS.

       EventSourceManager::instance()->setupEventSource();

-      /* Print the SLIC splash screen. */

+      // Print the SLIC splash screen.

       printSplashScreen( cout );

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

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

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

+      // Initialize the EventDebugger.
+      m_eventDebugger = EventDebugger::instance();

-      /* Initialize the magnetic field messenger. */

+      // Initialize the magnetic field messenger.

       m_fieldMessenger = new FieldMessenger();

-      /* Construct and register the UserAction classes. */

+      // Construct and register the UserAction classes.

       setupUserActions();

-      /* Initialize visualization. */

+      // Initialize visualization.

 #ifdef G4VIS_USE
       initializeVis();
 #endif

-      /* Initialize the UI. */

+      // Initialize the UI.

 #ifndef G4UI_NONE
       initializeUI();
 #endif

-      /* Print list of registered modules. */

+      // Print list of registered modules.

 #ifdef SLIC_VERBOSE
       ModuleRegistry::instance()->print(cout);
 #endif

-      /* Set state variable. */

+      // Set state variable.

       m_isInitialized = true;
     }
     else {

@@ -262,8 +295,8 @@

 #ifdef G4VIS_USE
   void G4Application::initializeVis()
   {

-    sVisManager = new VisManager();
-    sVisManager->Initialize();

+    m_visManager = new VisManager();
+    m_visManager->Initialize();

   }
 #endif

@@ -271,13 +304,13 @@

   {
     if ( m_runManager != 0 ) {

-      /* Primary generator. */

+      // Primary generator.

       m_runManager->SetUserAction(new PrimaryGeneratorAction);

-      /* LCDD geometry subsystem. */

+      // LCDD geometry subsystem.

       m_runManager->SetUserInitialization(new LCDDDetectorConstruction);

-      /* SLIC's UserAction handlers. */

+      // SLIC's UserAction handlers.

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

@@ -293,11 +326,54 @@

     m_mode = rmode;
   }

+  const std::string& G4Application::getBinaryName() const
+  {
+    return m_binaryname;
+  }
+
+  const std::string& G4Application::getBinaryBasename() const
+  {
+    return m_binarybasename;
+  }
+
+  int G4Application::getReturnCode() const
+  {
+    return m_returnCode;
+  }
+
+  void G4Application::setReturnCode(int rc)
+  {
+    m_returnCode = rc;
+  }
+
+  void G4Application::setBinaryBasename()
+  {
+    std::string::size_type sidx = m_binaryname.find_last_of('/');
+    if (sidx != std::string::npos) {
+      m_binarybasename = std::string(m_binaryname, sidx + 1);
+    }
+  }
+

   G4Application::ERunMode G4Application::getMode() const
   {
     return m_mode;
   }

+  void G4Application::setAborting(bool a)
+  {
+    if (a) {
+      // FIXME: Does this actually do anything to current G4Event?
+      G4RunManager::GetRunManager()->AbortRun(false);
+    }
+
+    m_setRunAbort = a;
+  }
+
+  bool G4Application::isAborting() const
+  {
+    return m_setRunAbort;
+  }
+

   RunManager* G4Application::getRunManager()
   {
     return m_runManager;

@@ -305,31 +381,42 @@

 
   void G4Application::run()
   {

-    if (!m_isInitialized) {
-      initialize();
-    }
-    cout << endl;

+    // Get the command manager.
+    CmdManager* cmgr = CmdManager::instance();

-    /* Execute the current queue of Geant4 commands. */
-    CmdManager::instance()->execCurrG4CmdQueue(true);

+    // Print usage was selected.
+    if (cmgr->isPrintUsage()) {
+      printUsage(std::cout);
+    }

-    /* Start the UI session if in interactive mode. */
-#ifndef G4UI_NONE
-    if ( getMode() == eInteractive ) {
-      m_session->SessionStart();

+    // Print version was selected.
+    if (cmgr->isPrintVersion()) {
+      printVersion(std::cout);

-#endif

-    /* Set the application return code. */
-    setReturnCode(0);
-  }

+    // Run the simulator if not print usage or version.
+    if ((!cmgr->isPrintUsage()) && (!cmgr->isPrintVersion())) {

-  G4ApplicationState G4Application::getG4ApplicationState()
-  {
-    return G4StateManager::GetStateManager()->GetCurrentState();

+      // Initialize.
+      if (!m_isInitialized) {
+	initialize();
+      }
+
+      cout << endl;
+
+      // Execute the queue of Geant4 commands built from command-line arguments.
+      cmgr->execCurrG4CmdQueue(true);
+
+      // Start the UI session if in interactive mode.
+#ifndef G4UI_NONE
+      if ( getMode() == eInteractive ) {
+	m_session->SessionStart();
+      }
+#endif
+    }

-  void G4Application::printOutUsage(std::ostream& os)

+  void G4Application::printUsage(std::ostream& os)

   {
     os << std::endl;
     os << "**************" << std::endl;

@@ -356,6 +443,11 @@

     os << std::endl;
   }

+  void G4Application::printVersion(std::ostream& os)
+  {
+    os << std::endl << PackageInfo::getFullApplicationString() << std::endl << std::endl;
+  }
+

   void G4Application::printSplashScreen(std::ostream& os) const
   {
     // splash screen

@@ -371,18 +463,6 @@

     os << endl;
   }

-  // print startup time
-  void G4Application::printStartTime(std::ostream& os)
-  {
-    os << "Start Time <" << TimeUtil::getAscTime() << ">" << endl;
-  }
-
-  // print end time
-  void G4Application::printEndTime(std::ostream& os)
-  {
-    os << "End Time <" << TimeUtil::getAscTime() << ">" << endl;
-  }
-

   void G4Application::registerCmdLineOpts()
   {
     CmdManager* cmd_mgr = CmdManager::instance();

+ + void TimeUtil::printStartTime(std::ostream& os) + { + os << "Start Time <" << TimeUtil::getAscTime() << ">" << endl; + } + + void TimeUtil::printEndTime(std::ostream& os) + { + os << "End Time <" << TimeUtil::getAscTime() << ">" << endl; + }

Commit in `slic` on MAIN
`slic.cc`	+38	-35	1.15 -> 1.16
`include/CmdManager.hh`	+8	-1	1.10 -> 1.11
`/G4Application.hh`	+49	-60	1.40 -> 1.41
`/TimeUtil.hh`	+5	-1	1.7 -> 1.8
`src/CmdManager.cc`	+31	-2	1.19 -> 1.20
`/G4Application.cc`	+180	-100	1.66 -> 1.67
`/G4ApplicationMessenger.cc`	+6	-6	1.11 -> 1.12
`/LcioFileNamer.cc`	+5	-3	1.13 -> 1.14
`/LcioManager.cc`	+9	-8	1.67 -> 1.68
`/LogMessenger.cc`	+4	-1	1.7 -> 1.8
`/TimeUtil.cc`	+14	-1	1.7 -> 1.8
	+349	-218