4 modified files
slic/include
diff -u -r1.13 -r1.14
--- G4CmdQueue.hh 17 May 2006 23:58:11 -0000 1.13
+++ G4CmdQueue.hh 18 May 2006 00:35:11 -0000 1.14
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/G4CmdQueue.hh,v 1.13 2006/05/17 23:58:11 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/G4CmdQueue.hh,v 1.14 2006/05/18 00:35:11 jeremy Exp $
#ifndef slic_G4CmdQueue_hh
#define slic_G4CmdQueue_hh
@@ -32,11 +32,6 @@
virtual ~G4CmdQueue()
{}
- SizeType getNumCmds()
- {
- return m_commands.size();
- }
-
void addCmd(const CmdType& g4cmd)
{
m_commands.push_back( g4cmd );
@@ -69,12 +64,13 @@
void prepare();
+ CmdVecType::const_iterator find_cmd(const std::string& str);
+
private:
void reorder();
void setInitialize();
void reorderBeamOn();
- void reorderLimits();
void reorder_dumpGDML();
CmdVecType::const_iterator find_init();
slic/include
diff -u -r1.8 -r1.9
--- PhysicsMessenger.hh 19 Oct 2005 22:51:09 -0000 1.8
+++ PhysicsMessenger.hh 18 May 2006 00:35:11 -0000 1.9
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/PhysicsMessenger.hh,v 1.8 2005/10/19 22:51:09 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/PhysicsMessenger.hh,v 1.9 2006/05/18 00:35:11 jeremy Exp $
#ifndef slic_PhysicsMessenger_hh
#define slic_PhysicsMessenger_hh 1
@@ -33,10 +33,9 @@
G4UIdirectory* m_physicsListDir;
- G4UIcommand* m_selectCmd;
+ G4UIcommand* m_selectCmd;
G4UIcmdWithoutParameter* m_printListsCmd;
G4UIcmdWithoutParameter* m_printCurrentCmd;
- G4UIcmdWithABool* m_enableLimitsCmd;
};
}
slic/src
diff -u -r1.14 -r1.15
--- G4CmdQueue.cc 17 May 2006 23:58:11 -0000 1.14
+++ G4CmdQueue.cc 18 May 2006 00:35:12 -0000 1.15
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/G4CmdQueue.cc,v 1.14 2006/05/17 23:58:11 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4CmdQueue.cc,v 1.15 2006/05/18 00:35:12 jeremy Exp $
#include "G4CmdQueue.hh"
#include "G4UImanager.hh"
@@ -39,106 +39,32 @@
void G4CmdQueue::reorder()
{
reorderBeamOn();
- reorderLimits();
+ // reorderLimits();
reorder_dumpGDML();
}
void G4CmdQueue::reorderBeamOn()
{
- bool gotBeamOn = false;
-
- CmdVecType::iterator iter = m_commands.begin();
- std::string cmd;
- for ( ;
- iter != m_commands.end();
- iter++ ) {
- cmd = (*iter);
-
- if ( cmd.find("/run/beamOn") != std::string::npos ) {
- gotBeamOn = true;
- break;
- }
- }
-
- if ( gotBeamOn ) {
-
- /* Erase the old beamOn. */
+ CmdVecType::const_iterator iter = find_cmd("/run/beamOn");
+ if (iter != cmdsEnd() ) {
+ std::string cmd = (*iter);
m_commands.erase(iter);
-
- /* Put the beamOn command at the end of the queue. */
addCmd(cmd);
}
}
void G4CmdQueue::reorder_dumpGDML()
{
- bool gotdump = false;
- std::string dumpstr = std::string("/lcdd/dumpGDML");
- std::string cmd;
- CmdVecType::const_iterator iter = m_commands.begin();
- for ( ;
- iter != m_commands.end();
- iter++ ) {
- if ( (*iter).find(dumpstr) != std::string::npos ) {
- cmd = (*iter);
- gotdump = true;
- break;
- }
- }
-
- if (gotdump) {
- m_commands.erase(iter);
- }
- else {
- return;
- }
-
- iter = find_init();
- if (iter != m_commands.end()) {
- m_commands.insert(iter + 1, cmd);
- }
- }
+ CmdVecType::const_iterator iter = find_cmd("/lcdd/dumpGDML");
- void G4CmdQueue::reorderLimits()
- {
- bool gotLimits = false;
- std::string limitsStr = std::string("/physics/enableLimits");
-
- CmdVecType::iterator iter = m_commands.begin();
- for ( ;
- iter != m_commands.end();
- iter++ ) {
- std::string cmd = *iter;
-
- if ( cmd.find(limitsStr) != std::string::npos ) {
- gotLimits = true;
- break;
+ if (iter != cmdsEnd()) {
+ CmdVecType::const_iterator init = find_init();
+ std::string cmd = (*iter);
+ if (init != cmdsEnd()) {
+ m_commands.erase(iter);
+ m_commands.insert(init, cmd);
}
}
-
- if ( gotLimits ) {
- m_commands.erase(iter);
- }
- else {
- return;
- }
-
- bool gotInit = false;
- iter = m_commands.begin();
- for ( ;
- iter != m_commands.end();
- iter++ ) {
- std::string cmd = *iter;
-
- if ( cmd.find("/run/initialize") != std::string::npos ) {
- gotInit = true;
- break;
- }
- }
-
- if ( gotInit ) {
- m_commands.insert(iter + 1, limitsStr);
- }
}
void G4CmdQueue::setInitialize()
@@ -184,11 +110,16 @@
G4CmdQueue::CmdVecType::const_iterator G4CmdQueue::find_init()
{
+ return find_cmd("/run/initialize");
+ }
+
+ G4CmdQueue::CmdVecType::const_iterator G4CmdQueue::find_cmd(const std::string& str)
+ {
CmdVecType::const_iterator iter = m_commands.begin();
for ( ;
iter != m_commands.end();
iter++ ) {
- if ( (*iter).find("/run/initialize") != std::string::npos ) {
+ if ( (*iter).find(str) != std::string::npos ) {
break;
}
}
slic/src
diff -u -r1.17 -r1.18
--- PhysicsMessenger.cc 9 Dec 2005 01:58:34 -0000 1.17
+++ PhysicsMessenger.cc 18 May 2006 00:35:12 -0000 1.18
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/PhysicsMessenger.cc,v 1.17 2005/12/09 01:58:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/PhysicsMessenger.cc,v 1.18 2006/05/18 00:35:12 jeremy Exp $
#include "PhysicsMessenger.hh"
// slic
@@ -50,17 +50,6 @@
std::cout << "Current physics list <" << mgr->getCurrentListName() << ">." << std::endl;
std::cout << "Physics has been initialized <" << mgr->isInitialized() << ">." << std::endl;
}
- // enable limits
-// else if ( cmd == m_enableLimitsCmd ) {
-// bool blim = true;
-
-// if ( newVals != G4String("") ) {
-// blim = G4UIcmdWithABool::GetNewBoolValue( newVals );
-// }
-
-// mgr->enableLimits( blim );
-// std::cout << "Enable limits <" << mgr->enableLimits() << ">." << std::endl;
-// }
else {
std::cerr << "Unknown command for PhysicsMessenger." << std::endl;
}
@@ -87,12 +76,5 @@
// print current list
m_printCurrentCmd = new G4UIcmdWithoutParameter( "/physics/printCurrent", this );
m_printCurrentCmd->SetGuidance( "Print name of currently selected physics list." );
-
- // enable limits
-// m_enableLimitsCmd = new G4UIcmdWithABool( "/physics/enableLimits", this );
-// m_enableLimitsCmd->SetGuidance( "Enable setting of limits via G4UserLimits and processes G4StepLimiter and G4UserSpecialCuts." );
-// m_enableLimitsCmd->SetParameterName( "enable", true, true );
-// m_enableLimitsCmd->SetDefaultValue( true );
-// m_enableLimitsCmd->AvailableForStates( G4State_PreInit );
}
}
CVSspam 0.2.8
