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

Import Geant4 6.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 10:49:58 +02:00
parent 96686e0c8f
commit 1d812b78b1
4545 changed files with 24433 additions and 175005 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/materials/GNUmakefile
+3 -1
View File
@@ -1,10 +1,12 @@
# $Id: GNUmakefile,v 1.1 1999/01/07 16:09:39 gunter Exp $
# $Id: GNUmakefile,v 1.2 2004/01/30 09:57:20 gbarrand Exp $
# --------------------------------------------------------------
# GNUmakefile for materials library. Gabriele Cosmo, 18/9/96.
# --------------------------------------------------------------
name := G4materials
GLOBLIBS = libG4global.lib
ifndef G4INSTALL
G4INSTALL = ../..
endif
source/materials/History
+7 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.45 2003/12/01 15:14:05 gcosmo Exp $
$Id: History,v 1.47 2004/02/03 13:45:29 vnivanch Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,12 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
03.02.04 V.Ivant - materials-V06-00-01
Fix problem of destructor of G4SandiaTable
22.01.04 mma - materials-V06-00-00
G4Material.cc: proper STL handdling of theElementVector (Hisaya)
01.12.03 P.Gumplinger - materials-V05-02-00
Added base class G4SurfaceProperty.
G4OpticalSurface[.hh.cc]: modified to inherit from G4SurfaceProperty.
source/materials/include/G4AtomicShells.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4AtomicShells.hh,v 1.4 2001/07/11 10:01:24 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// class description
//
source/materials/include/G4Element.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Element.hh,v 1.17 2003/06/16 16:56:13 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
// class description
source/materials/include/G4ElementTable.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ElementTable.hh,v 1.5 2003/06/16 16:56:14 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
// ------------------------------------------------------------
source/materials/include/G4ElementVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4ElementVector.hh,v 1.5 2003/06/16 16:56:15 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
// ------------------------------------------------------------
source/materials/include/G4IonisParamElm.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4IonisParamElm.hh,v 1.6 2001/07/11 10:01:25 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
// class description
source/materials/include/G4IonisParamMat.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4IonisParamMat.hh,v 1.7 2002/10/29 16:17:04 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
// class description
source/materials/include/G4Isotope.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Isotope.hh,v 1.15 2003/06/16 16:56:16 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/materials/include/G4IsotopeVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4IsotopeVector.hh,v 1.5 2003/06/16 16:56:17 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
// ------------------------------------------------------------
source/materials/include/G4MPVEntry.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MPVEntry.hh,v 1.5 2001/07/11 10:01:26 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/include/G4Material.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Material.hh,v 1.22 2003/06/16 16:56:18 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
// class description
source/materials/include/G4MaterialPropertiesTable.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MaterialPropertiesTable.hh,v 1.12 2003/06/16 16:56:19 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/include/G4MaterialPropertyVector.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MaterialPropertyVector.hh,v 1.9 2003/06/16 16:56:20 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/include/G4MaterialTable.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MaterialTable.hh,v 1.5 2003/06/16 16:56:21 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
// ------------------------------------------------------------
source/materials/include/G4OpticalSurface.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpticalSurface.hh,v 1.7 2003/12/01 15:13:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/include/G4SandiaTable.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SandiaTable.hh,v 1.10 2001/10/17 07:59:52 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
// class description
//
source/materials/include/G4StaticSandiaData.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4StaticSandiaData.hh,v 1.6 2002/04/15 16:50:36 grichine Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
source/materials/include/G4SurfaceProperty.hh
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4SurfaceProperty.hh,v 1.2 2003/12/01 15:13:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/src/G4AtomicShells.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4AtomicShells.cc,v 1.3 2001/07/11 10:01:27 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
source/materials/src/G4Element.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Element.cc,v 1.17 2003/06/18 08:12:56 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/materials/src/G4IonisParamElm.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4IonisParamElm.cc,v 1.8 2002/10/17 09:00:29 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
source/materials/src/G4IonisParamMat.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4IonisParamMat.cc,v 1.10 2002/10/29 16:17:05 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
source/materials/src/G4Isotope.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4Isotope.cc,v 1.15 2003/06/18 08:12:56 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
source/materials/src/G4MPVEntry.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MPVEntry.cc,v 1.6 2001/07/11 10:01:28 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/src/G4Material.cc
+12 -12
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Material.cc,v 1.24 2003/06/18 08:12:56 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00 $
// $Id: G4Material.cc,v 1.25 2004/01/22 17:50:38 maire Exp $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//
@@ -56,6 +56,7 @@
// 16-04-02, G4Exception put in constructor with chemical formula
// 06-05-02, remove the check of the ideal gas state equation
// 06-08-02, remove constructors with chemical formula (mma)
// 22-01-04, proper STL handling of theElementVector (Hisaya)
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -97,8 +98,8 @@ G4Material::G4Material(const G4String& name, G4double z,
// element corresponding to this material
maxNbComponents = fNumberOfComponents = fNumberOfElements = 1;
fImplicitElement = true;
theElementVector = new G4ElementVector(1,(G4Element*)0);
(*theElementVector)[0] = new G4Element(name, " ", z, a);
theElementVector = new G4ElementVector();
theElementVector->push_back( new G4Element(name, " ", z, a));
fMassFractionVector = new G4double[1];
fMassFractionVector[0] = 1. ;
@@ -147,7 +148,8 @@ G4Material::G4Material(const G4String& name, G4double density,
maxNbComponents = nComponents;
fNumberOfComponents = fNumberOfElements = 0;
fImplicitElement = false;
theElementVector = new G4ElementVector(maxNbComponents,(G4Element*)0);
theElementVector = new G4ElementVector();
theElementVector->reserve(maxNbComponents);
if (fState == kStateUndefined)
{
@@ -170,7 +172,7 @@ void G4Material::AddElement(G4Element* element, G4int nAtoms)
// filling ...
if ( G4int(fNumberOfElements) < maxNbComponents ) {
(*theElementVector)[fNumberOfElements] = element;
theElementVector->push_back(element);
fAtomsVector [fNumberOfElements] = nAtoms;
fNumberOfComponents = ++fNumberOfElements;
element->increaseCountUse();
@@ -225,10 +227,9 @@ void G4Material::AddElement(G4Element* element, G4double fraction)
while ((el<fNumberOfElements)&&(element!=(*theElementVector)[el])) el++;
if (el<fNumberOfElements) fMassFractionVector[el] += fraction;
else {
if(el>=theElementVector->size()) theElementVector->resize(el+1);
(*theElementVector)[el] = element;
theElementVector->push_back(element);
fMassFractionVector[el] = fraction;
fNumberOfElements ++;
fNumberOfElements++;
element->increaseCountUse();
}
fNumberOfComponents++;
@@ -285,11 +286,10 @@ void G4Material::AddMaterial(G4Material* material, G4double fraction)
if (el < fNumberOfElements) fMassFractionVector[el] += fraction
*(material->GetFractionVector())[elm];
else {
if (el >= theElementVector->size()) theElementVector->resize(el+1);
(*theElementVector)[el] = element;
theElementVector->push_back(element);
fMassFractionVector[el] = fraction
*(material->GetFractionVector())[elm];
fNumberOfElements ++;
fNumberOfElements++;
element->increaseCountUse();
}
}
source/materials/src/G4MaterialPropertiesTable.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MaterialPropertiesTable.cc,v 1.13 2002/11/07 02:30:29 gum Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/src/G4MaterialPropertyVector.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4MaterialPropertyVector.cc,v 1.14 2003/06/16 16:56:25 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-05-02-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/src/G4OpticalSurface.cc
+1 -1
View File
@@ -22,7 +22,7 @@
//
//
// $Id: G4OpticalSurface.cc,v 1.9 2003/12/01 15:13:41 gcosmo Exp $
// GEANT4 tag $Name: geant4-06-00 $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
//
//
////////////////////////////////////////////////////////////////////////
source/materials/src/G4SandiaTable.cc
+5 -4
View File
@@ -21,11 +21,12 @@
// ********************************************************************
//
//
// $Id: G4SandiaTable.cc,v 1.16 2003/06/16 16:56:26 gunter Exp $
// GEANT4 tag $Name: geant4-06-00 $
// $Id: G4SandiaTable.cc,v 1.17 2004/02/03 11:09:17 vnivanch Exp $
// GEANT4 tag $Name: geant4-06-00-patch-01 $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.... ....oooOO0OOooo....
//
// 03.02.04 Update distructor V.Ivanchenko
// 10.07.01 Migration to STL. M. Verderi.
// 03.04.01 fnulcof returned if energy < emin
// 22.02.01 GetsandiaCofForMaterial(energy) return 0 below lowest interval mma
@@ -78,8 +79,8 @@ G4SandiaTable::~G4SandiaTable()
if(fPhotoAbsorptionCof)
{
for(G4int i = 0 ; i < fMaxInterval ; i++) delete[] fPhotoAbsorptionCof[i];
delete fPhotoAbsorptionCof ;
// for(G4int i = 0 ; i < fMaxInterval ; i++) delete[] fPhotoAbsorptionCof[i];
delete [] fPhotoAbsorptionCof ;
}
}