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

Import Geant4 9.5.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 16:46:55 +02:00
parent 89a9605df1
commit b1eb5424d2
10957 changed files with 888481 additions and 160139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/management/src/G4IVContinuousDiscreteProcess.cc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4IVContinuousDiscreteProcess.cc,v 1.11 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4IVContinuousDiscreteProcess.cc,v 1.12 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id:
// --------------------------------------------------------------
@@ -44,8 +44,8 @@ G4IVContinuousDiscreteProcess::G4IVContinuousDiscreteProcess()
theNlambdaTable(0),theInverseNlambdaTable(0),
BIGSTEP(1.e10)
{
G4Exception("G4IVContinuousDiscreteProcess::G4IVContinuousDiscreteProcess","Illegal operation",
JustWarning,"default constructor is called");
G4Exception("G4IVContinuousDiscreteProcess::G4IVContinuousDiscreteProcess","ProcMan102",
JustWarning,"Default constructor is called");
}
G4IVContinuousDiscreteProcess::G4IVContinuousDiscreteProcess(const G4String& aName , G4ProcessType aType)
source/processes/management/src/G4IVRestDiscreteProcess.cc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4IVRestDiscreteProcess.cc,v 1.11 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4IVRestDiscreteProcess.cc,v 1.12 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
// $Id:
// --------------------------------------------------------------
@@ -43,8 +43,8 @@ G4IVRestDiscreteProcess::G4IVRestDiscreteProcess()
theNlambdaTable(0),theInverseNlambdaTable(0),
BIGSTEP(1.e10)
{
G4Exception("G4IVRestDiscreteProcess::G4IVRestDiscreteProcess", "Illegal operation",
JustWarning,"default constructor is called");
G4Exception("G4IVRestDiscreteProcess::G4IVRestDiscreteProcess", "ProcMan102",
JustWarning,"Default constructor is called");
}
G4IVRestDiscreteProcess::G4IVRestDiscreteProcess(const G4String& aName , G4ProcessType aType)
source/processes/management/src/G4ProcTblElement.cc
+3 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProcTblElement.cc,v 1.7 2006/06/29 21:08:06 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4ProcTblElement.cc,v 1.7 2006-06-29 21:08:06 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// ------------------------------------------------------------
@@ -54,6 +54,7 @@ G4ProcTblElement::G4ProcTblElement(G4VProcess* aProcess):
// copy constructor //////////////////////////
G4ProcTblElement::G4ProcTblElement(const G4ProcTblElement &right)
:pProcess(0),pProcMgrVector(0)
{
*this = right;
}
source/processes/management/src/G4ProcessAttribute.cc
+4 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProcessAttribute.cc,v 1.6 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4ProcessAttribute.cc,v 1.6 2010-10-30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// ------------------------------------------------------------
@@ -63,6 +63,7 @@ G4ProcessAttribute::G4ProcessAttribute(const G4ProcessAttribute &right)
idxProcVector[idx] = right.idxProcVector[idx];
ordProcVector[idx] = right.ordProcVector[idx];
}
isActive = right.isActive;
}
G4ProcessAttribute::~G4ProcessAttribute()
@@ -70,7 +71,7 @@ G4ProcessAttribute::G4ProcessAttribute(const G4ProcessAttribute &right)
// do nothing
}
G4ProcessAttribute & G4ProcessAttribute::operator=(G4ProcessAttribute &right)
G4ProcessAttribute & G4ProcessAttribute::operator=(const G4ProcessAttribute &right)
{
if (this != &right) {
pProcess = right.pProcess;
source/processes/management/src/G4ProcessManager.cc
+83 -37
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProcessManager.cc,v 1.37 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4ProcessManager.cc,v 1.38 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -44,6 +44,7 @@
#include "G4ProcessManagerMessenger.hh"
#include "G4ProcessManager.hh"
#include "G4ProcessAttribute.hh"
#include "G4StateManager.hh"
#include <iomanip>
#include "G4ProcessTable.hh"
@@ -60,13 +61,13 @@ G4int G4ProcessManager::counterOfObjects = 0;
G4ProcessManager::G4ProcessManager(const G4ParticleDefinition* aParticleType):
theParticleType(aParticleType),
numberOfProcesses(0),
duringTracking(false),
duringTracking(false),
verboseLevel(1)
{
// create the process List
theProcessList = new G4ProcessVector();
if ( theProcessList == 0) {
G4Exception( "G4ProcessManager::G4ProcessManager()","Fatal Error",
G4Exception( "G4ProcessManager::G4ProcessManager()","ProcMan012",
FatalException, "Can not create G4ProcessList ");
}
@@ -74,7 +75,7 @@ G4ProcessManager::G4ProcessManager(const G4ParticleDefinition* aParticleType):
for (G4int i=0; i<SizeOfProcVectorArray; ++i) {
theProcVector[i] = new G4ProcessVector();
if ( theProcVector[i] == 0) {
G4Exception( "G4ProcessManager::G4ProcessManager()","Fatal Error",
G4Exception( "G4ProcessManager::G4ProcessManager()","ProcMan012",
FatalException, "Can not create G4ProcessVector ");
}
}
@@ -87,30 +88,34 @@ G4ProcessManager::G4ProcessManager(const G4ParticleDefinition* aParticleType):
fProcessManagerMessenger = new G4ProcessManagerMessenger();
}
for (G4int i=0; i<NDoit; ++i) {
isSetOrderingFirstInvoked[i]=false;
isSetOrderingLastInvoked[i]=false;
}
// Increment counter of G4ProcessManager objects
counterOfObjects+=1;
}
// ///////////////////////////////////////
G4ProcessManager::G4ProcessManager(G4ProcessManager &right)
:duringTracking(false)
: theParticleType(right.theParticleType),
numberOfProcesses(0),
duringTracking(false),
verboseLevel(right.verboseLevel)
{
verboseLevel = right.verboseLevel;
#ifdef G4VERBOSE
if (GetVerboseLevel() > 2) {
G4cout << "G4ProcessManageer:: copy constructor " <<G4endl;
}
#endif
theParticleType = right.theParticleType;
numberOfProcesses = 0;
// create the process List and ProcessAttr Vector
theProcessList = new G4ProcessVector();
theAttrVector = new G4ProcessAttrVector();
if ( ( theProcessList == 0) || (theAttrVector == 0) ){
G4Exception( "G4ProcessManager::G4ProcessManager() [coopy constructor]",
"Fatal Error",FatalException, "Can not create G4ProcessList ");
"ProcMan011",FatalException, "Can not create G4ProcessList ");
}
for (G4int idx=0; idx < right.numberOfProcesses; idx++) {
@@ -131,7 +136,7 @@ G4ProcessManager::G4ProcessManager(G4ProcessManager &right)
theProcVector[i] = new G4ProcessVector();
if ( theProcVector[i] == 0) {
G4Exception( "G4ProcessManager::G4ProcessManager() [coopy constructor]",
"Fatal Error",FatalException, "Can not create G4ProcessVector ");
"ProcMan011",FatalException, "Can not create G4ProcessVector ");
}
G4ProcessTable* theProcessTable = G4ProcessTable::GetProcessTable();
@@ -139,11 +144,18 @@ G4ProcessManager::G4ProcessManager(G4ProcessManager &right)
for (G4int j=0; j< src->entries() ; j++){
// copy j-th process in i-th ProcessVector
theProcVector[i]->insert((*src)[j]);
//add aProcess and this ProcessManager into ProcesssTable
theProcessTable->Insert((*src)[j], this);
//add aProcess and this ProcessManager into ProcesssTable
if ( (*src)[j] !=0 ) {
theProcessTable->Insert((*src)[j], this);
}
}
}
for (G4int i=0; i<NDoit; ++i) {
isSetOrderingFirstInvoked[i]= right.isSetOrderingFirstInvoked[i];
isSetOrderingLastInvoked[i] = right.isSetOrderingLastInvoked[i];
}
// Increment counter of G4ProcessManager objects
counterOfObjects+=1;
}
@@ -151,24 +163,36 @@ G4ProcessManager::G4ProcessManager(G4ProcessManager &right)
// ///////////////////////////////////////
G4ProcessManager::G4ProcessManager():
theParticleType(0),
numberOfProcesses(0)
numberOfProcesses(0),
duringTracking(false),
verboseLevel(1)
{
// clear the process List and ProcessAttr Vector
theProcessList = 0;
theAttrVector = 0;
G4Exception("G4ProcessManager::G4ProcessManager()","Illegal operation",
JustWarning,"Default constructor is called !!");
G4Exception("G4ProcessManager::G4ProcessManager()","ProcMan111",
JustWarning,"Default constructor is called");
//create process vector
for (G4int i=0; i<SizeOfProcVectorArray; ++i) {
theProcVector[i] = new G4ProcessVector();
}
for (G4int i=0; i<NDoit; ++i) {
isSetOrderingFirstInvoked[i]=false;
isSetOrderingLastInvoked[i]=false;
}
}
// ///////////////////////////////////////
G4ProcessManager & G4ProcessManager::operator=(G4ProcessManager &)
G4ProcessManager & G4ProcessManager::operator=(const G4ProcessManager &)
{
// clear the process List and ProcessAttr Vector
theProcessList = 0;
theAttrVector = 0;
G4Exception("G4ProcessManager::operator=","Illegal operation",
G4Exception("G4ProcessManager::operator=","ProcMan112",
JustWarning,"Assignemnet operator is called");
return *this;
@@ -208,6 +232,7 @@ G4ProcessManager::~G4ProcessManager()
}
}
}
////////////////////////////////////////////////////////////////
G4int G4ProcessManager::GetProcessVectorIndex(
G4VProcess* aProcess,
@@ -263,9 +288,9 @@ G4ProcessAttribute* G4ProcessManager::GetAttribute(G4int index) const
// check process pointer is not 0
G4VProcess* aProcess = (*theProcessList)[index];
if (aProcess == 0) {
G4String aErrorMessage("Null Pointer for");
G4String aErrorMessage("Bad ProcessList: Null Pointer for");
aErrorMessage += theParticleType->GetParticleName() ;
G4Exception("G4ProcessManager::GetAttribute()","Bad ProcessList",
G4Exception("G4ProcessManager::GetAttribute()","ProcMan012",
FatalException,aErrorMessage);
return 0;
}
@@ -419,10 +444,10 @@ G4int G4ProcessManager::AddProcess(
// check size of the ProcessVector[0]
if (numberOfProcesses != idx){
theProcessList->removeLast();
G4String anErrorMessage("Inconsistent process List size for ");
G4String anErrorMessage("Bad ProcessList: Inconsistent process List size for ");
anErrorMessage += "process[" + aProcess->GetProcessName() + "]";
anErrorMessage += " particle[" + theParticleType->GetParticleName() + "]";
G4Exception( "G4ProcessManager::AddProcess()","Fatal Error",
G4Exception( "G4ProcessManager::AddProcess()","ProcMan012",
FatalException,anErrorMessage);
return -1;
}
@@ -518,10 +543,10 @@ G4VProcess* G4ProcessManager::RemoveProcess(G4int index)
// corresponding DoIt is not active
} else {
// idx is out of range
G4String anErrorMessage("Index is out of range ");
G4String anErrorMessage("Bad ProcessList : Index is out of range ");
anErrorMessage += "for particle[" + theParticleType->GetParticleName() + "] ";
anErrorMessage += "process[" + removedProcess->GetProcessName() + "] " ;
G4Exception( "G4ProcessManager::RemoveProcess()","Fatal Error",
G4Exception( "G4ProcessManager::RemoveProcess()","ProcMan012",
FatalException,anErrorMessage);
return 0;
}
@@ -703,13 +728,24 @@ void G4ProcessManager::SetProcessOrderingToFirst(
#ifdef G4VERBOSE
if (verboseLevel>2) {
G4cout << "G4ProcessManager::SetProcessOrdering: ";
G4cout << "G4ProcessManager::SetProcessOrderingToFirst: ";
G4cout << aProcess->GetProcessName() << " is inserted at top ";
G4cout << " in ProcessVetor[" << ivec<< "]";
G4cout << G4endl;
}
#endif
}
if (isSetOrderingFirstInvoked[idDoIt]){
G4String anErrMsg = "Set Ordering First is invoked twice for ";
anErrMsg += aProcess->GetProcessName();
anErrMsg += " to ";
anErrMsg += theParticleType->GetParticleName();
G4Exception( "G4ProcessManager::SetProcessOrderingToFirst()",
"ProcMan113",
JustWarning,anErrMsg);
}
isSetOrderingFirstInvoked[idDoIt] = true;
// check consistencies between ordering parameters and process
CheckOrderingParameters(aProcess);
@@ -802,8 +838,8 @@ void G4ProcessManager::SetProcessOrderingToSecond(
G4cout << G4endl;
}
#endif
// check consistencies between ordering parameters and process
// check consistencies between ordering parameters and process
CheckOrderingParameters(aProcess);
// create GPIL vectors
@@ -817,6 +853,16 @@ void G4ProcessManager::SetProcessOrderingToLast(
)
{
SetProcessOrdering(aProcess, idDoIt, ordLast );
if (isSetOrderingLastInvoked[idDoIt]){
G4String anErrMsg = "Set Ordering Last is invoked twice for ";
anErrMsg += aProcess->GetProcessName();
anErrMsg += " to ";
anErrMsg += theParticleType->GetParticleName();
G4Exception( "G4ProcessManager::SetProcessOrderingToLast()","ProcMan114",
JustWarning,anErrMsg);
}
isSetOrderingLastInvoked[idDoIt] = true;
}
// ///////////////////////////////////////
@@ -862,19 +908,19 @@ G4VProcess* G4ProcessManager::InActivateProcess(G4int index)
if ((*pVector)[idx]== pProcess) {
(*pVector)[idx]= 0;
} else {
G4String anErrorMessage("Bad index in attribute");
G4String anErrorMessage("Bad ProcessList: Bad index in attribute");
anErrorMessage += "for particle[" + theParticleType->GetParticleName() + "] ";
anErrorMessage += "process[" + pProcess->GetProcessName() + "] " ;
G4Exception( "G4ProcessManager::InactivateProcess():","Fatal Error",
G4Exception( "G4ProcessManager::InactivateProcess():","ProcMan012",
FatalException,anErrorMessage);
return 0;
}
} else {
// idx is out of range
G4String anErrorMessage("Index is out of range");
G4String anErrorMessage("Bad ProcessList: Index is out of range");
anErrorMessage += "for particle[" + theParticleType->GetParticleName() + "] ";
anErrorMessage += "process[" + pProcess->GetProcessName() + "] " ;
G4Exception( "G4ProcessManager::InactivateProcess():","Fatal Error",
G4Exception( "G4ProcessManager::InactivateProcess():","ProcMan012",
FatalException,anErrorMessage);
return 0;
}
@@ -923,19 +969,19 @@ G4VProcess* G4ProcessManager::ActivateProcess(G4int index)
if ((*pVector)[idx]== 0) {
(*pVector)[idx] = pProcess;
} else {
G4String anErrorMessage("Bad index in attribute");
G4String anErrorMessage("Bad ProcessList: Bad index in attribute");
anErrorMessage += "for particle[" + theParticleType->GetParticleName() + "] ";
anErrorMessage += "process[" + pProcess->GetProcessName() + "] " ;
G4Exception( "G4ProcessManager::ActivateProcess():","Fatal Error",
G4Exception( "G4ProcessManager::ActivateProcess():","ProcMan012",
FatalException,anErrorMessage);
return 0;
}
} else {
// idx is out of range
G4String anErrorMessage("Index is out of range");
G4String anErrorMessage("bad ProcessList: Index is out of range");
anErrorMessage += "for particle[" + theParticleType->GetParticleName() + "] ";
anErrorMessage += "process[" + pProcess->GetProcessName() + "] " ;
G4Exception("G4ProcessManager::ActivateProcess():","Fatal Error",
G4Exception("G4ProcessManager::ActivateProcess():","ProcMan012",
FatalException,anErrorMessage);
return 0;
@@ -1164,7 +1210,7 @@ void G4ProcessManager::CheckOrderingParameters(G4VProcess* aProcess) const
msg = "Invalid ordering parameters are set for ";
msg += aProcess->GetProcessName();
G4Exception( "G4ProcessManager::CheckOrderingParameters ",
"Invalid Ordering",FatalException, msg);
"ProcMan013",FatalException, msg);
}
return;
source/processes/management/src/G4ProcessManagerMessenger.cc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProcessManagerMessenger.cc,v 1.10 2006/06/29 21:08:12 gunter Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4ProcessManagerMessenger.cc,v 1.10 2006-06-29 21:08:12 gunter Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
//---------------------------------------------------------------
source/processes/management/src/G4ProcessTable.cc
+9 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProcessTable.cc,v 1.15 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4ProcessTable.cc,v 1.15 2010-10-30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// ------------------------------------------------------------
@@ -57,7 +57,12 @@ G4ProcessTable::G4ProcessTable():verboseLevel(1)
// copy constructor //////////////////////////
G4ProcessTable::G4ProcessTable(const G4ProcessTable &)
:verboseLevel(1)
{
fProcTblVector = 0;
fProcNameVector = 0;
tmpTblVector = 0;
fProcTblMessenger = 0;
#ifdef G4VERBOSE
if (verboseLevel>0){
G4cout << "-- G4ProcessTable copy constructor --" << G4endl;
@@ -163,7 +168,8 @@ G4int G4ProcessTable::Insert(G4VProcess* aProcess,
if ( (aProcess == 0) || ( aProcMgr == 0 ) ){
#ifdef G4VERBOSE
if (verboseLevel>0){
G4cout << "G4ProcessTable::Insert : arguments are 0 pointer "<<G4endl;
G4cout << "G4ProcessTable::Insert : arguments are 0 pointer "
<<aProcess <<","<< aProcMgr << G4endl;
}
#endif
return -1;
source/processes/management/src/G4ProcessTableMessenger.cc
+10 -14
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProcessTableMessenger.cc,v 1.18 2008/03/14 02:55:04 kurasige Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4ProcessTableMessenger.cc,v 1.19 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
//---------------------------------------------------------------
@@ -178,7 +178,6 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
= theProcessTable->GetNameList();
G4int idx;
G4ProcessVector* tmpVector=0;
G4int type = -1;
if( command == listCmd ){
@@ -199,7 +198,7 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
G4ProcessTable::G4ProcNameVector::iterator itr;
for (itr=procNameVector->begin(); itr!=procNameVector->end(); ++itr) {
idx +=1;
tmpVector = theProcessTable->FindProcesses(*itr);
G4ProcessVector* tmpVector = theProcessTable->FindProcesses(*itr);
if ( (type <0) || ( ((*tmpVector)(0)->GetProcessType()) == type) ) {
if ( counter%4 != 0) G4cout << ",";
G4cout << std::setw(19) <<*itr;
@@ -207,9 +206,9 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
G4cout << G4endl;
}
}
delete tmpVector;
}
G4cout << G4endl;
delete tmpVector;
//Commnad /process/list
} else if( command==procVerboseCmd ) {
@@ -245,15 +244,15 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
G4ProcessTable::G4ProcNameVector::iterator itr;
for (itr=procNameVector->begin(); itr!=procNameVector->end(); ++itr) {
idx +=1;
tmpVector = theProcessTable->FindProcesses(*itr);
G4ProcessVector* tmpVector = theProcessTable->FindProcesses(*itr);
G4VProcess* p = (*tmpVector)(0);
if ( isAll ||
(!isProcName && ( p->GetProcessType() == type) ) ||
( isProcName && ( p->GetProcessName()== currentProcessName) ) ){
p->SetVerboseLevel(level);
}
delete tmpVector;
}
delete tmpVector;
//Commnad /process/setVerbose
} else if( command==verboseCmd ) {
@@ -266,21 +265,17 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
// check 1st argument
currentProcessName = G4String(next());
G4bool isNameFound = false;
G4bool isProcName = false;
G4ProcessTable::G4ProcNameVector::iterator itr;
for (itr=procNameVector->begin(); itr!=procNameVector->end(); ++itr) {
if ( (*itr) == currentProcessName ) {
isNameFound = true;
isProcName = true;
break;
}
}
if (!isProcName) {
type = GetProcessType(currentProcessName);
if (type >=0) {
isNameFound = true;
} else {
if (type <0 ) {
// no processes with specifed name
G4cout << " illegal process (or type) name " << G4endl;
currentProcessName = "";
@@ -312,6 +307,7 @@ void G4ProcessTableMessenger::SetNewValue(G4UIcommand * command,G4String newValu
if( command==dumpCmd ) {
// process/dump
G4ProcessVector* tmpVector;
if (isProcName) {
tmpVector = theProcessTable->FindProcesses(currentProcessName);
} else {
@@ -443,8 +439,8 @@ void G4ProcessTableMessenger::SetNumberOfProcessType()
if ( isFoundEndMark ) {
NumberOfProcessType = idx;
} else {
G4Exception("G4ProcessTableMessenger::SetNumberOfProcessType()","No End Mark",
FatalException,"");
G4Exception("G4ProcessTableMessenger::SetNumberOfProcessType()","ProcMan014",
FatalException,"No End Mark");
}
}
source/processes/management/src/G4ProcessVector.cc
+23 -15
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ProcessVector.cc,v 1.5 2008/06/23 08:58:26 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4ProcessVector.cc,v 1.5 2008-06-23 08:58:26 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// ------------------------------------------------------------
@@ -39,14 +39,27 @@
/////// Constructors
//
G4ProcessVector::G4ProcessVector(size_t)
G4ProcessVector::G4ProcessVector()
{
pProcVector = new G4ProcVector();
}
G4ProcessVector::G4ProcessVector(const G4ProcessVector& right)
G4ProcessVector::G4ProcessVector(size_t s)
{
*this == right;
pProcVector = new G4ProcVector(s);
}
G4ProcessVector::G4ProcessVector(const G4ProcessVector& right)
:pProcVector(0)
{
pProcVector = new G4ProcVector();
// copy all contents in pProcVector
//
G4ProcVector::iterator i;
for (i = right.pProcVector->begin(); i!= right.pProcVector->end(); ++i){
pProcVector->push_back(*i);
}
}
/////// destructor
@@ -55,8 +68,7 @@ G4ProcessVector::~G4ProcessVector()
{
// delete pProcVector
//
if (pProcVector != 0 )
{
if (pProcVector != 0 ){
pProcVector->clear();
delete pProcVector;
}
@@ -64,14 +76,11 @@ G4ProcessVector::~G4ProcessVector()
////// assignment oeprator
//
G4ProcessVector & G4ProcessVector::operator=(G4ProcessVector &right)
G4ProcessVector & G4ProcessVector::operator=(const G4ProcessVector & right)
{
if (this != &right)
{
if (this != &right){
// delete pProcVector
//
if (pProcVector != 0 )
{
if (pProcVector != 0 ){
pProcVector->clear();
delete pProcVector;
}
@@ -81,8 +90,7 @@ G4ProcessVector & G4ProcessVector::operator=(G4ProcessVector &right)
// copy all contents in pProcVector
//
G4ProcVector::iterator i;
for (i = pProcVector->begin(); i!= pProcVector->end(); ++i)
{
for (i = right.pProcVector->begin(); i!= right.pProcVector->end(); ++i){
pProcVector->push_back(*i);
}
}
source/processes/management/src/G4VContinuousDiscreteProcess.cc
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VContinuousDiscreteProcess.cc,v 1.7 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4VContinuousDiscreteProcess.cc,v 1.8 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -42,7 +42,7 @@ G4VContinuousDiscreteProcess::G4VContinuousDiscreteProcess()
:G4VProcess("No Name Discrete Process"),
valueGPILSelection(CandidateForSelection)
{
G4Exception("G4VContinuousDiscreteProcess::G4VContinuousDiscreteProcess()","Illegal operation",
G4Exception("G4VContinuousDiscreteProcess::G4VContinuousDiscreteProcess()","ProcMan102",
JustWarning,"Default constructor is called");
}
source/processes/management/src/G4VContinuousProcess.cc
+4 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VContinuousProcess.cc,v 1.6 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4VContinuousProcess.cc,v 1.7 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -42,7 +42,8 @@ G4VContinuousProcess::G4VContinuousProcess()
:G4VProcess("No Name Continuous Process"),
valueGPILSelection(CandidateForSelection)
{
G4Exception("G4VContinuousProcess:: default constructor is called");
G4Exception("G4VContinuousProcess::G4VContinuousProcess()","ProcMan102",
JustWarning,"Default constructor is called");
}
G4VContinuousProcess::G4VContinuousProcess(const G4String& aName , G4ProcessType aType)
source/processes/management/src/G4VDiscreteProcess.cc
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4VDiscreteProcess.cc,v 1.7 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -41,7 +41,7 @@
G4VDiscreteProcess::G4VDiscreteProcess()
:G4VProcess("No Name Discrete Process")
{
G4Exception("G4VDiscreteProcess::G4VDiscreteProcess()","Illegal operation",
G4Exception("G4VDiscreteProcess::G4VDiscreteProcess()","ProcMan102",
JustWarning,"Default constructor is called");
}
source/processes/management/src/G4VProcess.cc
+8 -5
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VProcess.cc,v 1.17 2010/10/07 14:17:35 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4VProcess.cc,v 1.18 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -103,8 +103,11 @@ void G4VProcess::SubtractNumberOfInteractionLengthLeft(
G4cerr << G4endl;
}
#endif
G4String msg = "Negative currentInteractionLength for ";
msg += theProcessName;
G4Exception("G4VProcess::SubtractNumberOfInteractionLengthLeft()",
"Negative currentInteractionLength",EventMustBeAborted,theProcessName);
"ProcMan201",EventMustBeAborted,
msg);
}
}
@@ -172,8 +175,8 @@ const G4String& G4VProcess::GetProcessTypeName(G4ProcessType aType )
G4VProcess & G4VProcess::operator=(const G4VProcess &)
{
G4Exception("G4VProcess::operator=","Illegal operation",
JustWarning,"Assignment operator is called");
G4Exception("G4VProcess::operator=","ProcMan101",
JustWarning,"Assignment operator is called but NO effect");
return *this;
}
source/processes/management/src/G4VRestContinuousDiscreteProcess.cc
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VRestContinuousDiscreteProcess.cc,v 1.7 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4VRestContinuousDiscreteProcess.cc,v 1.8 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -43,7 +43,7 @@ G4VRestContinuousDiscreteProcess::G4VRestContinuousDiscreteProcess()
valueGPILSelection(CandidateForSelection)
{
G4Exception("G4VRestContinuousDiscreteProcess::G4VRestContinuousDiscreteProcess()",
"Illegal operation",JustWarning,"default constructor is called");
"ProcMan102",JustWarning,"Default constructor is called");
}
G4VRestContinuousDiscreteProcess::G4VRestContinuousDiscreteProcess(const G4String& aName , G4ProcessType aType)
source/processes/management/src/G4VRestContinuousProcess.cc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VRestContinuousProcess.cc,v 1.7 2010/10/30 07:51:23 kurasige Exp $
// GEANT4 tag $Name: geant4-09-04 $
// $Id: G4VRestContinuousProcess.cc,v 1.8 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -42,8 +42,8 @@ G4VRestContinuousProcess::G4VRestContinuousProcess()
:G4VProcess("No Name Discrete Process") ,
valueGPILSelection(CandidateForSelection)
{
G4Exception("G4VRestContinuousProcess::G4VRestContinuousProcess()","Illegal operation",
JustWarning,"default constructor is called");
G4Exception("G4VRestContinuousProcess::G4VRestContinuousProcess()","ProcMan102",
JustWarning,"Default constructor is called");
}
G4VRestContinuousProcess::G4VRestContinuousProcess(const G4String& aName , G4ProcessType aType)
source/processes/management/src/G4VRestDiscreteProcess.cc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VRestDiscreteProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4VRestDiscreteProcess.cc,v 1.7 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -41,8 +41,8 @@
G4VRestDiscreteProcess::G4VRestDiscreteProcess()
:G4VProcess("No Name Discrete Process")
{
G4Exception("G4VRestDiscreteProcess::G4VRestDiscreteProcess","Illegal operation",
JustWarning,"default constructor is called");
G4Exception("G4VRestDiscreteProcess::G4VRestDiscreteProcess","ProcMan102",
JustWarning,"Default constructor is called");
}
G4VRestDiscreteProcess::G4VRestDiscreteProcess(const G4String& aName , G4ProcessType aType)
source/processes/management/src/G4VRestProcess.cc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4VRestProcess.cc,v 1.6 2007/10/02 08:23:20 kurasige Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4VRestProcess.cc,v 1.7 2010-12-22 09:14:54 kurasige Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// --------------------------------------------------------------
@@ -41,8 +41,8 @@
G4VRestProcess::G4VRestProcess()
:G4VProcess("No Name Rest Process")
{
G4Exception("G4VRestProcess::G4VRestProcess()","Illegal operation",
JustWarning,"default constructor is called");
G4Exception("G4VRestProcess::G4VRestProcess()","ProcMan102",
JustWarning,"Default constructor is called");
}
G4VRestProcess::G4VRestProcess(const G4String& aName , G4ProcessType aType)
source/processes/management/src/G4WrapperProcess.cc
+2 -2
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4WrapperProcess.cc,v 1.1 2007/12/12 10:09:49 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-02 $
// $Id: G4WrapperProcess.cc,v 1.1 2007-12-12 10:09:49 gcosmo Exp $
// GEANT4 tag $Name: not supported by cvs2svn $
//
//
// ------------------------------------------------------------