slic/include
diff -u -r1.4 -r1.5
--- RunManager.hh 20 Apr 2005 00:11:29 -0000 1.4
+++ RunManager.hh 27 Jun 2005 18:20:50 -0000 1.5
@@ -7,7 +7,7 @@
* @class RunManager
* @brief Extension of G4RunManager.
* @note Current, primary function is to initialize the default
- * physics list setup using PhysicsListManager.
+ * physics list setup using PhysicsListManager.
*/
namespace slic
@@ -16,11 +16,12 @@
{
public:
RunManager() {}
- virtual ~RunManager() {}
+ virtual ~RunManager() {}
protected:
virtual void InitializePhysics();
+ virtual void InitializeGeometry();
};
};
slic/src
diff -u -r1.4 -r1.5
--- RunManager.cc 20 Apr 2005 00:11:22 -0000 1.4
+++ RunManager.cc 27 Jun 2005 18:20:50 -0000 1.5
@@ -1,6 +1,9 @@
-// $Header: /cvs/lcd/slic/src/RunManager.cc,v 1.4 2005/04/20 00:11:22 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/RunManager.cc,v 1.5 2005/06/27 18:20:50 jeremy Exp $
#include "RunManager.hh"
+// LCDD
+#include "LCDDParser.hh"
+
// SLIC
#include "PhysicsListManager.hh"
@@ -18,9 +21,18 @@
// call par class function
G4RunManager::InitializePhysics();
- // enable limits if selected (must happen after G4RunManager init for valid G4ProcessManagers!)
+ // enable limits if selected (must happen after G4RunManager init for valid G4ProcessManagers!)
if ( pmgr->enableLimits() ) {
pmgr->setupUserLimitsProcesses();
- }
+ }
+ }
+
+ void RunManager::InitializeGeometry()
+ {
+ if ( !LCDDParser::instance()->isValid() ) {
+ G4Exception("FATAL ERROR: Current LCDD geometry setup is not valid.");
+ }
+
+ G4RunManager::InitializeGeometry();
}
};