lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/management/src/G4IVContinuousDiscreteProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4IVContinuousDiscreteProcess.cc,v 1.4.8.1 1999/12/07 20:52:47 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// --------------------------------------------------------------
source/processes/management/src/G4IVRestDiscreteProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4IVRestDiscreteProcess.cc,v 1.4.8.1 1999/12/07 20:52:48 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
// $Id:
// --------------------------------------------------------------
source/processes/management/src/G4ProcTblElement.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ProcTblElement.cc,v 1.2.8.1 1999/12/07 20:52:48 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ------------------------------------------------------------
source/processes/management/src/G4ProcessAttribute.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4ProcessAttribute.cc,v 1.2.8.1 1999/12/07 20:52:48 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ------------------------------------------------------------
source/processes/management/src/G4ProcessManager.cc
+54 -58
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4ProcessManager.cc,v 1.10.4.1 1999/12/07 20:52:48 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4ProcessManager.cc,v 1.10.4.1.2.5 1999/12/14 09:16:49 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
@@ -26,15 +26,11 @@
#include "G4ProcessManagerMessenger.hh"
#include "G4ProcessManager.hh"
#include "G4StateManager.hh"
#include <iomanip.h>
#include "g4std/iomanip"
#include "G4ProcessTable.hh"
#include "G4ios.hh"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
@@ -51,12 +47,12 @@ G4ProcessManager::G4ProcessManager(const G4ParticleDefinition* aParticleType):
verboseLevel(1)
{
char errMsg[1024];
ostrstream errOs(errMsg,1024);
G4std::ostrstream errOs(errMsg,1024);
// create the process List
theProcessList = new G4ProcessVector();
if ( theProcessList == 0) {
errOs << "G4ProcessManager::G4ProcessManager():";
errOs << " can not create G4ProcessVector " << endl;
errOs << " can not create G4ProcessVector " << G4endl;
G4Exception(errMsg);
}
@@ -65,7 +61,7 @@ G4ProcessManager::G4ProcessManager(const G4ParticleDefinition* aParticleType):
theProcVector[i] = new G4ProcessVector();
if ( theProcVector[i] == 0) {
errOs << "G4ProcessManager::G4ProcessManager():";
errOs << " can not create G4ProcessVector " << endl;
errOs << " can not create G4ProcessVector " << G4endl;
G4Exception(errMsg);
}
}
@@ -89,7 +85,7 @@ G4ProcessManager::G4ProcessManager(G4ProcessManager &right)
verboseLevel = right.verboseLevel;
#ifdef G4VERBOSE
if (GetVerboseLevel() > 2) {
G4cout << "G4ProcessManagerMessenger:: copy constructor " <<endl;
G4cout << "G4ProcessManagerMessenger:: copy constructor " <<G4endl;
}
#endif
@@ -140,7 +136,7 @@ G4ProcessManager::G4ProcessManager():
numberOfProcesses(0)
{
if (GetVerboseLevel()>0) {
G4cout << "G4ProcessManager: default constructor is called !!" <<endl;
G4cout << "G4ProcessManager: default constructor is called !!" <<G4endl;
}
}
@@ -175,7 +171,7 @@ G4ProcessManager::~G4ProcessManager()
fProcessManagerMessenger = 0;
#ifdef G4VERBOSE
if (GetVerboseLevel() > 1) {
G4cout << "G4ProcessManagerMessenger is deleted" << endl;
G4cout << "G4ProcessManagerMessenger is deleted" << G4endl;
}
#endif
}
@@ -200,14 +196,14 @@ G4int G4ProcessManager::GetProcessVectorIndex(
G4cout << " G4ProcessManager::GetProcessVectorIndex:";
G4cout << "particle[" << theParticleType->GetParticleName() << "] " ;
G4cout << "process[" << aProcess->GetProcessName() << "]" ;
G4cout << endl;
G4cout << G4endl;
if (idxProc <0) {
G4cout << " is not registered yet ";
}
if (ivec <0) {
G4cout << " illegal DoIt Index [= " << idx << "," << typ << "]";
}
G4cout << endl;
G4cout << G4endl;
}
#endif
}
@@ -223,10 +219,10 @@ G4ProcessAttribute* G4ProcessManager::GetAttribute(G4int index) const
if (GetVerboseLevel()>0) {
G4cout << "G4ProcessManager::GetAttribute():";
G4cout << " particle[" << theParticleType->GetParticleName() << "]";
G4cout << endl;
G4cout << " index out of range " << endl;
G4cout << G4endl;
G4cout << " index out of range " << G4endl;
G4cout << " #processes[" << numberOfProcesses << "]";
G4cout << " index [" << index << "]" << endl;
G4cout << " index [" << index << "]" << G4endl;
}
#endif
return 0;
@@ -251,8 +247,8 @@ G4ProcessAttribute* G4ProcessManager::GetAttribute(G4int index) const
if (GetVerboseLevel()>0) {
G4cout << "G4ProcessManager::GetAttribute():";
G4cout << " particle[" << theParticleType->GetParticleName() << "]";
G4cout << endl;
G4cout << "Warning:: attribute vector index is inconsistent with process List index" << endl;
G4cout << G4endl;
G4cout << "Warning:: attribute vector index is inconsistent with process List index" << G4endl;
}
#endif
// re-ordering attribute vector
@@ -293,7 +289,7 @@ G4int G4ProcessManager::InsertAt(G4int ip, G4VProcess* process, G4int ivec)
} else {
#ifdef G4VERBOSE
if (GetVerboseLevel()>0) {
G4cout << " G4ProcessManager::InsertAt : No Process Attribute " << endl;
G4cout << " G4ProcessManager::InsertAt : No Process Attribute " << G4endl;
}
#endif
}
@@ -328,7 +324,7 @@ G4int G4ProcessManager::RemoveAt(G4int ip, G4VProcess* process, G4int ivec)
}else {
#ifdef G4VERBOSE
if (GetVerboseLevel()>0) {
G4cout << " G4ProcessManager::RemoveAt : No Process Attribute " << endl;
G4cout << " G4ProcessManager::RemoveAt : No Process Attribute " << G4endl;
}
#endif
}
@@ -370,8 +366,8 @@ G4int G4ProcessManager::AddProcess(
if ( !aProcess->IsApplicable(*theParticleType) ) {
#ifdef G4VERBOSE
if (GetVerboseLevel()>1) {
G4cout << aErrorMessage << endl;
G4cout << "This process is not applicable to this particle" << endl;
G4cout << aErrorMessage << G4endl;
G4cout << "This process is not applicable to this particle" << G4endl;
}
#endif
// G4Exception((const char*)aErrorMessage);
@@ -380,7 +376,7 @@ G4int G4ProcessManager::AddProcess(
#ifdef G4VERBOSE
if (GetVerboseLevel()>2) {
G4cout << aErrorMessage << endl;
G4cout << aErrorMessage << G4endl;
}
#endif
@@ -435,11 +431,11 @@ G4int G4ProcessManager::AddProcess(
#ifdef G4VERBOSE
if (verboseLevel>2) {
G4cout << aErrorMessage << endl;
G4cout << aErrorMessage << G4endl;
G4cout << aProcess->GetProcessName() << " is inserted at "<< ip;
G4cout << " in ProcessVetor[" << ivec<< "]";
G4cout << " with Ordering parameter = " ;
G4cout << pAttr->ordProcVector[ivec] << endl;
G4cout << pAttr->ordProcVector[ivec] << G4endl;
}
#endif
}
@@ -482,7 +478,7 @@ G4VProcess* G4ProcessManager::RemoveProcess(G4int index)
G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
G4cerr << "process["<<removedProcess->GetProcessName()<< "] " ;
G4cerr << "bad index in attribute ";
G4cerr << idx << "->" << pVector->index(removedProcess) << endl;
G4cerr << idx << "->" << pVector->index(removedProcess) << G4endl;
}
#endif
G4Exception((const char*)(aErrorMessage));
@@ -498,7 +494,7 @@ G4VProcess* G4ProcessManager::RemoveProcess(G4int index)
G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
G4cerr << "process["<<removedProcess->GetProcessName()<< "] " ;
G4cerr << "index(=" << idx << ") of process vector";
G4cerr << "[size:" << pVector->entries() << "] out of range" <<endl;
G4cerr << "[size:" << pVector->entries() << "] out of range" <<G4endl;
}
#endif
G4Exception((const char*)(aErrorMessage));
@@ -549,7 +545,7 @@ G4int G4ProcessManager::GetProcessOrdering(
if (verboseLevel>0) {
G4cout << "G4ProcessManager::SetProcessOrdering: ";
G4cout << " illegal DoIt Index [= " << idDoIt << "]";
G4cout << endl;
G4cout << G4endl;
}
#endif
return -1;
@@ -579,7 +575,7 @@ void G4ProcessManager::SetProcessOrdering(
if (GetVerboseLevel()>2) {
G4cout << aErrorMessage ;
G4cout << "particle[" + theParticleType->GetParticleName() +"] " ;
G4cout <<"process[" + aProcess->GetProcessName() + "]"<< endl;
G4cout <<"process[" + aProcess->GetProcessName() + "]"<< G4endl;
}
#endif
@@ -588,11 +584,11 @@ void G4ProcessManager::SetProcessOrdering(
if (ivec <0 ) {
#ifdef G4VERBOSE
if (verboseLevel>0) {
G4cout << aErrorMessage << endl;
G4cout << aErrorMessage << G4endl;
G4cout << "particle[" + theParticleType->GetParticleName() +"] " ;
G4cout << "process[" + aProcess->GetProcessName() + "]"<< endl;
G4cout << "process[" + aProcess->GetProcessName() + "]"<< G4endl;
G4cout << " illegal DoIt Index [= " << idDoIt << "]";
G4cout << endl;
G4cout << G4endl;
}
#endif
return;
@@ -626,13 +622,13 @@ void G4ProcessManager::SetProcessOrdering(
pAttr->idxProcVector[ivec] = ip;
#ifdef G4VERBOSE
if (verboseLevel>2) {
G4cout << aErrorMessage << endl;
G4cout << aErrorMessage << G4endl;
G4cout << "particle[" + theParticleType->GetParticleName() +"] " ;
G4cout <<"process[" + aProcess->GetProcessName() + "]"<< endl;
G4cout <<"process[" + aProcess->GetProcessName() + "]"<< G4endl;
G4cout << aProcess->GetProcessName() << " is inserted at "<< ip;
G4cout << " in ProcessVetor[" << ivec<< "]";
G4cout << " with Ordering parameter = " << ordDoIt ;
G4cout << endl;
G4cout << G4endl;
}
#endif
}
@@ -656,7 +652,7 @@ void G4ProcessManager::SetProcessOrderingToFirst(
if (verboseLevel>0) {
G4cout << "G4ProcessManager::SetProcessOrdering: ";
G4cout << " illegal DoIt Index [= " << idDoIt << "]";
G4cout << endl;
G4cout << G4endl;
}
#endif
return;
@@ -689,7 +685,7 @@ void G4ProcessManager::SetProcessOrderingToFirst(
G4cout << "G4ProcessManager::SetProcessOrdering: ";
G4cout << aProcess->GetProcessName() << " is inserted at top ";
G4cout << " in ProcessVetor[" << ivec<< "]";
G4cout << endl;
G4cout << G4endl;
}
#endif
}
@@ -722,7 +718,7 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
} else if (currentState == Init ) {
G4cout << "Init ";
}
G4cout << "state !" << endl;
G4cout << "state !" << G4endl;
}
#endif
return 0;
@@ -757,7 +753,7 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
G4cerr << "process["<<pProcess->GetProcessName()<<"] " ;
G4cerr << "bad index in attribute ";
G4cerr << idx << "->" << pVector->index(pProcess) << endl;
G4cerr << idx << "->" << pVector->index(pProcess) << G4endl;
}
#endif
G4Exception((const char*)aErrorMessage);
@@ -771,7 +767,7 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
G4cerr << "process["<<pProcess->GetProcessName()<<"] " ;
G4cerr << "index(=" << idx << ") of process vector";
G4cerr << "[size:" << pVector->entries() << "] out of range" << endl;
G4cerr << "[size:" << pVector->entries() << "] out of range" << G4endl;
}
#endif
G4Exception((const char*)aErrorMessage);
@@ -786,7 +782,7 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
G4cout << aErrorMessage;
G4cout << "particle["<<theParticleType->GetParticleName()<<"] " ;
G4cout << "process["<<pProcess->GetProcessName()<<"] " ;
G4cout << "The process is already inactive" << endl;
G4cout << "The process is already inactive" << G4endl;
}
#endif
}
@@ -807,7 +803,7 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
} else if (currentState == Init ) {
G4cout << "Init ";
}
G4cout << "state !" << endl;
G4cout << "state !" << G4endl;
}
#endif
return 0;
@@ -825,8 +821,8 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
if (pAttr->isActive) {
#ifdef G4VERBOSE
if (GetVerboseLevel()>0) {
G4cout << aErrorMessage << endl;
G4cout << "The process is already active" << endl;
G4cout << aErrorMessage << G4endl;
G4cout << "The process is already active" << G4endl;
}
#endif
} else {
@@ -847,7 +843,7 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
G4cerr << "process["<<pProcess->GetProcessName()<<"] " ;
G4cerr << "bad index in attribute " << idx << "->";
G4cerr << pVector->index(pProcess) << endl;
G4cerr << pVector->index(pProcess) << G4endl;
}
#endif
G4Exception((const char*)aErrorMessage);
@@ -861,7 +857,7 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
G4cerr << "particle["<<theParticleType->GetParticleName()<<"] " ;
G4cerr << "process["<<pProcess->GetProcessName()<<"] " ;
G4cerr << "index(=" << idx <<")of process vector";
G4cerr << "[size:" << pVector->entries() << "] out of range" << endl;
G4cerr << "[size:" << pVector->entries() << "] out of range" << G4endl;
}
#endif
G4Exception((const char*)aErrorMessage);
@@ -893,7 +889,7 @@ void G4ProcessManager::DumpInfo()
// particle type
G4String* aMessage = new G4String("G4ProcessManager:");
*aMessage += "particle[" + theParticleType->GetParticleName() + "]";
G4cout << *aMessage << endl;
G4cout << *aMessage << G4endl;
delete aMessage;
// loop over all processes
@@ -911,28 +907,28 @@ void G4ProcessManager::DumpInfo()
} else {
G4cout << " InActive ";
}
G4cout << endl;
G4cout << G4endl;
#ifdef G4VERBOSE
if (verboseLevel>0) {
// order parameter
G4cout << " Ordering:: ";
G4cout << " AtRest AlongStep PostStep ";
G4cout << endl;
G4cout << G4endl;
G4cout << " ";
G4cout << " GetPIL/ DoIt GetPIL/ DoIt GetPIL/ DoIt ";
G4cout << endl;
G4cout << " Ordering:: " << endl;
G4cout << G4endl;
G4cout << " Ordering:: " << G4endl;
G4cout << " index ";
for (G4int idx2 = 0; idx2 <6 ; idx2++) {
G4cout << setw(8) << pAttr->idxProcVector[idx2] <<":";
G4cout << G4std::setw(8) << pAttr->idxProcVector[idx2] <<":";
}
G4cout << endl;
G4cout << G4endl;
G4cout << " parameter ";
for (G4int idx3 = 0; idx3 <6 ; idx3++) {
G4cout << setw(8) << pAttr->ordProcVector[idx3] <<":";
G4cout << G4std::setw(8) << pAttr->ordProcVector[idx3] <<":";
}
G4cout << endl;
G4cout << G4endl;
}
#endif
}
source/processes/management/src/G4ProcessManagerMessenger.cc
+12 -16
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4ProcessManagerMessenger.cc,v 1.3.8.1 1999/12/07 20:52:49 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4ProcessManagerMessenger.cc,v 1.3.8.1.2.5 1999/12/14 09:16:50 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//---------------------------------------------------------------
@@ -36,13 +36,9 @@
#include "G4ProcessManagerMessenger.hh"
#include "G4ios.hh" // Include from 'system'
#include <iomanip.h> // Include from 'system'
#include "g4std/iomanip" // Include from 'system'
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
G4ProcessManagerMessenger::G4ProcessManagerMessenger(G4ParticleTable* pTable)
:theParticleTable(pTable),
@@ -117,7 +113,7 @@ G4ParticleDefinition* G4ProcessManagerMessenger::SetCurrentParticle()
if (currentParticle == 0) {
theManager = 0;
G4cout << "G4ProcessManagerMessenger::SetCurrentParticle() ";
G4cout << particleName << " not found " << endl;
G4cout << particleName << " not found " << G4endl;
} else {
theManager = currentParticle->GetProcessManager();
theProcessList = theManager->GetProcessList();
@@ -128,7 +124,7 @@ G4ParticleDefinition* G4ProcessManagerMessenger::SetCurrentParticle()
void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newValue)
{
if (SetCurrentParticle()==0) {
G4cout << "Particle is not selected yet !! Command ignored." << endl;
G4cout << "Particle is not selected yet !! Command ignored." << G4endl;
return;
}
if( command == dumpCmd ){
@@ -140,12 +136,12 @@ void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newVa
currentProcess = (*theProcessList)(index);
if (currentProcess == 0) {
G4cout << " no process at index of " << index;
G4cout << "in the Process Vector" << endl;
G4cout << "in the Process Vector" << G4endl;
} else {
currentProcess->DumpInfo();
}
} else {
G4cout << " illegal index !!! " << endl;
G4cout << " illegal index !!! " << G4endl;
currentProcess = 0;
}
@@ -160,7 +156,7 @@ void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newVa
//Commnad /particle/process/Verbose
// inputstream for newValues
const char* temp = (const char*)(newValue);
istrstream is((char*)temp);
G4std::istrstream is((char*)temp);
G4int Verbose, index;
is >>Verbose >>index;
if (index <0) {
@@ -170,12 +166,12 @@ void G4ProcessManagerMessenger::SetNewValue(G4UIcommand * command,G4String newVa
currentProcess = (*theProcessList)(index);
if (currentProcess == 0) {
G4cout << " no process at index of " << index;
G4cout << "in the Process Vector" << endl;
G4cout << "in the Process Vector" << G4endl;
} else {
currentProcess->SetVerboseLevel(Verbose);
}
} else {
G4cout << " illegal index !!! " << endl;
G4cout << " illegal index !!! " << G4endl;
currentProcess = 0;
}
}
@@ -191,7 +187,7 @@ G4String G4ProcessManagerMessenger::GetCurrentValue(G4UIcommand * command)
}
char line[255];
ostrstream os(line,255);
G4std::ostrstream os(line,255);
if( command==verboseCmd ){
//Commnad /particle/process/Verbose
source/processes/management/src/G4ProcessTable.cc
+32 -32
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4ProcessTable.cc,v 1.3.8.1 1999/12/07 20:52:49 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4ProcessTable.cc,v 1.3.8.1.2.1 1999/12/08 17:35:13 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// ------------------------------------------------------------
@@ -26,7 +26,7 @@ G4ProcessTable::G4ProcessTable():verboseLevel(1)
{
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << "-- G4ProcessTable constructor --" << endl;
G4cout << "-- G4ProcessTable constructor --" << G4endl;
}
#endif
fProcTblVector = new G4ProcTableVector();
@@ -40,7 +40,7 @@ G4ProcessTable::G4ProcessTable(const G4ProcessTable &right)
{
#ifdef G4VERBOSE
if (verboseLevel>0){
G4cout << "-- G4ProcessTable copy constructor --" << endl;
G4cout << "-- G4ProcessTable copy constructor --" << G4endl;
}
#endif
}
@@ -50,7 +50,7 @@ G4ProcessTable::~G4ProcessTable()
{
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << "-- G4ProcessTable destructor --" << endl;
G4cout << "-- G4ProcessTable destructor --" << G4endl;
}
#endif
@@ -96,7 +96,7 @@ G4ProcessTable & G4ProcessTable::operator=(const G4ProcessTable &right)
{
#ifdef G4VERBOSE
if (verboseLevel>0){
G4cout << "-- G4ProcessTable assignment operator --" << endl;
G4cout << "-- G4ProcessTable assignment operator --" << G4endl;
}
#endif
if (&right == this) return *this;
@@ -136,7 +136,7 @@ G4int G4ProcessTable::Insert(G4VProcess* aProcess,
if ( (aProcess == 0) || ( aProcMgr == 0 ) ){
#ifdef G4VERBOSE
if (verboseLevel>0){
G4cout << "G4ProcessTable::Insert : arguments are 0 pointer "<<endl;
G4cout << "G4ProcessTable::Insert : arguments are 0 pointer "<<G4endl;
}
#endif
return -1;
@@ -147,7 +147,7 @@ G4int G4ProcessTable::Insert(G4VProcess* aProcess,
G4cout << "G4ProcessTable::Insert ";
G4cout << " Process[" << aProcess->GetProcessName() << "]";
G4cout << " Particle[" << aProcMgr->GetParticleType()->GetParticleName() << "]";
G4cout << endl;
G4cout << G4endl;
}
#endif
@@ -163,7 +163,7 @@ G4int G4ProcessTable::Insert(G4VProcess* aProcess,
isFoundInTbl = true;
#ifdef G4VERBOSE
if (verboseLevel>2){
G4cout << " This Process has been already registered !! " << endl;
G4cout << " This Process has been already registered !! " << G4endl;
}
#endif
//
@@ -174,7 +174,7 @@ G4int G4ProcessTable::Insert(G4VProcess* aProcess,
isFound = true;
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " This Process Manager has been already registered !! " << endl;
G4cout << " This Process Manager has been already registered !! " << G4endl;
}
#endif
break;
@@ -185,7 +185,7 @@ G4int G4ProcessTable::Insert(G4VProcess* aProcess,
anElement->Insert(aProcMgr);
#ifdef G4VERBOSE
if (verboseLevel>2){
G4cout << " This Process Manager is registered !! " << endl;
G4cout << " This Process Manager is registered !! " << G4endl;
}
#endif
}
@@ -203,7 +203,7 @@ G4int G4ProcessTable::Insert(G4VProcess* aProcess,
}
#ifdef G4VERBOSE
if (verboseLevel>2){
G4cout << " This Process is registered !! " << endl;
G4cout << " This Process is registered !! " << G4endl;
}
#endif
}
@@ -217,7 +217,7 @@ G4int G4ProcessTable::Remove( G4VProcess* aProcess,
if ( (aProcess == 0) || ( aProcMgr == 0 ) ){
#ifdef G4VERBOSE
if (verboseLevel>0){
G4cout << "G4ProcessTable::Remove : arguments are 0 pointer "<< endl;
G4cout << "G4ProcessTable::Remove : arguments are 0 pointer "<< G4endl;
}
#endif
return -1;
@@ -227,7 +227,7 @@ G4int G4ProcessTable::Remove( G4VProcess* aProcess,
if (verboseLevel>1){
G4cout << "G4ProcessTable::Remove ";
G4cout << " Process[" << aProcess->GetProcessName() << "]";
G4cout << " Particle[" << aProcMgr->GetParticleType()->GetParticleName() << "]" << endl;
G4cout << " Particle[" << aProcMgr->GetParticleType()->GetParticleName() << "]" << G4endl;
}
#endif
@@ -255,7 +255,7 @@ G4int G4ProcessTable::Remove( G4VProcess* aProcess,
anElement->Remove(aProcMgr);
#ifdef G4VERBOSE
if (verboseLevel>2){
G4cout << " This Process Manager is removed !! " << endl;
G4cout << " This Process Manager is removed !! " << G4endl;
}
#endif
}
@@ -281,7 +281,7 @@ G4int G4ProcessTable::Remove( G4VProcess* aProcess,
}
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " This Process is removed !! " << endl;
G4cout << " This Process is removed !! " << G4endl;
}
#endif
}
@@ -289,7 +289,7 @@ G4int G4ProcessTable::Remove( G4VProcess* aProcess,
} else {
#ifdef G4VERBOSE
if (verboseLevel>0){
G4cout << " This Process is not registered !! " << endl;
G4cout << " This Process is not registered !! " << G4endl;
}
#endif
}
@@ -319,7 +319,7 @@ G4VProcess* G4ProcessTable::FindProcess(const G4String& processName,
if (!isFound && verboseLevel>1){
G4cout << " G4ProcessTable::FindProcess :" ;
G4cout << " The Process[" << processName << "] is not found ";
G4cout << " for " << processManager->GetParticleType()->GetParticleName() << endl;
G4cout << " for " << processManager->GetParticleType()->GetParticleName() << G4endl;
}
#endif
@@ -349,7 +349,7 @@ G4ProcessTable::G4ProcTableVector* G4ProcessTable::Find(
#ifdef G4VERBOSE
if (!isFound && verboseLevel>0){
G4cout << " G4ProcessTable::Find :" ;
G4cout << " The Process[" << processName << "] is not found " << endl;
G4cout << " The Process[" << processName << "] is not found " << G4endl;
}
#endif
@@ -378,7 +378,7 @@ G4ProcessTable::G4ProcTableVector* G4ProcessTable::Find(
#ifdef G4VERBOSE
if (!isFound && verboseLevel>0){
G4cout << " G4ProcessTable::Find :" ;
G4cout << " The Process[" << anElement->GetProcessName() << "] is not found " << endl;
G4cout << " The Process[" << anElement->GetProcessName() << "] is not found " << G4endl;
}
#endif
@@ -432,7 +432,7 @@ void G4ProcessTable::SetProcessActivation( const G4String& processName,
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " G4ProcessTable::SetProcessActivation:" ;
G4cout << " The Process[" << processName << "] "<< endl;
G4cout << " The Process[" << processName << "] "<< G4endl;
}
#endif
@@ -449,7 +449,7 @@ void G4ProcessTable::SetProcessActivation( const G4String& processName,
if (verboseLevel>1){
G4cout << " for " << manager->GetParticleType()->GetParticleName();
G4cout << " Index = " << manager->GetProcessIndex(process);
G4cout << endl;
G4cout << G4endl;
}
#endif
}
@@ -465,7 +465,7 @@ void G4ProcessTable::SetProcessActivation(
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " G4ProcessTable::SetProcessActivation:" ;
G4cout << " The Process[" << processName << "] "<< endl;
G4cout << " The Process[" << processName << "] "<< G4endl;
}
#endif
@@ -475,7 +475,7 @@ void G4ProcessTable::SetProcessActivation(
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " for " << processManager->GetParticleType()->GetParticleName();
G4cout << " Index = " << processManager->GetProcessIndex(process) << endl;
G4cout << " Index = " << processManager->GetProcessIndex(process) << G4endl;
}
#endif
}
@@ -489,7 +489,7 @@ void G4ProcessTable::SetProcessActivation( G4ProcessType processType,
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " G4ProcessTable::SetProcessActivation:" ;
G4cout << " The ProcessType[" << processType << "] "<< endl;
G4cout << " The ProcessType[" << processType << "] "<< G4endl;
}
#endif
@@ -501,7 +501,7 @@ void G4ProcessTable::SetProcessActivation( G4ProcessType processType,
G4VProcess* process = anElement->GetProcess();
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " The Process[" << process->GetProcessName()<< "] "<< endl;
G4cout << " The Process[" << process->GetProcessName()<< "] "<< G4endl;
}
#endif
for (G4int idx = 0 ; idx < anElement->Length(); idx++) {
@@ -510,7 +510,7 @@ void G4ProcessTable::SetProcessActivation( G4ProcessType processType,
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " for " << manager->GetParticleType()->GetParticleName();
G4cout << " Index = " << manager->GetProcessIndex(process) << endl;
G4cout << " Index = " << manager->GetProcessIndex(process) << G4endl;
}
#endif
}
@@ -526,7 +526,7 @@ void G4ProcessTable::SetProcessActivation(
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " G4ProcessTable::SetProcessActivation:" ;
G4cout << " The ProcessType[" << processType << "] "<< endl;
G4cout << " The ProcessType[" << processType << "] "<< G4endl;
}
#endif
@@ -537,9 +537,9 @@ void G4ProcessTable::SetProcessActivation(
processManager->SetProcessActivation(process, fActive);
#ifdef G4VERBOSE
if (verboseLevel>1){
G4cout << " The Process[" << process->GetProcessName()<< "] "<< endl;
G4cout << " The Process[" << process->GetProcessName()<< "] "<< G4endl;
G4cout << " for " << processManager->GetParticleType()->GetParticleName();
G4cout << " Index = " << idx << endl;
G4cout << " Index = " << idx << G4endl;
}
#endif
}
@@ -584,12 +584,12 @@ void G4ProcessTable::DumpInfo(G4VProcess* process,
for (idx=0; idx<anElement->Length(); idx++){
manager = anElement->GetProcessManager(idx);
G4cout << " for " << manager->GetParticleType()->GetParticleName();
G4cout << endl;
G4cout << G4endl;
if (verboseLevel >2) manager->DumpInfo();
}
} else {
G4cout << " for " << manager->GetParticleType()->GetParticleName();
G4cout << endl;
G4cout << G4endl;
if (verboseLevel >2) manager->DumpInfo();
}
}
source/processes/management/src/G4ProcessTableMessenger.cc
+11 -15
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4ProcessTableMessenger.cc,v 1.3.6.1.2.1 1999/12/07 20:52:49 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4ProcessTableMessenger.cc,v 1.3.6.1.2.1.2.5 1999/12/14 09:16:50 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
//---------------------------------------------------------------
@@ -36,15 +36,11 @@
#include "G4ParticleTable.hh"
#include "G4ios.hh"
#include <iomanip.h>
#include "g4std/iomanip"
#include "g4rw/ctoken.h"
#include "g4rw/rstream.h"
#ifdef WIN32
# include <Strstrea.h>
#else
# include <strstream.h>
#endif
#include "g4std/strstream"
/////////////////////////////////////////
G4int G4ProcessTableMessenger::NumberOfProcessType = 10;
@@ -159,7 +155,7 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
} else {
type = GetProcessType(newValue);
if (type <0) {
G4cout << " illegal type !!! " << endl;
G4cout << " illegal type !!! " << G4endl;
} else {
currentProcessTypeName = newValue;
}
@@ -170,13 +166,13 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
tmpVector = theProcessTable->FindProcesses(name);
if ( (type <0) || ( ((*tmpVector)(0)->GetProcessType()) == type) ) {
if ( counter%4 != 0) G4cout << ",";
G4cout << setw(19) << name;
G4cout << G4std::setw(19) << name;
if ((counter++)%4 == 3) {
G4cout << endl;
G4cout << G4endl;
}
}
}
G4cout << endl;
G4cout << G4endl;
delete tmpVector;
//Commnad /process/list
@@ -201,7 +197,7 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
isNameFound = true;
} else {
// no processes with specifed name
G4cout << " illegal process (or type) name " << endl;
G4cout << " illegal process (or type) name " << G4endl;
currentProcessName = "";
return;
}
@@ -224,7 +220,7 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
if ( !isParticleFound ) {
// no particle with specifed name
G4cout << " illegal particle name " << endl;
G4cout << " illegal particle name " << G4endl;
currentParticleName = "";
return;
}
@@ -280,7 +276,7 @@ G4String G4ProcessTableMessenger::GetCurrentValue(G4UIcommand * command)
G4String returnValue('\0');
char line[255];
ostrstream os(line,255);
G4std::ostrstream os(line,255);
G4UIparameter * param;
G4int idx;
source/processes/management/src/G4VContinuousDiscreteProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VContinuousDiscreteProcess.cc,v 1.1.10.1 1999/12/07 20:52:50 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
source/processes/management/src/G4VContinuousProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VContinuousProcess.cc,v 1.1.10.1 1999/12/07 20:52:50 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
source/processes/management/src/G4VDiscreteProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VDiscreteProcess.cc,v 1.1.10.1 1999/12/07 20:52:50 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
source/processes/management/src/G4VProcess.cc
+7 -7
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4VProcess.cc,v 1.3.8.1 1999/12/07 20:52:50 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// $Id: G4VProcess.cc,v 1.3.8.1.2.1 1999/12/08 17:35:13 gunter Exp $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
@@ -62,10 +62,10 @@ void G4VProcess::SubtractNumberOfInteractionLengthLeft(
#ifdef G4VERBOSE
if (verboseLevel>0) {
G4cerr << "G4VProcess::SubtractNumberOfInteractionLengthLeft()";
G4cerr << " [" << theProcessName << "]" <<endl;
G4cerr << " [" << theProcessName << "]" <<G4endl;
G4cerr << " currentInteractionLength = " << currentInteractionLength/cm << " [cm]";
G4cerr << " previousStepSize = " << previousStepSize/cm << " [cm]";
G4cerr << endl;
G4cerr << G4endl;
}
#endif
G4Exception("G4VProcess::SubtractNumberOfInteractionLengthLeft() negative currentInteractionLength" );
@@ -78,7 +78,7 @@ void G4VProcess::StartTracking()
theNumberOfInteractionLengthLeft = -1.0;
#ifdef G4VERBOSE
if (verboseLevel>2) {
G4cout << "G4VProcess::StartTracking() [" << theProcessName << "]" <<endl;
G4cout << "G4VProcess::StartTracking() [" << theProcessName << "]" <<G4endl;
}
#endif
}
@@ -87,7 +87,7 @@ void G4VProcess::EndTracking()
{
#ifdef G4VERBOSE
if (verboseLevel>2) {
G4cout << "G4VProcess::EndTracking() [" << theProcessName << "]" <<endl;
G4cout << "G4VProcess::EndTracking() [" << theProcessName << "]" <<G4endl;
}
#endif
theNumberOfInteractionLengthLeft = -1.0;
@@ -153,7 +153,7 @@ G4int G4VProcess::operator!=(const G4VProcess &right) const
void G4VProcess::DumpInfo() const
{
G4cout << "Process Name " << theProcessName ;
G4cout << " : Type[" << GetProcessTypeName(theProcessType) << "]"<< endl;
G4cout << " : Type[" << GetProcessTypeName(theProcessType) << "]"<< G4endl;
}
source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VRestContinuousDiscreteProcess.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
source/processes/management/src/G4VRestContinuousProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VRestContinuousProcess.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
source/processes/management/src/G4VRestDiscreteProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VRestDiscreteProcess.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------
source/processes/management/src/G4VRestProcess.cc
+1 -1
View File
@@ -6,7 +6,7 @@
// and all its terms.
//
// $Id: G4VRestProcess.cc,v 1.1.10.1 1999/12/07 20:52:51 gunter Exp $
// GEANT4 tag $Name: geant4-01-00 $
// GEANT4 tag $Name: geant4-01-01 $
//
//
// --------------------------------------------------------------