6 modified files
slic/include
diff -u -r1.32 -r1.33
--- G4Application.hh 16 Sep 2005 23:04:35 -0000 1.32
+++ G4Application.hh 22 Sep 2005 17:21:29 -0000 1.33
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.32 2005/09/16 23:04:35 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/G4Application.hh,v 1.33 2005/09/22 17:21:29 jeremy Exp $
#ifndef slic_G4Application_hh
#define slic_G4Application_hh 1
@@ -63,7 +63,6 @@
virtual void run();
virtual void printOutUsage(std::ostream& os);
- virtual void printOutMacroCommands(std::ostream& os);
void printSplashScreen(std::ostream& os) const;
// print startup time
slic/include
diff -u -r1.29 -r1.30
--- SlicApplication.hh 16 Sep 2005 23:04:36 -0000 1.29
+++ SlicApplication.hh 22 Sep 2005 17:21:29 -0000 1.30
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.29 2005/09/16 23:04:36 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/SlicApplication.hh,v 1.30 2005/09/22 17:21:29 jeremy Exp $
#ifndef slic_SlicApplication_hh
#define slic_SlicApplication_hh 1
@@ -33,8 +33,6 @@
virtual void registerCmdLineOpts();
- virtual void printOutMacroCommands(std::ostream& os);
-
virtual void printOutUsage(std::ostream& os);
private:
slic/include
diff -u -r1.5 -r1.6
--- SlicMessenger.hh 27 Jun 2005 19:17:38 -0000 1.5
+++ SlicMessenger.hh 22 Sep 2005 17:21:29 -0000 1.6
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/include/SlicMessenger.hh,v 1.5 2005/06/27 19:17:38 jeremy Exp $
+// $Header: /cvs/lcd/slic/include/SlicMessenger.hh,v 1.6 2005/09/22 17:21:29 jeremy Exp $
#ifndef slic_SlicMessenger_hh
#define slic_SlicMessenger_hh 1
@@ -35,7 +35,6 @@
G4UIdirectory* m_slicDir;
G4UIcommand* m_slicUsage;
G4UIcommand* m_slicVersion;
- G4UIcommand* m_slicCommands;
};
};
slic/src
diff -u -r1.48 -r1.49
--- G4Application.cc 22 Sep 2005 01:11:05 -0000 1.48
+++ G4Application.cc 22 Sep 2005 17:21:30 -0000 1.49
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.48 2005/09/22 01:11:05 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/G4Application.cc,v 1.49 2005/09/22 17:21:30 jeremy Exp $
#include "G4Application.hh"
// slic
@@ -308,16 +308,6 @@
CmdManager::instance()->getCmdRegistry()->printOut( os );
}
- void G4Application::printOutMacroCommands(std::ostream& os)
- {
- os << "Control:" << std::endl;
- os << "/control/interactive" << std::endl;
-
- os << std::endl;
- os << "Logging:" << std::endl;
- os << "/log/filename" << std::endl;
- }
-
void G4Application::printSplashScreen(std::ostream& os) const
{
// splash screen
slic/src
diff -u -r1.36 -r1.37
--- SlicApplication.cc 16 Sep 2005 23:04:41 -0000 1.36
+++ SlicApplication.cc 22 Sep 2005 17:21:30 -0000 1.37
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.36 2005/09/16 23:04:41 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.37 2005/09/22 17:21:30 jeremy Exp $
#include "SlicApplication.hh"
// SLIC
@@ -51,80 +51,6 @@
G4Application::run();
}
- /**
- * @todo Make maintanence of these strings automatic; may require
- * a common base class and registry for the commands.
- */
- void SlicApplication::printOutMacroCommands(std::ostream& os)
- {
- os << "******************" << std::endl;
- os << "* Macro Commands *" << std::endl;
- os << "******************" << std::endl;
-
- os << std::endl;
-
- os << "SLIC Information:" << std::endl;
- os << "/slic/usage" << std::endl;
- os << "/slic/version" << std::endl;
- os << "/slic/command" << std::endl;
- os << std::endl;
-
- // control
- G4Application::printOutMacroCommands( os );
- os << std::endl;
-
- os << "LCDD Geometry System:" << std::endl;
- os << "/lcdd/url" << std::endl;
- os << "/lcdd/setupName" << std::endl;
- os << "/lcdd/version" << std::endl;
- os << "/lcdd/setup" << std::endl;
-
- os << std::endl;
-
- os << "Monte Carlo:" << std::endl;
- os << "/mcp/verbose" << std::endl;
- os << "/mcp/minimumTrackingDistance" << std::endl;
-
- os << std::endl;
-
- os << "Lcio:" << std::endl;
- os << "/lcio/path" << std::endl;
- os << "/lcio/filename" << std::endl;
- os << "/lcio/autoname" << std::endl;
- os << "/lcio/runNumber" << std::endl;
- os << "/lcio/longFlag" << std::endl;
- os << "/lcio/PDGFlag" << std::endl;
- os << "/lcio/verbose" << std::endl;
- os << "/lcio/fileExists" << std::endl;
- os << "/lcio/storeMomentum" << std::endl;
- os << std::endl;
-
- os << "Event Generation:" << std::endl;
- os << "/generator/select" << std::endl;
- os << "/generator/dumpEvent" << std::endl;
- os << "/generator/filename" << std::endl;
- os << "/generator/reset" << std::endl;
- os << "/generator/skipEvents" << std::endl;
- os << "/generator/printNumEventsGenerated" << std::endl;
- os << std::endl;
-
- os << "Event:" << std::endl;
- os << "/event/enableEventTimer" << std::endl;
-
- os << std::endl;
- os << "Physics List Commands:" << std::endl;
- os << "/physics/select" << std::endl;
- os << "/physics/enableLimits" << std::endl;
- os << "/physics/printCurrent" << std::endl;
- os << "/physics/printLists" << std::endl;
-
- os << std::endl;
- os << "Random Engine:" << std::endl;
- os << "/random/seed" << std::endl;
- os << "******************" << std::endl;
- os << std::endl;
- }
-
void SlicApplication::registerCmdLineOpts()
{
CmdManager* cmd_mgr = CmdManager::instance();
@@ -250,14 +176,6 @@
1);
cmd_mgr->addCmd(cmd_phys, "/physics/select");
- // macro commands
- CmdLineOpt* cmd_cmds = new CmdLineOpt("M",
- "commands",
- "Print SLIC's macro command set.",
- 0,
- 0);
- cmd_mgr->addCmd(cmd_cmds, "/slic/commands" );
-
// logfile
CmdLineOpt* cmd_log = new CmdLineOpt("L",
"log-file",
slic/src
diff -u -r1.8 -r1.9
--- SlicMessenger.cc 7 Sep 2005 22:23:34 -0000 1.8
+++ SlicMessenger.cc 22 Sep 2005 17:21:30 -0000 1.9
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/SlicMessenger.cc,v 1.8 2005/09/07 22:23:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/SlicMessenger.cc,v 1.9 2005/09/22 17:21:30 jeremy Exp $
#include "SlicMessenger.hh"
#include "SlicApplication.hh"
@@ -25,9 +25,6 @@
else if ( cmd == m_slicUsage ) {
m_app->printOutUsage( std::cout );
}
- else if ( cmd == m_slicCommands ) {
- m_app->printOutMacroCommands( std::cout );
- }
else {
std::cerr << "Unknown command to SlicMessenger." << std::endl;
}
@@ -46,9 +43,5 @@
// print SLIC version
m_slicVersion = new G4UIcommand( "/slic/version", this );
m_slicVersion->SetGuidance( "Print SLIC version information." );
-
- // print SLIC commands
- m_slicCommands = new G4UIcommand( "/slic/commands", this );
- m_slicCommands->SetGuidance( "Print SLIC macro commands." );
}
};
CVSspam 0.2.8
