slic/src
diff -u -r1.3 -r1.4
--- LcioMcpMessenger.cc 20 Apr 2005 00:11:22 -0000 1.3
+++ LcioMcpMessenger.cc 27 Jun 2005 18:48:52 -0000 1.4
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMcpMessenger.cc,v 1.3 2005/04/20 00:11:22 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMcpMessenger.cc,v 1.4 2005/06/27 18:48:52 jeremy Exp $
#include "LcioMcpMessenger.hh"
#include "LcioManager.hh"
@@ -31,17 +31,17 @@
}
// set verbosity
else if ( cmd == m_verboseCmd ) {
-
+
// get unsigned int val
unsigned int v = (unsigned int) ( StringUtil::toInt( s ) );
-
- // set LcioMcpManager's verbosity
+
+ // set LcioMcpManager's verbosity
LcioMcpManager::instance()->setVerbose( v );
-
- // set TrajectoryManager's verbosity
+
+ // set TrajectoryManager's verbosity
TrajectoryManager::instance()->setVerbose( v );
- // set Lcio Mcp generator's verbosity
+ // set Lcio Mcp generator's verbosity
LcioManager::instance()->getGenerator()->setVerbose( v );
}
else {
@@ -60,7 +60,7 @@
m_mcpDir->SetGuidance( "Lcio Monte Carlo Particle commands." );
// minimumTrackingDistance
- m_minTrackingDistanceCmd = new G4UIcmdWithADoubleAndUnit( "/mcp/setMinimumTrackingDistance", this );
+ m_minTrackingDistanceCmd = new G4UIcmdWithADoubleAndUnit( "/mcp/minimumTrackingDistance", this );
m_minTrackingDistanceCmd->SetGuidance( "Set the minimum travel distance for an input particle to be tracked in Geant4." );
m_minTrackingDistanceCmd->SetParameterName("minimumTrackingDistance", false, true);
m_minTrackingDistanceCmd->SetDefaultUnit("mm");
slic/src
diff -u -r1.22 -r1.23
--- LcioMessenger.cc 18 May 2005 02:43:34 -0000 1.22
+++ LcioMessenger.cc 27 Jun 2005 18:48:52 -0000 1.23
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.22 2005/05/18 02:43:34 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/LcioMessenger.cc,v 1.23 2005/06/27 18:48:52 jeremy Exp $
#include "LcioMessenger.hh"
// SLIC
@@ -49,8 +49,8 @@
}
// set filename
else if ( cmd == m_filenameCmd ) {
- m_mgr->setFilename( s );
- }
+ m_mgr->setFilename( s );
+ }
// verbose
else if ( cmd == m_verboseCmd ) {
unsigned int v = StringUtil::toInt( s );
@@ -66,7 +66,7 @@
}
// setRunNumber
else if ( cmd == m_setRunNumberCmd ) {
- m_mgr->setRunNumber( StringUtil::toInt( s ) );
+ m_mgr->setRunNumber( StringUtil::toInt( s ) );
}
// autoname
else if ( cmd == m_autonameCmd ) {
@@ -85,7 +85,7 @@
bool flag_set = true;
// get arg val if exists
- if ( s != std::string("") ) {
+ if ( s != std::string("") ) {
flag_set = StringUtil::toBool( s );
}
@@ -94,9 +94,9 @@
if ( hcb ) {
// CHBIT_LONG for positions in hits
- if ( cmd == m_setLongFlagCmd ) {
+ if ( cmd == m_setLongFlagCmd ) {
hcb->setLongFlag( flag_set );
- }
+ }
// CHBIT_PDG for every PDG contribution in hits
else if ( cmd == m_setPDGFlagCmd ) {
hcb->setPDGFlag( flag_set );
@@ -126,7 +126,7 @@
m_pathCmd->SetGuidance( "Set Lcio output path." );
p = new G4UIparameter( "path", 's', false );
m_pathCmd->SetParameter( p );
-
+
// filename
m_filenameCmd = new G4UIcommand( "/lcio/filename", this );
m_filenameCmd->SetGuidance( "Set Lcio output filename." );
@@ -134,19 +134,19 @@
m_filenameCmd->SetParameter( p );
// CHBIT_LONG
- m_setLongFlagCmd = new G4UIcommand( "/lcio/setLongFlag", this );
+ m_setLongFlagCmd = new G4UIcommand( "/lcio/longFlag", this );
m_setLongFlagCmd->SetGuidance( "Set CHBIT_LONG flag for hit positions in output (default = on)." );
- p = new G4UIparameter( "Value", 'b', true );
+ p = new G4UIparameter( "Value", 'b', true );
m_setLongFlagCmd->SetParameter( p );
- m_setLongFlagCmd->AvailableForStates( G4State_PreInit );
+ m_setLongFlagCmd->AvailableForStates( G4State_PreInit );
// CHBIT_PDG
- m_setPDGFlagCmd = new G4UIcommand( "/lcio/setPDGFlag", this );
+ m_setPDGFlagCmd = new G4UIcommand( "/lcio/PDGFlag", this );
m_setPDGFlagCmd->SetGuidance( "Set CHBIT_PDG flag for super-long output with all Mcp contribs (default is aggregated)." );
p = new G4UIparameter( "Value", 'b', true );
m_setPDGFlagCmd->SetParameter( p );
m_setLongFlagCmd->AvailableForStates( G4State_PreInit );
-
+
// verbose
m_verboseCmd = new G4UIcommand( "/lcio/verbose", this );
m_verboseCmd->SetGuidance( "Set Lcio verbose level" );
@@ -154,7 +154,7 @@
m_verboseCmd->SetParameter( p );
// fileExistsAction
- m_fileExistsActionCmd = new G4UIcommand( "/lcio/setFileExistsAction", this );
+ m_fileExistsActionCmd = new G4UIcommand( "/lcio/fileExistsAction", this );
m_fileExistsActionCmd->SetGuidance( "Set action when an Lcio output file exists: fail, overwrite/delete or append." );
p = new G4UIparameter( "mode", 's', false );
m_fileExistsActionCmd->SetParameter( p );
@@ -166,7 +166,7 @@
m_storeMomentumCmd->SetDefaultValue( true );
// set the starting run number
- m_setRunNumberCmd = new G4UIcmdWithAnInteger( "/lcio/setRunNumber", this );
+ m_setRunNumberCmd = new G4UIcmdWithAnInteger( "/lcio/runNumber", this );
m_setRunNumberCmd->SetGuidance( "Set starting run number for LCIO event." );
m_setRunNumberCmd->SetParameterName( "RunNumber", false );
slic/src
diff -u -r1.29 -r1.30
--- SlicApplication.cc 26 May 2005 19:31:07 -0000 1.29
+++ SlicApplication.cc 27 Jun 2005 18:48:52 -0000 1.30
@@ -1,4 +1,4 @@
-// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.29 2005/05/26 19:31:07 jeremy Exp $
+// $Header: /cvs/lcd/slic/src/SlicApplication.cc,v 1.30 2005/06/27 18:48:52 jeremy Exp $
#include "SlicApplication.hh"
// SLIC
@@ -67,9 +67,9 @@
os << std::endl;
os << "LCDD Geometry System:" << std::endl;
- os << "/lcdd/setURI" << std::endl;
- os << "/lcdd/setGDMLSetupName" << std::endl;
- os << "/lcdd/setGDMLVersionTag" << 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;
@@ -83,11 +83,11 @@
os << "/lcio/path" << std::endl;
os << "/lcio/filename" << std::endl;
os << "/lcio/autoname" << std::endl;
- os << "/lcio/setRunNumber" << std::endl;
- os << "/lcio/setLongFlag" << std::endl;
- os << "/lcio/setPDGFlag" << std::endl;
+ os << "/lcio/runNumber" << std::endl;
+ os << "/lcio/longFlag" << std::endl;
+ os << "/lcio/PDGFlag" << std::endl;
os << "/lcio/verbose" << std::endl;
- os << "/lcio/setFileExistsAction" << std::endl;
+ os << "/lcio/fileExistsAction" << std::endl;
os << "/lcio/storeMomentum" << std::endl;
os << std::endl;
@@ -161,13 +161,29 @@
0);
cmd_mgr->addCmd(cmd_init, "/run/initialize");
- // set LCDD URI, Setup and Version
- CmdLineOpt* cmd_loadLCDD = new CmdLineOpt("g",
- "geometry-file",
- "Set geometry file full path.",
- 1,
- 3);
- cmd_mgr->addCmd(cmd_loadLCDD, "/lcdd/setup" );
+ // set LCDD URI
+ CmdLineOpt* cmd_lcddURL = new CmdLineOpt("g",
+ "lcdd-url",
+ "Set LCDD geometry file URL.",
+ 1,
+ 1);
+ cmd_mgr->addCmd(cmd_lcddURL, "/lcdd/url" );
+
+ // set LCDD setup name
+ CmdLineOpt* cmd_lcddSetup = new CmdLineOpt("S",
+ "lcdd-setup",
+ "Set LCDD geometry setup name.",
+ 1,
+ 1);
+ cmd_mgr->addCmd(cmd_lcddSetup, "/lcdd/setupName" );
+
+ /* set LCDD setup name */
+ CmdLineOpt* cmd_lcddVersion = new CmdLineOpt("V",
+ "lcdd-version",
+ "Set LCDD geometry version.",
+ 1,
+ 1);
+ cmd_mgr->addCmd(cmd_lcddVersion, "/lcdd/version" );
// set the generator input file
CmdLineOpt* cmd_stdhep = new CmdLineOpt("i",