slic/src
diff -u -r1.10 -r1.11
--- GeneratorMessenger.cc 14 May 2008 03:24:11 -0000 1.10
+++ GeneratorMessenger.cc 14 May 2008 22:04:03 -0000 1.11
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/GeneratorMessenger.cc,v 1.10 2008/05/14 03:24:11 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/GeneratorMessenger.cc,v 1.11 2008/05/14 22:04:03 jeremy Exp $
#include "GeneratorMessenger.hh"
// slic
@@ -23,120 +23,120 @@
namespace slic
{
- GeneratorMessenger::GeneratorMessenger()
- {
- defineCommands();
- }
-
- GeneratorMessenger::~GeneratorMessenger()
- {}
-
- void GeneratorMessenger::SetNewValue(G4UIcommand* cmd, G4String newVals)
- {
- std::istringstream is ( ( const char* ) newVals );
-
- std::string s;
- is >> s;
-
- EventSourceManager* mgr = EventSourceManager::instance();
-
- // select
- if ( cmd == m_selectCmd ) {
- mgr->setupEventSource( s );
- }
- // reset
- else if ( cmd == m_resetCmd ) {
- mgr->resetCurrentEventSource();
- }
- // skipEvents
- else if ( cmd == m_skipEventsCmd ) {
- mgr->setSkipEvents( StringUtil::toInt( s ) );
- }
- // filename
- else if ( cmd == m_filenameCmd ) {
- mgr->setFilename( s );
- }
- // dumpCurrentEvent
- else if ( cmd == m_dumpCurrentEventCmd ) {
- mgr->dumpCurrentEvent();
- }
- // printNumEventsGenerated
- else if ( cmd == m_printNumEventsGeneratedCmd ) {
- mgr->printNumEventsGenerated();
- }
- // set random seed
- else if ( cmd == m_randomSeedCmd ) {
+ GeneratorMessenger::GeneratorMessenger()
+ {
+ defineCommands();
+ }
+
+ GeneratorMessenger::~GeneratorMessenger()
+ {}
+
+ void GeneratorMessenger::SetNewValue(G4UIcommand* cmd, G4String newVals)
+ {
+ std::istringstream is ( ( const char* ) newVals );
+
+ std::string s;
+ is >> s;
+
+ EventSourceManager* mgr = EventSourceManager::instance();
+
+ // select
+ if ( cmd == m_selectCmd ) {
+ mgr->setupEventSource( s );
+ }
+ // reset
+ else if ( cmd == m_resetCmd ) {
+ mgr->resetCurrentEventSource();
+ }
+ // skipEvents
+ else if ( cmd == m_skipEventsCmd ) {
+ mgr->setSkipEvents( StringUtil::toInt( s ) );
+ }
+ // filename
+ else if ( cmd == m_filenameCmd ) {
+ mgr->setFilename( s );
+ }
+ // dumpCurrentEvent
+ else if ( cmd == m_dumpCurrentEventCmd ) {
+ mgr->dumpCurrentEvent();
+ }
+ // printNumEventsGenerated
+ else if ( cmd == m_printNumEventsGeneratedCmd ) {
+ mgr->printNumEventsGenerated();
+ }
+ // set random seed
+ else if ( cmd == m_randomSeedCmd ) {
+
+ G4int seed = 0;
+
+ // seed from user arg
+ if ( s != std::string("") ) {
+ seed = StringUtil::toInt( s );
+ }
+ // seed from time
+ // @todo Get MS instead of just seconds, which is not very good quality for a seed.
+ else {
+ seed = ((unsigned)time(NULL));
+ }
+
+ // seed it
+ HepRandom::setTheSeed( seed );
+
+ mgr->log() << LOG::okay << "set random seed: " << seed << LOG::done;
+ }
+ // Lorentz transformation angle
+ else if ( cmd == m_setLorentzTransformationAngleCmd ) {
+ EventSourceManager::instance()->setLorentzTransformationAngle( G4UIcmdWithADouble::GetNewDoubleValue( newVals ) );
+ }
+ else {
+ G4Exception("Unknown cmd for this messenger.");
+ }
+ }
+
+ void GeneratorMessenger::defineCommands()
+ {
+ G4UIparameter *p;
+
+ // generator dir
+ m_generatorDir = new G4UIdirectory( "/generator/" );
+ m_generatorDir->SetGuidance( "Event generation commands. [SLIC]" );
+
+ // select
+ m_selectCmd = new G4UIcommand( "/generator/select", this );
+ m_selectCmd->SetGuidance( "Set Generator to use: lcio, stdhep, gps or gun." );
+ p = new G4UIparameter( "generator", 's', false );
+ m_selectCmd->SetParameter(p);
+
+ // reset
+ m_resetCmd = new G4UIcommand( "/generator/reset", this);
+ m_resetCmd->SetGuidance( "Reset the generator using the current info." );
+
+ // skipEvents
+ m_skipEventsCmd = new G4UIcmdWithAnInteger( "/generator/skipEvents", this);
+ m_skipEventsCmd->SetGuidance( "Skip n events of current generator." );
+ m_skipEventsCmd->SetParameterName( "NumEvents", false);
+
+ // filename
+ m_filenameCmd = new G4UIcommand( "/generator/filename", this);
+ m_filenameCmd->SetGuidance( "Set generator input filename.");
+ p = new G4UIparameter( "filename", 's', false);
+ m_filenameCmd->SetParameter(p);
+
+ // dumpCurrentEvent
+ m_dumpCurrentEventCmd = new G4UIcommand( "/generator/dumpEvent", this);
+ m_dumpCurrentEventCmd->SetGuidance( "Dump information about the current generator event." );
+
+ // printNumEventsGenerated
+ m_printNumEventsGeneratedCmd = new G4UIcommand( "/generator/printNumEventsGenerated", this);
+ m_printNumEventsGeneratedCmd->SetGuidance( "Print out number of events generated with current generator.");
+
+ // random seed cmd
+ m_randomSeedCmd = new G4UIcommand( "/random/seed", this );
+ m_randomSeedCmd->SetGuidance( "Set random seed; no argument seeds with current time. [SLIC]" );
+ p = new G4UIparameter( "seedValue", 'i', true );
+ m_randomSeedCmd->SetParameter( p );
- G4int seed = 0;
-
- // seed from user arg
- if ( s != std::string("") ) {
- seed = StringUtil::toInt( s );
- }
- // seed from time
- // @todo Get MS instead of just seconds, which is not very good quality for a seed.
- else {
- seed = ((unsigned)time(NULL));
- }
-
- // seed it
- HepRandom::setTheSeed( seed );
-
- mgr->log() << LOG::okay << "set random seed: " << seed << LOG::done;
+ // Lorentz transformation
+ m_setLorentzTransformationAngleCmd = new G4UIcmdWithADouble("/generator/setLorentzTransformationAngle",this);
}
- // Lorentz transformation angle
- else if ( cmd == m_setLorentzTransformationAngleCmd ) {
- EventSourceManager::instance()->setLorentzTransformationAngle( G4UIcmdWithADouble::GetNewDoubleValue( newVals ) );
- }
- else {
- G4Exception("Unknown cmd for this messenger.");
- }
- }
-
- void GeneratorMessenger::defineCommands()
- {
- G4UIparameter *p;
-
- // generator dir
- m_generatorDir = new G4UIdirectory( "/generator/" );
- m_generatorDir->SetGuidance( "Event generation commands. [SLIC]" );
-
- // select
- m_selectCmd = new G4UIcommand( "/generator/select", this );
- m_selectCmd->SetGuidance( "Set Generator to use: lcio, stdhep, gps or gun." );
- p = new G4UIparameter( "generator", 's', false );
- m_selectCmd->SetParameter(p);
-
- // reset
- m_resetCmd = new G4UIcommand( "/generator/reset", this);
- m_resetCmd->SetGuidance( "Reset the generator using the current info." );
-
- // skipEvents
- m_skipEventsCmd = new G4UIcmdWithAnInteger( "/generator/skipEvents", this);
- m_skipEventsCmd->SetGuidance( "Skip n events of current generator." );
- m_skipEventsCmd->SetParameterName( "NumEvents", false);
-
- // filename
- m_filenameCmd = new G4UIcommand( "/generator/filename", this);
- m_filenameCmd->SetGuidance( "Set generator input filename.");
- p = new G4UIparameter( "filename", 's', false);
- m_filenameCmd->SetParameter(p);
-
- // dumpCurrentEvent
- m_dumpCurrentEventCmd = new G4UIcommand( "/generator/dumpEvent", this);
- m_dumpCurrentEventCmd->SetGuidance( "Dump information about the current generator event." );
-
- // printNumEventsGenerated
- m_printNumEventsGeneratedCmd = new G4UIcommand( "/generator/printNumEventsGenerated", this);
- m_printNumEventsGeneratedCmd->SetGuidance( "Print out number of events generated with current generator.");
-
- // random seed cmd
- m_randomSeedCmd = new G4UIcommand( "/random/seed", this );
- m_randomSeedCmd->SetGuidance( "Set random seed; no argument seeds with current time. [SLIC]" );
- p = new G4UIparameter( "seedValue", 'i', true );
- m_randomSeedCmd->SetParameter( p );
-
- // Lorentz transformation
- m_setLorentzTransformationAngleCmd = new G4UIcmdWithADouble("/generator/setLorentzTransformationAngle",this);
- }
}
slic/include
diff -u -r1.7 -r1.8
--- GeneratorMessenger.hh 14 May 2008 03:24:11 -0000 1.7
+++ GeneratorMessenger.hh 14 May 2008 22:04:03 -0000 1.8
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/GeneratorMessenger.hh,v 1.7 2008/05/14 03:24:11 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/GeneratorMessenger.hh,v 1.8 2008/05/14 22:04:03 jeremy Exp $
#ifndef SLIC_GENERATORMESSENGER_HH
#define SLIC_GENERATORMESSENGER_HH 1
@@ -13,38 +13,38 @@
namespace slic
{
- /**
- * @class GeneratorMessenger
- * @brief Geant4 commands related to event generation.
- */
- class GeneratorMessenger : public G4UImessenger
- {
-
- public:
-
- GeneratorMessenger();
- virtual ~GeneratorMessenger();
-
- public:
-
- virtual void SetNewValue(G4UIcommand* cmd, G4String newVals);
-
- private:
-
- void defineCommands();
-
- private:
-
- G4UIdirectory* m_generatorDir;
- G4UIcommand* m_randomSeedCmd;
- G4UIcommand* m_selectCmd;
- G4UIcommand* m_resetCmd;
- G4UIcmdWithAnInteger* m_skipEventsCmd;
- G4UIcommand* m_filenameCmd;
- G4UIcommand* m_dumpCurrentEventCmd;
- G4UIcommand* m_printNumEventsGeneratedCmd;
- G4UIcmdWithADouble* m_setLorentzTransformationAngleCmd;
- };
+ /**
+ * @class GeneratorMessenger
+ * @brief Geant4 commands related to event generation.
+ */
+ class GeneratorMessenger : public G4UImessenger
+ {
+
+ public:
+
+ GeneratorMessenger();
+ virtual ~GeneratorMessenger();
+
+ public:
+
+ virtual void SetNewValue(G4UIcommand* cmd, G4String newVals);
+
+ private:
+
+ void defineCommands();
+
+ private:
+
+ G4UIdirectory* m_generatorDir;
+ G4UIcommand* m_randomSeedCmd;
+ G4UIcommand* m_selectCmd;
+ G4UIcommand* m_resetCmd;
+ G4UIcmdWithAnInteger* m_skipEventsCmd;
+ G4UIcommand* m_filenameCmd;
+ G4UIcommand* m_dumpCurrentEventCmd;
+ G4UIcommand* m_printNumEventsGeneratedCmd;
+ G4UIcmdWithADouble* m_setLorentzTransformationAngleCmd;
+ };
}
#endif