10 modified files
slic/include
diff -u -r1.41 -r1.42
--- G4Application.hh 17 May 2006 02:51:45 -0000 1.41
+++ G4Application.hh 25 Aug 2006 22:22:55 -0000 1.42
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.41 2006/05/17 02:51:45 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.42 2006/08/25 22:22:55 jeremy Exp $
#ifndef slic_G4Application_hh
#define slic_G4Application_hh 1
@@ -25,16 +25,16 @@
namespace slic
{
// slic
- class CmdManager;
- class EventDebugger;
- class EventSourceManager;
+ //class CmdManager;
+ //class EventDebugger;
+ //class EventSourceManager;
class FieldMessenger;
- class LcioManager;
- class LogManager;
+ //class LcioManager;
+ //class LogManager;
class G4ApplicationMessenger;
- class PhysicsListManager;
+ //class PhysicsListManager;
class RunManager;
- class TrajectoryManager;
+ //class TrajectoryManager;
/**
* @class G4Application
@@ -138,13 +138,13 @@
// FIXME: Should be managed generically using templated instantiation/deletion manager class.
LCDDObjectStoreInspector* m_objManager;
- CmdManager* m_cmdManager;
- PhysicsListManager* m_physicsManager;
- LogManager* m_logManager;
- EventDebugger* m_eventDebugger;
- LcioManager* m_lcioManager;
- TrajectoryManager* m_trajectoryManager;
- EventSourceManager* m_genManager;
+ //CmdManager* m_cmdManager;
+ //PhysicsListManager* m_physicsManager;
+ //LogManager* m_logManager;
+ //EventDebugger* m_eventDebugger;
+ //LcioManager* m_lcioManager;
+ //TrajectoryManager* m_trajectoryManager;
+ //EventSourceManager* m_genManager;
RunManager* m_runManager;
// application run mode: batch or interactive
slic/include
diff -u -r1.5 -r1.6
--- Module.hh 18 Oct 2005 17:42:02 -0000 1.5
+++ Module.hh 25 Aug 2006 22:22:55 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/Module.hh,v 1.5 2005/10/18 17:42:02 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/Module.hh,v 1.6 2006/08/25 22:22:55 jeremy Exp $
#ifndef slic_Module_hh
#define slic_Module_hh 1
@@ -54,10 +54,16 @@
return *m_logger;
}
+ bool deleteOnExit()
+ {
+ return m_deleteOnExit;
+ }
+
public:
ModuleStatus m_status;
std::string m_name;
Logger* m_logger;
+ bool m_deleteOnExit;
};
}
slic/include
diff -u -r1.3 -r1.4
--- ModuleRegistry.hh 18 Oct 2005 17:42:02 -0000 1.3
+++ ModuleRegistry.hh 25 Aug 2006 22:22:55 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/ModuleRegistry.hh,v 1.3 2005/10/18 17:42:02 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/ModuleRegistry.hh,v 1.4 2006/08/25 22:22:55 jeremy Exp $
// std
#include <map>
@@ -36,6 +36,8 @@
std::ostream& print(std::ostream& os) const;
+ void deleteModules();
+
private:
ModuleMap m_modules;
static ModuleRegistry* m_instance;
slic/include
diff -u -r1.11 -r1.12
--- PhysicsListManager.hh 19 Oct 2005 22:51:09 -0000 1.11
+++ PhysicsListManager.hh 25 Aug 2006 22:22:55 -0000 1.12
@@ -1,9 +1,11 @@
-// $Header: /cvs/lcd/slic/include/PhysicsListManager.hh,v 1.11 2005/10/19 22:51:09 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/PhysicsListManager.hh,v 1.12 2006/08/25 22:22:55 jeremy Exp $
#ifndef slic_PhysicsListManager_hh
#define slic_PhysicsListManager_hh 1
-// slic
+// lcdd
#include "Module.hh"
+
+// slic
#include "PhysicsListFactory.hh"
#include "PhysicsMessenger.hh"
slic/src
diff -u -r1.70 -r1.71
--- G4Application.cc 12 Jul 2006 19:44:24 -0000 1.70
+++ G4Application.cc 25 Aug 2006 22:22:56 -0000 1.71
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.70 2006/07/12 19:44:24 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.71 2006/08/25 22:22:56 jeremy Exp $
#include "G4Application.hh"
// slic
@@ -6,7 +6,8 @@
#include "EventAction.hh"
#include "EventDebugger.hh"
#include "EventSourceManager.hh"
-#include "FieldMessenger.hh"
+//#include "FieldMessenger.hh"
+#include "FieldManager.hh"
#include "G4ApplicationMessenger.hh"
#include "LcioManager.hh"
#include "LogManager.hh"
@@ -64,15 +65,15 @@
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_genManager(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_genManager(0),
m_runManager(0),
m_mode(G4Application::eBatch),
m_returnCode(0),
@@ -114,41 +115,41 @@
delete m_appMessenger;
}
- if (m_fieldMessenger != 0) {
- delete m_fieldMessenger;
- }
-
- if (m_objManager != 0) {
- delete m_objManager;
- }
-
- if (m_cmdManager != 0) {
- delete m_cmdManager;
- }
-
- if (m_physicsManager != 0) {
- delete m_physicsManager;
- }
-
- if (m_logManager != 0) {
- delete m_logManager;
- }
-
- if (m_genManager != 0) {
- delete m_genManager;
- }
-
- if (m_eventDebugger != 0) {
- delete m_eventDebugger;
- }
-
- if (m_lcioManager != 0) {
- delete m_lcioManager;
- }
-
- if (m_trajectoryManager != 0) {
- delete m_trajectoryManager;
- }
+ //if (m_fieldMessenger != 0) {
+ // delete m_fieldMessenger;
+ //}
+
+ //if (m_objManager != 0) {
+ // delete m_objManager;
+ //}
+
+ //if (m_cmdManager != 0) {
+ // delete m_cmdManager;
+ //}
+
+ //if (m_physicsManager != 0) {
+ // delete m_physicsManager;
+ //}
+
+ //if (m_logManager != 0) {
+ // delete m_logManager;
+ //}
+
+ //if (m_genManager != 0) {
+ // delete m_genManager;
+ //}
+
+ //if (m_eventDebugger != 0) {
+ // delete m_eventDebugger;
+ //}
+
+ //if (m_lcioManager != 0) {
+ // delete m_lcioManager;
+ //}
+
+ //if (m_trajectoryManager != 0) {
+ // delete m_trajectoryManager;
+ //}
}
G4Application* G4Application::instance()
@@ -192,10 +193,12 @@
m_appMessenger = new G4ApplicationMessenger(this);
// Initialize the log manager.
- m_logManager = LogManager::instance();
+ //m_logManager = LogManager::instance();
+ LogManager::instance();
// Initialize the event generation manager.
- m_genManager = EventSourceManager::instance();
+ //m_genManager = EventSourceManager::instance();
+ EventSourceManager::instance();
#ifdef SLIC_VERBOSE
std::cout << "SLIC verbose system is enabled." << std::endl;
@@ -207,10 +210,12 @@
m_runManager = new RunManager();
// Object store manager.
- m_objManager = new LCDDObjectStoreInspector();
+ //m_objManager = new LCDDObjectStoreInspector();
+ new LCDDObjectStoreInspector();
// Initialize the physics list manager.
- m_physicsManager = PhysicsListManager::instance();
+ //m_physicsManager = PhysicsListManager::instance();
+ PhysicsListManager::instance();
// Setup the default event source AFTER PHYSICS.
EventSourceManager::instance()->setupEventSource();
@@ -219,13 +224,16 @@
printSplashScreen( cout );
// Initialize the LcioManager.
- m_lcioManager = LcioManager::instance();
+ //m_lcioManager = LcioManager::instance();
+ LcioManager::instance();
// Initialize the EventDebugger.
- m_eventDebugger = EventDebugger::instance();
+ //m_eventDebugger = EventDebugger::instance();
+ EventDebugger::instance();
// Initialize the magnetic field messenger.
- m_fieldMessenger = new FieldMessenger();
+ //m_fieldMessenger = new FieldMessenger();
+ FieldManager::instance();
// Construct and register the UserAction classes.
setupUserActions();
@@ -410,6 +418,8 @@
m_session->SessionStart();
}
#endif
+
+ ModuleRegistry::instance()->deleteModules();
}
}
slic/src
diff -u -r1.70 -r1.71
--- LcioManager.cc 4 Aug 2006 23:10:51 -0000 1.70
+++ LcioManager.cc 25 Aug 2006 22:22:58 -0000 1.71
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.70 2006/08/04 23:10:51 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioManager.cc,v 1.71 2006/08/25 22:22:58 jeremy Exp $
#include "LcioManager.hh"
// slic
@@ -99,9 +99,9 @@
delete m_eventGenerator;
}
- if ( m_mcpManager != 0 ) {
- delete m_mcpManager;
- }
+ //if ( m_mcpManager != 0 ) {
+ // delete m_mcpManager;
+ //}
if ( m_HCBuilder != 0 ) {
delete m_HCBuilder;
slic/src
diff -u -r1.31 -r1.32
--- LcioMessenger.cc 9 Dec 2005 01:58:34 -0000 1.31
+++ LcioMessenger.cc 25 Aug 2006 22:23:00 -0000 1.32
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.31 2005/12/09 01:58:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.32 2006/08/25 22:23:00 jeremy Exp $
#include "LcioMessenger.hh"
// slic
@@ -165,7 +165,7 @@
// enable autonaming
m_autonameCmd = new G4UIcommand( "/lcio/autoname", this );
m_autonameCmd->SetGuidance( "Set autonaming parameters." );
- m_autonameCmd->SetGuidance("Valid autoname fields: application version geometry event date");
+ m_autonameCmd->SetGuidance("Valid autoname fields: application version geometry event eventNumber run binary physics date");
p = new G4UIparameter("autoname", 's', true );
m_autonameCmd->SetParameter(p);
slic/src
diff -u -r1.3 -r1.4
--- Module.cc 18 Oct 2005 17:42:03 -0000 1.3
+++ Module.cc 25 Aug 2006 22:23:01 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/Module.cc,v 1.3 2005/10/18 17:42:03 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/Module.cc,v 1.4 2006/08/25 22:23:01 jeremy Exp $
#include "Module.hh"
// slic
@@ -8,6 +8,7 @@
namespace slic
{
Module::Module(const std::string& name)
+ : m_deleteOnExit(true)
{
m_name = name;
slic/src
diff -u -r1.3 -r1.4
--- ModuleRegistry.cc 18 Oct 2005 17:42:03 -0000 1.3
+++ ModuleRegistry.cc 25 Aug 2006 22:23:01 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/ModuleRegistry.cc,v 1.3 2005/10/18 17:42:03 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/ModuleRegistry.cc,v 1.4 2006/08/25 22:23:01 jeremy Exp $
#include "ModuleRegistry.hh"
// slic
@@ -77,4 +77,16 @@
}
return os;
}
+
+ void ModuleRegistry::deleteModules()
+ {
+ for (ModuleMap::iterator it = m_modules.begin();
+ it != m_modules.end();
+ it++) {
+ // Delete it as long as Module has not explicitly disallowed deletion.
+ if (it->second->deleteOnExit() ) {
+ delete it->second;
+ }
+ }
+ }
}
slic/src
diff -u -r1.7 -r1.8
--- VisManager.cc 19 Oct 2005 22:51:18 -0000 1.7
+++ VisManager.cc 25 Aug 2006 22:23:01 -0000 1.8
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/VisManager.cc,v 1.7 2005/10/19 22:51:18 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/VisManager.cc,v 1.8 2006/08/25 22:23:01 jeremy Exp $
#ifdef G4VIS_USE
#include "VisManager.hh"
@@ -57,7 +57,8 @@
VisManager::VisManager()
: Module("VisManager")
{
- setVerbose(1);
+ // setVerbose(1);
+ m_deleteOnExit = false;
}
void VisManager::RegisterGraphicsSystems () {
@@ -107,12 +108,12 @@
#endif
#ifdef SLIC_VERBOSE
- if (verbose() > 0) {
- G4cout <<
- "\nYou have successfully chosen to use the following graphics systems."
- << G4endl;
- PrintAvailableGraphicsSystems ();
- }
+ // if (verbose() > 0) {
+ G4cout <<
+ "\nYou have successfully chosen to use the following graphics systems."
+ << G4endl;
+ PrintAvailableGraphicsSystems ();
+ // }
#endif
}
}
CVSspam 0.2.8