Import Geant4 10.2.0 source tree
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ProcessManager.cc 71231 2013-06-12 13:06:28Z gcosmo $
|
||||
// $Id: G4ProcessManager.cc 87924 2015-01-21 13:17:25Z gcosmo $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
@@ -799,8 +799,8 @@ void G4ProcessManager::SetProcessOrderingToSecond(
|
||||
}
|
||||
|
||||
// set ordering parameter to 1
|
||||
pAttr->ordProcVector[ivec-1] = 1;
|
||||
pAttr->ordProcVector[ivec] = 1;
|
||||
pAttr->ordProcVector[ivec-1] = 0;
|
||||
pAttr->ordProcVector[ivec] = 0;
|
||||
|
||||
// find insert position
|
||||
G4ProcessVector* pVector = theProcVector[ivec];
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ProcessManagerMessenger.cc 71231 2013-06-12 13:06:28Z gcosmo $
|
||||
// $Id: G4ProcessManagerMessenger.cc 92125 2015-08-18 14:35:23Z gcosmo $
|
||||
//
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
@@ -80,7 +80,7 @@ G4ProcessManagerMessenger::G4ProcessManagerMessenger(G4ParticleTable* pTable)
|
||||
dumpCmd->SetParameterName("index", true);
|
||||
dumpCmd->SetDefaultValue(-1);
|
||||
|
||||
//Commnad /particle/process/Verbose
|
||||
//Commnad /particle/process/verbose
|
||||
verboseCmd = new G4UIcommand("/particle/process/verbose",this);
|
||||
verboseCmd->SetGuidance("Set Verbose Level for Process or Process Manager");
|
||||
verboseCmd->SetGuidance(" Verbose [Verbose] [process index]");
|
||||
@@ -93,7 +93,7 @@ G4ProcessManagerMessenger::G4ProcessManagerMessenger(G4ParticleTable* pTable)
|
||||
verboseCmd->SetParameter(param);
|
||||
verboseCmd->AvailableForStates(G4State_PreInit,G4State_Init,G4State_Idle,G4State_GeomClosed,G4State_EventProc);
|
||||
|
||||
//Commnad /particle/process/Activate
|
||||
//Commnad /particle/process/activate
|
||||
activateCmd = new G4UIcmdWithAnInteger("/particle/process/activate",this);
|
||||
activateCmd->SetGuidance("Activate process ");
|
||||
activateCmd->SetGuidance(" Activate [process index]");
|
||||
@@ -202,20 +202,14 @@ void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newVa
|
||||
|
||||
G4String G4ProcessManagerMessenger::GetCurrentValue(G4UIcommand * command)
|
||||
{
|
||||
G4String returnValue('\0');
|
||||
if(SetCurrentParticle() == 0) {
|
||||
// no particle is selected. return null strings
|
||||
return returnValue;
|
||||
}
|
||||
if(SetCurrentParticle() == 0) return "";
|
||||
|
||||
std::ostringstream os;
|
||||
|
||||
if( command==verboseCmd ){
|
||||
//Commnad /particle/process/Verbose
|
||||
os << theManager->GetVerboseLevel();
|
||||
returnValue = os.str();
|
||||
}
|
||||
return returnValue;
|
||||
return verboseCmd->ConvertToString(theManager->GetVerboseLevel());
|
||||
} else {
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ProcessTable.cc 78775 2014-01-23 11:23:25Z gcosmo $
|
||||
// $Id: G4ProcessTable.cc 91916 2015-08-11 07:03:22Z gcosmo $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
@@ -122,16 +122,14 @@ void G4ProcessTable::DeleteMessenger()
|
||||
|
||||
|
||||
//////////////////////////
|
||||
G4ProcessTable & G4ProcessTable::operator=(const G4ProcessTable &right)
|
||||
G4ProcessTable & G4ProcessTable::operator=(const G4ProcessTable &)
|
||||
{
|
||||
verboseLevel = right.verboseLevel;
|
||||
#ifdef G4VERBOSE
|
||||
if (verboseLevel>0){
|
||||
G4cout << "-- G4ProcessTable assignment operator --" << G4endl;
|
||||
}
|
||||
#endif
|
||||
if (&right == this) return *this;
|
||||
else return *this;
|
||||
return *this;
|
||||
}
|
||||
|
||||
//////////////////////////
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4ProcessTableMessenger.cc 71231 2013-06-12 13:06:28Z gcosmo $
|
||||
// $Id: G4ProcessTableMessenger.cc 92125 2015-08-18 14:35:23Z gcosmo $
|
||||
//
|
||||
//
|
||||
//---------------------------------------------------------------
|
||||
@@ -92,7 +92,7 @@ G4ProcessTableMessenger::G4ProcessTableMessenger(G4ProcessTable* pTable)
|
||||
}
|
||||
listCmd->SetCandidates((const char*)(candidates));
|
||||
|
||||
//Commnad /particle/process/Verbose
|
||||
//Commnad /particle/process/verbose
|
||||
verboseCmd = new G4UIcmdWithAnInteger("/process/verbose",this);
|
||||
verboseCmd->SetGuidance("Set Verbose Level for Process Table");
|
||||
verboseCmd->SetGuidance(" verbose [level]");
|
||||
@@ -350,59 +350,21 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
|
||||
//////////////////
|
||||
G4String G4ProcessTableMessenger::GetCurrentValue(G4UIcommand * command)
|
||||
{
|
||||
G4ProcessTable::G4ProcNameVector* procNameVector
|
||||
= theProcessTable->GetNameList();
|
||||
|
||||
G4String candidates;
|
||||
G4String returnValue('\0');
|
||||
|
||||
std::ostringstream os;
|
||||
G4UIparameter * param;
|
||||
|
||||
G4int idx;
|
||||
|
||||
if( command==verboseCmd ){
|
||||
//Commnad /process/verbose
|
||||
os << theProcessTable->GetVerboseLevel();
|
||||
returnValue = os.str();
|
||||
return verboseCmd->ConvertToString(theProcessTable->GetVerboseLevel());
|
||||
|
||||
} else if ( command==listCmd ){
|
||||
//Commnad /process/list
|
||||
candidates = "all";
|
||||
for (idx = 0; idx < NumberOfProcessType ; idx ++ ) {
|
||||
candidates += " " +
|
||||
G4VProcess::GetProcessTypeName(G4ProcessType(idx));
|
||||
}
|
||||
listCmd->SetCandidates((const char*)(candidates));
|
||||
returnValue = currentProcessTypeName;
|
||||
return currentProcessTypeName;
|
||||
|
||||
} else {
|
||||
//Commnad /process/dump, activate, inactivate
|
||||
// process name
|
||||
param = command->GetParameter(0);
|
||||
candidates = "";
|
||||
G4ProcessTable::G4ProcNameVector::iterator itr;
|
||||
for (itr=procNameVector->begin(); itr!=procNameVector->end(); ++itr) {
|
||||
candidates += " " + (*itr);
|
||||
}
|
||||
param->SetParameterCandidates((const char*)(candidates));
|
||||
// particle name
|
||||
param = command->GetParameter(1);
|
||||
candidates = "all";
|
||||
G4ParticleTable::G4PTblDicIterator *piter
|
||||
= G4ParticleTable::GetParticleTable()->GetIterator();
|
||||
piter -> reset();
|
||||
while( (*piter)() ){
|
||||
G4ParticleDefinition *particle = piter->value();
|
||||
candidates += " " + particle->GetParticleName();
|
||||
}
|
||||
param->SetParameterCandidates((const char*)(candidates));
|
||||
|
||||
returnValue = currentProcessName + " " + currentParticleName;
|
||||
|
||||
return (currentProcessName + " " + currentParticleName);
|
||||
|
||||
}
|
||||
|
||||
return returnValue;
|
||||
return "";
|
||||
}
|
||||
|
||||
/////////////////
|
||||
|
||||
Reference in New Issue
Block a user