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

Import Geant4 9.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-09 15:37:50 +02:00
parent a8e9364cea
commit 96c8bcd0af
6923 changed files with 198390 additions and 41849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/global/HEPGeometry/include/G4LorentzRotation.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4LorentzRotation.hh,v 1.5 2006/06/29 18:59:04 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef G4LorentzRotation_hh
#define G4LorentzRotation_hh
source/global/HEPGeometry/include/G4LorentzVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4LorentzVector.hh,v 1.5 2006/06/29 18:59:06 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef G4LorentzVector_hh
#define G4LorentzVector_hh
source/global/HEPGeometry/include/G4Normal3D.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Normal3D.hh,v 1.5 2006/06/29 18:59:09 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef G4NORMAL3D_HH
#define G4NORMAL3D_HH
source/global/HEPGeometry/include/G4Plane3D.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Plane3D.hh,v 1.5 2006/06/29 18:59:11 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef G4PLANE3D_HH
#define G4PLANE3D_HH
source/global/HEPGeometry/include/G4Point3D.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Point3D.hh,v 1.5 2006/06/29 18:59:14 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef G4POINT3D_HH
#define G4POINT3D_HH
source/global/HEPGeometry/include/G4Transform3D.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Transform3D.hh,v 1.5 2006/06/29 18:59:16 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef G4TRANSFORM3D_HH
#define G4TRANSFORM3D_HH
source/global/HEPGeometry/include/G4Vector3D.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Vector3D.hh,v 1.5 2006/06/29 18:59:18 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef G4VECTOR3D_HH
#define G4VECTOR3D_HH
source/global/HEPGeometry/include/geomdefs.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: geomdefs.hh,v 1.8 2007/05/18 07:21:39 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ----------------------------------------------------------------------
source/global/HEPNumerics/include/G4AnalyticalPolSolver.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4AnalyticalPolSolver.hh,v 1.5 2006/06/29 18:59:23 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4ChebyshevApproximation.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ChebyshevApproximation.hh,v 1.6 2006/06/29 18:59:26 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4DataInterpolation.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4DataInterpolation.hh,v 1.5 2006/06/29 18:59:29 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussChebyshevQ.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4GaussChebyshevQ.hh,v 1.5 2006/06/29 18:59:32 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussHermiteQ.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4GaussHermiteQ.hh,v 1.6 2006/06/29 18:59:35 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussJacobiQ.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4GaussJacobiQ.hh,v 1.5 2006/06/29 18:59:38 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussLaguerreQ.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4GaussLaguerreQ.hh,v 1.6 2006/06/29 18:59:40 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4GaussLegendreQ.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4GaussLegendreQ.hh,v 1.6 2006/06/29 18:59:42 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4Integrator.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Integrator.hh,v 1.7 2006/06/29 18:59:45 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4Integrator.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Integrator.icc,v 1.13 2006/06/29 18:59:47 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Implementation of G4Integrator methods.
//
source/global/HEPNumerics/include/G4JTPolynomialSolver.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4JTPolynomialSolver.hh,v 1.6 2006/06/29 18:59:49 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4PolynomialSolver.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PolynomialSolver.hh,v 1.4 2006/06/29 18:59:52 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// class G4PolynomialSolver
//
source/global/HEPNumerics/include/G4PolynomialSolver.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PolynomialSolver.icc,v 1.8 2006/06/29 18:59:54 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// class G4PolynomialSolver
//
source/global/HEPNumerics/include/G4SimpleIntegration.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4SimpleIntegration.hh,v 1.6 2006/06/29 18:59:56 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4SimplexDownhill.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4SimplexDownhill.hh,v 1.3 2007/06/21 15:04:12 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/include/G4SimplexDownhill.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4SimplexDownhill.icc,v 1.2 2007/05/11 13:05:53 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Author: Tatsumi Koi (SLAC/SCCS), 2007
// --------------------------------------------------------------------------
source/global/HEPNumerics/include/G4VGaussianQuadrature.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VGaussianQuadrature.hh,v 1.7 2006/06/29 18:59:58 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class description:
//
source/global/HEPNumerics/src/G4AnalyticalPolSolver.cc
+13 -13
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4AnalyticalPolSolver.cc,v 1.6 2006/06/29 19:00:00 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4AnalyticalPolSolver.cc,v 1.7 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
#include "globals.hh"
@@ -85,7 +85,7 @@ G4int G4AnalyticalPolSolver::QuadRoots( G4double p[5], G4double r[3][5] )
G4int G4AnalyticalPolSolver::CubicRoots( G4double p[5], G4double r[3][5] )
{
G4double s,t,b,c,d;
G4double x,t,b,c,d;
G4int k;
if( p[0] != 1. )
@@ -93,9 +93,9 @@ G4int G4AnalyticalPolSolver::CubicRoots( G4double p[5], G4double r[3][5] )
for(k = 1; k < 4; k++ ) { p[k] = p[k]/p[0]; }
p[0] = 1.;
}
s = p[1]/3.0;
t = s*p[1];
b = 0.5*( s*( t/1.5 - p[2] ) + p[3] );
x = p[1]/3.0;
t = x*p[1];
b = 0.5*( x*( t/1.5 - p[2] ) + p[3] );
t = ( t - p[2] )/3.0;
c = t*t*t;
d = b*b - c;
@@ -113,19 +113,19 @@ G4int G4AnalyticalPolSolver::CubicRoots( G4double p[5], G4double r[3][5] )
d = std::sqrt(0.75)*(b - c);
r[2][2] = d;
b = b + c;
c = -0.5*b-s;
c = -0.5*b-x;
r[1][2] = c;
if( ( b > 0. && s <= 0. ) || ( b < 0. && s > 0. ) )
if( ( b > 0. && x <= 0. ) || ( b < 0. && x > 0. ) )
{
r[1][1] = c;
r[2][1] = -d;
r[1][3] = b - s;
r[1][3] = b - x;
r[2][3] = 0;
}
else
{
r[1][1] = b - s;
r[1][1] = b - x;
r[2][1] = 0.;
r[1][3] = c;
r[2][3] = -d;
@@ -141,9 +141,9 @@ G4int G4AnalyticalPolSolver::CubicRoots( G4double p[5], G4double r[3][5] )
c = std::cos(d)*b;
t = -std::sqrt(0.75)*std::sin(d)*b - 0.5*c;
d = -t - c - s;
c = c - s;
t = t - s;
d = -t - c - x;
c = c - x;
t = t - x;
if( std::fabs(c) > std::fabs(t) ) { r[1][3] = c; }
else
source/global/HEPNumerics/src/G4ChebyshevApproximation.cc
+11 -11
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4ChebyshevApproximation.cc,v 1.6 2006/06/29 19:00:02 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4ChebyshevApproximation.cc,v 1.7 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
#include "G4ChebyshevApproximation.hh"
@@ -71,20 +71,20 @@ G4ChebyshevApproximation::G4ChebyshevApproximation( function pFunction,
// --------------------------------------------------------------------
//
// Constructor for creation of Chebyshev coefficients for m-derivative
// from pFunction. The value of m ! MUST BE ! < n , because the result
// array of fChebyshevCof will be of (n-m) size. The values a and b
// Constructor for creation of Chebyshev coefficients for mx-derivative
// from pFunction. The value of mx ! MUST BE ! < nx , because the result
// array of fChebyshevCof will be of (nx-mx) size. The values a and b
// fix the interval of validity of the Chebyshev approximation.
G4ChebyshevApproximation::
G4ChebyshevApproximation( function pFunction,
G4int n, G4int m,
G4int nx, G4int mx,
G4double a, G4double b )
: fFunction(pFunction), fNumber(n),
: fFunction(pFunction), fNumber(nx),
fChebyshevCof(new G4double[fNumber]),
fMean(0.5*(b+a)), fDiff(0.5*(b-a))
{
if(n <= m)
if(nx <= mx)
{
G4Exception("G4ChebyshevApproximation::G4ChebyshevApproximation()",
"InvalidCall", FatalException, "Invalid arguments !") ;
@@ -93,7 +93,7 @@ G4ChebyshevApproximation( function pFunction,
G4double rootSum = 0.0, cofj=0.0;
G4double* tempFunction = new G4double[fNumber] ;
G4double weight = 2.0/fNumber ;
G4double cof = 0.5*weight*pi ; // pi/n
G4double cof = 0.5*weight*pi ; // pi/nx
for (i=0;i<fNumber;i++)
{
@@ -111,9 +111,9 @@ G4ChebyshevApproximation( function pFunction,
}
fChebyshevCof[j] = weight*rootSum ; // corresponds to pFunction
}
// Chebyshev coefficients for (m)-derivative of pFunction
// Chebyshev coefficients for (mx)-derivative of pFunction
for(i=1;i<=m;i++)
for(i=1;i<=mx;i++)
{
DerivativeChebyshevCof(tempFunction) ;
fNumber-- ;
source/global/HEPNumerics/src/G4DataInterpolation.cc
+12 -12
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4DataInterpolation.cc,v 1.8 2006/06/29 19:00:05 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4DataInterpolation.cc,v 1.9 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
#include "G4DataInterpolation.hh"
@@ -149,7 +149,7 @@ G4double
G4DataInterpolation::PolynomInterpolation(G4double pX,
G4double& deltaY ) const
{
G4int i=0, m=1, k=0 ;
G4int i=0, j=1, k=0 ;
G4double mult=0.0, difi=0.0, deltaLow=0.0, deltaUp=0.0, cd=0.0, y=0.0 ;
G4double* c = new G4double[fNumber] ;
G4double* d = new G4double[fNumber] ;
@@ -166,12 +166,12 @@ G4DataInterpolation::PolynomInterpolation(G4double pX,
d[i] = fFunction[i] ;
}
y = fFunction[k--] ;
for(m=1;m<fNumber;m++)
for(j=1;j<fNumber;j++)
{
for(i=0;i<fNumber-m;i++)
for(i=0;i<fNumber-j;i++)
{
deltaLow = fArgument[i] - pX ;
deltaUp = fArgument[i+m] - pX ;
deltaUp = fArgument[i+j] - pX ;
cd = c[i+1] - d[i] ;
mult = deltaLow - deltaUp ;
if (!(mult != 0.0))
@@ -183,7 +183,7 @@ G4DataInterpolation::PolynomInterpolation(G4double pX,
d[i] = deltaUp*mult ;
c[i] = deltaLow*mult ;
}
y += (deltaY = (2*k < (fNumber - m -1) ? c[k+1] : d[k--] )) ;
y += (deltaY = (2*k < (fNumber - j -1) ? c[k+1] : d[k--] )) ;
}
delete[] c ;
delete[] d ;
@@ -249,7 +249,7 @@ G4double
G4DataInterpolation::RationalPolInterpolation(G4double pX,
G4double& deltaY ) const
{
G4int i=0, m=1, k=0 ;
G4int i=0, j=1, k=0 ;
const G4double tolerance = 1.6e-24 ;
G4double mult=0.0, difi=0.0, cd=0.0, y=0.0, cof=0.0 ;
G4double* c = new G4double[fNumber] ;
@@ -275,12 +275,12 @@ G4DataInterpolation::RationalPolInterpolation(G4double pX,
d[i] = fFunction[i] + tolerance ; // to prevent rare zero/zero cases
}
y = fFunction[k--] ;
for(m=1;m<fNumber;m++)
for(j=1;j<fNumber;j++)
{
for(i=0;i<fNumber-m;i++)
for(i=0;i<fNumber-j;i++)
{
cd = c[i+1] - d[i] ;
difi = fArgument[i+m] - pX ;
difi = fArgument[i+j] - pX ;
cof = (fArgument[i] - pX)*d[i]/difi ;
mult = cof - c[i+1] ;
if (!(mult != 0.0)) // function to be interpolated has pole at pX
@@ -292,7 +292,7 @@ G4DataInterpolation::RationalPolInterpolation(G4double pX,
d[i] = c[i+1]*mult ;
c[i] = cof*mult ;
}
y += (deltaY = (2*k < (fNumber - m - 1) ? c[k+1] : d[k--] )) ;
y += (deltaY = (2*k < (fNumber - j - 1) ? c[k+1] : d[k--] )) ;
}
delete[] c ;
delete[] d ;
source/global/HEPNumerics/src/G4GaussChebyshevQ.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4GaussChebyshevQ.cc,v 1.6 2006/06/29 19:00:07 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#include "G4GaussChebyshevQ.hh"
source/global/HEPNumerics/src/G4GaussHermiteQ.cc
+14 -14
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4GaussHermiteQ.cc,v 1.7 2006/06/29 19:00:09 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4GaussHermiteQ.cc,v 1.8 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
#include "G4GaussHermiteQ.hh"
@@ -42,7 +42,7 @@ G4GaussHermiteQ::G4GaussHermiteQ ( function pFunction,
const G4int maxNumber = 12 ;
G4int i=1, j=1, k=1 ;
G4double newton=0.;
G4double newton0=0.;
G4double newton1=0.0, temp1=0.0, temp2=0.0, temp3=0.0, temp=0.0 ;
G4double piInMinusQ = std::pow(pi,-0.25) ; // 1.0/std::sqrt(std::sqrt(pi)) ??
@@ -54,24 +54,24 @@ G4GaussHermiteQ::G4GaussHermiteQ ( function pFunction,
{
if(i == 1)
{
newton = std::sqrt((G4double)(2*nHermite + 1)) -
1.85575001*std::pow((G4double)(2*nHermite + 1),-0.16666999) ;
newton0 = std::sqrt((G4double)(2*nHermite + 1)) -
1.85575001*std::pow((G4double)(2*nHermite + 1),-0.16666999) ;
}
else if(i == 2)
{
newton -= 1.14001*std::pow((G4double)nHermite,0.425999)/newton ;
newton0 -= 1.14001*std::pow((G4double)nHermite,0.425999)/newton0 ;
}
else if(i == 3)
{
newton = 1.86002*newton - 0.86002*fAbscissa[0] ;
newton0 = 1.86002*newton0 - 0.86002*fAbscissa[0] ;
}
else if(i == 4)
{
newton = 1.91001*newton - 0.91001*fAbscissa[1] ;
newton0 = 1.91001*newton0 - 0.91001*fAbscissa[1] ;
}
else
{
newton = 2.0*newton - fAbscissa[i - 3] ;
newton0 = 2.0*newton0 - fAbscissa[i - 3] ;
}
for(k=1;k<=maxNumber;k++)
{
@@ -81,13 +81,13 @@ G4GaussHermiteQ::G4GaussHermiteQ ( function pFunction,
{
temp3 = temp2 ;
temp2 = temp1 ;
temp1 = newton*std::sqrt(2.0/j)*temp2
temp1 = newton0*std::sqrt(2.0/j)*temp2
- std::sqrt(((G4double)(j - 1))/j)*temp3 ;
}
temp = std::sqrt((G4double)2*nHermite)*temp2 ;
newton1 = newton ;
newton = newton1 - temp1/temp ;
if(std::fabs(newton - newton1) <= tolerance)
newton1 = newton0 ;
newton0 = newton1 - temp1/temp ;
if(std::fabs(newton0 - newton1) <= tolerance)
{
break ;
}
@@ -98,7 +98,7 @@ G4GaussHermiteQ::G4GaussHermiteQ ( function pFunction,
"OutOfRange", FatalException,
"Too many iterations in Gauss-Hermite constructor.") ;
}
fAbscissa[i-1] = newton ;
fAbscissa[i-1] = newton0 ;
fWeight[i-1] = 2.0/(temp*temp) ;
}
}
source/global/HEPNumerics/src/G4GaussJacobiQ.cc
+8 -8
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4GaussJacobiQ.cc,v 1.7 2006/06/29 19:00:11 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4GaussJacobiQ.cc,v 1.8 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
#include "G4GaussJacobiQ.hh"
@@ -49,7 +49,7 @@ G4GaussJacobiQ::G4GaussJacobiQ( function pFunction,
G4double alphaBeta=0.0, alphaReduced=0.0, betaReduced=0.0,
root1=0.0, root2=0.0, root3=0.0 ;
G4double a=0.0, b=0.0, c=0.0,
newton1=0.0, newton2=0.0, newton3=0.0, newton=0.0,
newton1=0.0, newton2=0.0, newton3=0.0, newton0=0.0,
temp=0.0, rootTemp=0.0 ;
fNumber = nJacobi ;
@@ -117,11 +117,11 @@ G4GaussJacobiQ::G4GaussJacobiQ( function pFunction,
c = 2.0*(j-1+alpha)*(j-1+beta)*temp ;
newton1 = (b*newton2-c*newton3)/a ;
}
newton = (nJacobi*(alpha - beta - temp*root)*newton1 +
2.0*(nJacobi + alpha)*(nJacobi + beta)*newton2)/
(temp*(1.0 - root*root)) ;
newton0 = (nJacobi*(alpha - beta - temp*root)*newton1 +
2.0*(nJacobi + alpha)*(nJacobi + beta)*newton2)/
(temp*(1.0 - root*root)) ;
rootTemp = root ;
root = rootTemp - newton1/newton ;
root = rootTemp - newton1/newton0 ;
if (std::fabs(root-rootTemp) <= tolerance)
{
break ;
@@ -137,7 +137,7 @@ G4GaussJacobiQ::G4GaussJacobiQ( function pFunction,
GammaLogarithm((G4double)(beta+nJacobi)) -
GammaLogarithm((G4double)(nJacobi+1.0)) -
GammaLogarithm((G4double)(nJacobi + alphaBeta + 1.0)))
*temp*std::pow(2.0,alphaBeta)/(newton*newton2) ;
*temp*std::pow(2.0,alphaBeta)/(newton0*newton2) ;
}
}
source/global/HEPNumerics/src/G4GaussLaguerreQ.cc
+15 -15
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4GaussLaguerreQ.cc,v 1.7 2006/06/29 19:00:13 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4GaussLaguerreQ.cc,v 1.8 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
#include "G4GaussLaguerreQ.hh"
@@ -48,7 +48,7 @@ G4GaussLaguerreQ::G4GaussLaguerreQ( function pFunction,
const G4double tolerance = 1.0e-10 ;
const G4int maxNumber = 12 ;
G4int i=1, k=1 ;
G4double newton=0.0, newton1=0.0,
G4double newton0=0.0, newton1=0.0,
temp1=0.0, temp2=0.0, temp3=0.0, temp=0.0, cofi=0.0 ;
fNumber = nLaguerre ;
@@ -59,19 +59,19 @@ G4GaussLaguerreQ::G4GaussLaguerreQ( function pFunction,
{
if(i == 1)
{
newton = (1.0 + alpha)*(3.0 + 0.92*alpha)
/ (1.0 + 2.4*fNumber + 1.8*alpha) ;
newton0 = (1.0 + alpha)*(3.0 + 0.92*alpha)
/ (1.0 + 2.4*fNumber + 1.8*alpha) ;
}
else if(i == 2)
{
newton += (15.0 + 6.25*alpha)/(1.0 + 0.9*alpha + 2.5*fNumber) ;
newton0 += (15.0 + 6.25*alpha)/(1.0 + 0.9*alpha + 2.5*fNumber) ;
}
else
{
cofi = i - 2 ;
newton += ((1.0+2.55*cofi)/(1.9*cofi)
+ 1.26*cofi*alpha/(1.0+3.5*cofi))
* (newton - fAbscissa[i-3])/(1.0 + 0.3*alpha) ;
newton0 += ((1.0+2.55*cofi)/(1.9*cofi)
+ 1.26*cofi*alpha/(1.0+3.5*cofi))
* (newton0 - fAbscissa[i-3])/(1.0 + 0.3*alpha) ;
}
for(k=1;k<=maxNumber;k++)
{
@@ -81,13 +81,13 @@ G4GaussLaguerreQ::G4GaussLaguerreQ( function pFunction,
{
temp3 = temp2 ;
temp2 = temp1 ;
temp1 = ((2*j - 1 + alpha - newton)*temp2
temp1 = ((2*j - 1 + alpha - newton0)*temp2
- (j - 1 + alpha)*temp3)/j ;
}
temp = (fNumber*temp1 - (fNumber +alpha)*temp2)/newton ;
newton1 = newton ;
newton = newton1 - temp1/temp ;
if(std::fabs(newton - newton1) <= tolerance)
temp = (fNumber*temp1 - (fNumber +alpha)*temp2)/newton0 ;
newton1 = newton0 ;
newton0 = newton1 - temp1/temp ;
if(std::fabs(newton0 - newton1) <= tolerance)
{
break ;
}
@@ -99,7 +99,7 @@ G4GaussLaguerreQ::G4GaussLaguerreQ( function pFunction,
"Too many iterations in Gauss-Laguerre constructor") ;
}
fAbscissa[i-1] = newton ;
fAbscissa[i-1] = newton0 ;
fWeight[i-1] = -std::exp(GammaLogarithm(alpha + fNumber)
- GammaLogarithm((G4double)fNumber))/(temp*fNumber*temp2) ;
}
source/global/HEPNumerics/src/G4GaussLegendreQ.cc
+11 -11
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4GaussLegendreQ.cc,v 1.7 2006/06/29 19:00:16 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4GaussLegendreQ.cc,v 1.8 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
#include "G4GaussLegendreQ.hh"
@@ -55,7 +55,7 @@ G4GaussLegendreQ::G4GaussLegendreQ( function pFunction,
G4Exception("G4GaussLegendreQ::G4GaussLegendreQ()", "InvalidCall",
FatalException, "Invalid nLegendre argument !") ;
}
G4double newton=0.0, newton1=0.0,
G4double newton0=0.0, newton1=0.0,
temp1=0.0, temp2=0.0, temp3=0.0, temp=0.0 ;
fAbscissa = new G4double[fNumber] ;
@@ -63,7 +63,7 @@ G4GaussLegendreQ::G4GaussLegendreQ( function pFunction,
for(G4int i=1;i<=fNumber;i++) // Loop over the desired roots
{
newton = std::cos(pi*(i - 0.25)/(k + 0.5)) ; // Initial root
newton0 = std::cos(pi*(i - 0.25)/(k + 0.5)) ; // Initial root
do // approximation
{ // loop of Newton's method
temp1 = 1.0 ;
@@ -72,16 +72,16 @@ G4GaussLegendreQ::G4GaussLegendreQ( function pFunction,
{
temp3 = temp2 ;
temp2 = temp1 ;
temp1 = ((2.0*j - 1.0)*newton*temp2 - (j - 1.0)*temp3)/j ;
temp1 = ((2.0*j - 1.0)*newton0*temp2 - (j - 1.0)*temp3)/j ;
}
temp = k*(newton*temp1 - temp2)/(newton*newton - 1.0) ;
newton1 = newton ;
newton = newton1 - temp1/temp ; // Newton's method
temp = k*(newton0*temp1 - temp2)/(newton0*newton0 - 1.0) ;
newton1 = newton0 ;
newton0 = newton1 - temp1/temp ; // Newton's method
}
while(std::fabs(newton - newton1) > tolerance) ;
while(std::fabs(newton0 - newton1) > tolerance) ;
fAbscissa[fNumber-i] = newton ;
fWeight[fNumber-i] = 2.0/((1.0 - newton*newton)*temp*temp) ;
fAbscissa[fNumber-i] = newton0 ;
fWeight[fNumber-i] = 2.0/((1.0 - newton0*newton0)*temp*temp) ;
}
}
source/global/HEPNumerics/src/G4JTPolynomialSolver.cc
+43 -43
View File
@@ -23,8 +23,8 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4JTPolynomialSolver.cc,v 1.5 2006/06/29 19:00:18 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4JTPolynomialSolver.cc,v 1.6 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
// --------------------------------------------------------------------
// GEANT 4 class source file
@@ -52,7 +52,7 @@ G4JTPolynomialSolver::~G4JTPolynomialSolver()
{
}
G4int G4JTPolynomialSolver::FindRoots(G4double *op, G4int degree,
G4int G4JTPolynomialSolver::FindRoots(G4double *op, G4int degr,
G4double *zeror, G4double *zeroi)
{
G4double t=0.0, aa=0.0, bb=0.0, cc=0.0, factor=1.0;
@@ -67,7 +67,7 @@ G4int G4JTPolynomialSolver::FindRoots(G4double *op, G4int degree,
rot = 94.0*deg;
G4double cosr = std::cos(rot),
sinr = std::sin(rot);
n = degree;
n = degr;
// Algorithm fails if the leading coefficient is zero.
//
@@ -77,7 +77,7 @@ G4int G4JTPolynomialSolver::FindRoots(G4double *op, G4int degree,
//
while (!(op[n] != 0.0))
{
j = degree - n;
j = degr - n;
zeror[j] = 0.0;
zeroi[j] = 0.0;
n--;
@@ -86,14 +86,14 @@ G4int G4JTPolynomialSolver::FindRoots(G4double *op, G4int degree,
// Allocate buffers here
//
std::vector<G4double> temp(degree+1) ;
std::vector<G4double> pt(degree+1) ;
std::vector<G4double> temp(degr+1) ;
std::vector<G4double> pt(degr+1) ;
p.assign(degree+1,0) ;
qp.assign(degree+1,0) ;
k.assign(degree+1,0) ;
qk.assign(degree+1,0) ;
svk.assign(degree+1,0) ;
p.assign(degr+1,0) ;
qp.assign(degr+1,0) ;
k.assign(degr+1,0) ;
qk.assign(degr+1,0) ;
svk.assign(degr+1,0) ;
// Make a copy of the coefficients.
//
@@ -104,17 +104,17 @@ G4int G4JTPolynomialSolver::FindRoots(G4double *op, G4int degree,
{
if (n == 1) // Start the algorithm for one zero.
{
zeror[degree-1] = -p[1]/p[0];
zeroi[degree-1] = 0.0;
zeror[degr-1] = -p[1]/p[0];
zeroi[degr-1] = 0.0;
n -= 1;
return degree - n ;
return degr - n ;
}
if (n == 2) // Calculate the final zero or pair of zeros.
{
Quadratic(p[0],p[1],p[2],&zeror[degree-2],&zeroi[degree-2],
&zeror[degree-1],&zeroi[degree-1]);
Quadratic(p[0],p[1],p[2],&zeror[degr-2],&zeroi[degr-2],
&zeror[degr-1],&zeroi[degr-1]);
n -= 2;
return degree - n ;
return degr - n ;
}
// Find largest and smallest moduli of coefficients.
@@ -268,7 +268,7 @@ G4int G4JTPolynomialSolver::FindRoots(G4double *op, G4int degree,
// Deflate the polynomial, store the zero or zeros and
// return to the main algorithm.
//
j = degree - n;
j = degr - n;
zeror[j] = szr;
zeroi[j] = szi;
n -= nz;
@@ -297,7 +297,7 @@ G4int G4JTPolynomialSolver::FindRoots(G4double *op, G4int degree,
// Return with failure if no convergence with 20 shifts.
//
return degree - n;
return degr - n;
}
void G4JTPolynomialSolver::ComputeFixedShiftPolynomial(G4int l2, G4int *nz)
@@ -306,7 +306,7 @@ void G4JTPolynomialSolver::ComputeFixedShiftPolynomial(G4int l2, G4int *nz)
// in the linear or quadratic case. Initiates one of the variable shift
// iterations and returns with the number of zeros found.
G4double svu=0.0, svv=0.0, ui=0.0, vi=0.0, s=0.0;
G4double svu=0.0, svv=0.0, ui=0.0, vi=0.0, xs=0.0;
G4double betas=0.25, betav=0.25, oss=sr, ovv=v,
ss=0.0, vv=0.0, ts=1.0, tv=1.0;
G4double ots=0.0, otv=0.0;
@@ -328,7 +328,7 @@ void G4JTPolynomialSolver::ComputeFixedShiftPolynomial(G4int l2, G4int *nz)
ComputeNewEstimate(type,&ui,&vi);
vv = vi;
// Estimate s.
// Estimate xs.
//
ss = 0.0;
if (k[n-1] != 0.0) { ss = -p[n]/k[n-1]; }
@@ -343,7 +343,7 @@ void G4JTPolynomialSolver::ComputeFixedShiftPolynomial(G4int l2, G4int *nz)
continue;
}
// Compute relative measures of convergence of s and v sequences.
// Compute relative measures of convergence of xs and v sequences.
//
if (vv != 0.0) { tv = std::fabs((vv-ovv)/vv); }
if (ss != 0.0) { ts = std::fabs((ss-oss)/ss); }
@@ -375,7 +375,7 @@ void G4JTPolynomialSolver::ComputeFixedShiftPolynomial(G4int l2, G4int *nz)
{
svk[i] = k[i];
}
s = ss;
xs = ss;
// Choose iteration according to the fastest converging sequence.
//
@@ -383,7 +383,7 @@ void G4JTPolynomialSolver::ComputeFixedShiftPolynomial(G4int l2, G4int *nz)
stry = 0;
if (spass && (!vpass) || tss < tvv)
{
RealPolynomialIteration(&s,nz,&iflag);
RealPolynomialIteration(&xs,nz,&iflag);
if (*nz > 0) { return; }
// Linear iteration has failed. Flag that it has been
@@ -396,8 +396,8 @@ void G4JTPolynomialSolver::ComputeFixedShiftPolynomial(G4int l2, G4int *nz)
// If linear iteration signals an almost double real
// zero attempt quadratic iteration.
//
ui = -(s+s);
vi = s*s;
ui = -(xs+xs);
vi = xs*xs;
}
_quadratic_iteration:
@@ -421,7 +421,7 @@ _quadratic_iteration:
{
k[i] = svk[i];
}
RealPolynomialIteration(&s,nz,&iflag);
RealPolynomialIteration(&xs,nz,&iflag);
if (*nz > 0) { return; }
// Linear iteration has failed. Flag that it has been
@@ -434,8 +434,8 @@ _quadratic_iteration:
// If linear iteration signals an almost double real
// zero attempt quadratic iteration.
//
ui = -(s+s);
vi = s*s;
ui = -(xs+xs);
vi = xs*xs;
}
while (iflag != 0);
@@ -582,8 +582,8 @@ RealPolynomialIteration(G4double *sss, G4int *nz, G4int *iflag)
G4double t=0.;
G4double omp=0.;
G4double pv=0.0, kv=0.0, s= *sss;
G4double ms=0.0, mp=0.0, ee=0.0;
G4double pv=0.0, kv=0.0, xs= *sss;
G4double mx=0.0, mp=0.0, ee=0.0;
G4int i=1, j=0;
*nz = 0;
@@ -595,23 +595,23 @@ RealPolynomialIteration(G4double *sss, G4int *nz, G4int *iflag)
{
pv = p[0];
// Evaluate p at s.
// Evaluate p at xs.
//
qp[0] = pv;
for (i=1;i<=n;i++)
{
pv = pv*s + p[i];
pv = pv*xs + p[i];
qp[i] = pv;
}
mp = std::fabs(pv);
// Compute a rigorous bound on the error in evaluating p.
//
ms = std::fabs(s);
mx = std::fabs(xs);
ee = (mre/(are+mre))*std::fabs(qp[0]);
for (i=1;i<=n;i++)
{
ee = ee*ms + std::fabs(qp[i]);
ee = ee*mx + std::fabs(qp[i]);
}
// Iteration has converged sufficiently if the polynomial
@@ -620,7 +620,7 @@ RealPolynomialIteration(G4double *sss, G4int *nz, G4int *iflag)
if (mp <= 20.0*((are+mre)*ee-mre*mp))
{
*nz = 1;
szr = s;
szr = xs;
szi = 0.0;
return;
}
@@ -631,13 +631,13 @@ RealPolynomialIteration(G4double *sss, G4int *nz, G4int *iflag)
if (j > 10) { return; }
if (j >= 2)
{
if (!(std::fabs(t) > 0.001*std::fabs(s-t) || mp < omp))
if (!(std::fabs(t) > 0.001*std::fabs(xs-t) || mp < omp))
{
// A cluster of zeros near the real axis has been encountered.
// Return with iflag set to initiate a quadratic iteration.
//
*iflag = 1;
*sss = s;
*sss = xs;
return;
} // Return if the polynomial value has increased significantly.
}
@@ -650,7 +650,7 @@ RealPolynomialIteration(G4double *sss, G4int *nz, G4int *iflag)
qk[0] = kv;
for (i=1;i<n;i++)
{
kv = kv*s + k[i];
kv = kv*xs + k[i];
qk[i] = kv;
}
if (std::fabs(kv) <= std::fabs(k[n-1])*10.0*eta) // Use unscaled form.
@@ -661,7 +661,7 @@ RealPolynomialIteration(G4double *sss, G4int *nz, G4int *iflag)
k[i] = qk[i-1];
}
}
else // Use the scaled form of the recurrence if k at s is nonzero.
else // Use the scaled form of the recurrence if k at xs is nonzero.
{
t = -pv/kv;
k[0] = qp[0];
@@ -673,11 +673,11 @@ RealPolynomialIteration(G4double *sss, G4int *nz, G4int *iflag)
kv = k[0];
for (i=1;i<n;i++)
{
kv = kv*s + k[i];
kv = kv*xs + k[i];
}
t = 0.0;
if (std::fabs(kv) > std::fabs(k[n-1]*10.0*eta)) { t = -pv/kv; }
s += t;
xs += t;
}
}
source/global/HEPNumerics/src/G4SimpleIntegration.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4SimpleIntegration.cc,v 1.7 2006/06/29 19:00:21 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Implementation file for simple integration methods
//
source/global/HEPNumerics/src/G4VGaussianQuadrature.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VGaussianQuadrature.cc,v 1.7 2006/06/29 19:00:23 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Implementation file for G4VGaussianQuadrature virtual base class
//
source/global/HEPRandom/include/G4Poisson.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Poisson.hh,v 1.9 2006/06/29 19:00:44 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/HEPRandom/include/G4RandomDirection.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4RandomDirection.hh,v 1.3 2006/06/29 19:00:47 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/HEPRandom/include/Randomize.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: Randomize.hh,v 1.7 2006/06/29 19:00:50 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef randomize_h
#define randomize_h 1
source/global/History
+10 -1
View File
@@ -1,4 +1,4 @@
$Id: History,v 1.186 2007/06/18 13:26:58 gcosmo Exp $
$Id: History,v 1.189 2007/11/20 10:54:17 gcosmo Exp $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,15 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
Nov 20, 2007 G.Cosmo (global-V09-00-02)
- Changed date for release 9.1.
Nov 13, 2007 G.Cosmo (global-V09-00-01)
- Cleared compilation warnings for non-inlining and shadowing of variables.
Aug 21, 2007 G.Cosmo (global-V09-00-00)
- Changed date for release 9.0.p01.
Jun 18, 2007 G.Cosmo (global-V08-03-07)
- Force static initialisation to G4GeometryTolerance singleton, to overcome
problems in startup on MacOS for the case of redundant link list of
source/global/management/include/G4Allocator.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Allocator.hh,v 1.18 2006/06/29 19:01:16 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4AllocatorPool.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4AllocatorPool.hh,v 1.5 2006/06/29 19:01:18 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// -------------------------------------------------------------------
source/global/management/include/G4ApplicationState.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ApplicationState.hh,v 1.4 2006/06/29 19:01:20 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
#ifndef G4APPLICATIONSTATE_H
source/global/management/include/G4DataVector.hh
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4DataVector.hh,v 1.14 2006/06/29 19:01:22 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4DataVector.hh,v 1.15 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
@@ -56,10 +56,10 @@ class G4DataVector : public std::vector<G4double>
G4DataVector();
// Default constructor.
explicit G4DataVector(size_t capacity);
explicit G4DataVector(size_t cap);
// Constructor given a 'capacity' defining the initial number of elements.
G4DataVector(size_t capacity, G4double value);
G4DataVector(size_t cap, G4double value);
// Constructor given a 'capacity' defining the initial number of elements
// and initialising them to 'value'.
source/global/management/include/G4DataVector.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4DataVector.icc,v 1.2 2006/06/29 19:01:24 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// class G4DataVector inline implementation
source/global/management/include/G4ErrorPropagatorData.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ErrorPropagatorData.hh,v 1.3 2007/06/08 10:33:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// --------------------------------------------------------------------
source/global/management/include/G4ErrorPropagatorData.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ErrorPropagatorData.icc,v 1.4 2007/06/08 10:33:47 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// Class G4ErrorPropagatorData inline implementation
source/global/management/include/G4ExceptionSeverity.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ExceptionSeverity.hh,v 1.3 2006/06/29 19:01:27 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// Class Description:
//
source/global/management/include/G4FPEDetection.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4FPEDetection.hh,v 1.2 2006/11/15 16:00:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// -*- C++ -*-
source/global/management/include/G4FastVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4FastVector.hh,v 1.5 2006/06/29 19:01:48 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4GeometryTolerance.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4GeometryTolerance.hh,v 1.2 2007/06/18 13:26:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// --------------------------------------------------------------------
// GEANT 4 class header file
source/global/management/include/G4LPhysicsFreeVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4LPhysicsFreeVector.hh,v 1.8 2006/06/29 19:01:51 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------------
source/global/management/include/G4LPhysicsFreeVector.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4LPhysicsFreeVector.icc,v 1.7 2006/06/29 19:02:10 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------------
source/global/management/include/G4OrderedTable.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4OrderedTable.hh,v 1.13 2006/06/29 19:02:13 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4OrderedTable.hh,v 1.14 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
@@ -63,7 +63,7 @@ class G4OrderedTable : public std::vector<G4DataVector*>
G4OrderedTable();
// Deafult constructor.
explicit G4OrderedTable(size_t capacity);
explicit G4OrderedTable(size_t cap);
// Constructor given a 'capacity' defining the initial
// number of elements (NULL pointers are filled up)
source/global/management/include/G4PhysicsFreeVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsFreeVector.hh,v 1.10 2006/06/29 19:02:18 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//--------------------------------------------------------------------
source/global/management/include/G4PhysicsLinearVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsLinearVector.hh,v 1.10 2006/06/29 19:02:21 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//--------------------------------------------------------------------
source/global/management/include/G4PhysicsLnVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsLnVector.hh,v 1.12 2006/06/29 19:02:23 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//--------------------------------------------------------------------
source/global/management/include/G4PhysicsLogVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsLogVector.hh,v 1.11 2006/06/29 19:02:25 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//--------------------------------------------------------------------
source/global/management/include/G4PhysicsOrderedFreeVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsOrderedFreeVector.hh,v 1.9 2006/06/29 19:02:28 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
////////////////////////////////////////////////////////////////////////
// PhysicsOrderedFreeVector Class Definition
source/global/management/include/G4PhysicsOrderedFreeVector.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsOrderedFreeVector.icc,v 1.8 2006/06/29 19:02:31 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
////////////////////////////////////////////////////////////////////////
// PhysicsOrderedFreeVector Class Inline Functions Definitions
source/global/management/include/G4PhysicsTable.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4PhysicsTable.hh,v 1.17 2006/06/29 19:02:34 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4PhysicsTable.hh,v 1.18 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
@@ -75,7 +75,7 @@ class G4PhysicsTable : public std::vector<G4PhysicsVector*>
G4PhysicsTable();
// Default constructor.
explicit G4PhysicsTable(size_t capacity);
explicit G4PhysicsTable(size_t cap);
// Constructor with capacity. Reserves memory for the
// specified capacity.
source/global/management/include/G4PhysicsTable.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsTable.icc,v 1.8 2006/06/29 19:02:36 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4PhysicsVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsVector.hh,v 1.14 2006/06/29 19:02:38 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//---------------------------------------------------------------
source/global/management/include/G4PhysicsVector.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsVector.icc,v 1.9 2006/06/29 19:02:40 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//---------------------------------------------------------------
source/global/management/include/G4PhysicsVectorType.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4PhysicsVectorType.hh,v 1.4 2006/06/29 19:02:42 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// --------------------------------------------------------------
//
source/global/management/include/G4ReferenceCountedHandle.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ReferenceCountedHandle.hh,v 1.15 2006/06/29 19:02:46 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// Class G4ReferenceCountedHandle
source/global/management/include/G4RotationMatrix.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4RotationMatrix.hh,v 1.5 2006/06/29 19:02:54 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ----------------------------------------------------------------------
source/global/management/include/G4SIunits.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4SIunits.hh,v 1.5 2006/09/15 08:16:10 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// ----------------------------------------------------------------------
//
source/global/management/include/G4SliceTimer.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4SliceTimer.hh,v 1.1 2006/10/23 07:43:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ----------------------------------------------------------------------
source/global/management/include/G4SliceTimer.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4SliceTimer.icc,v 1.1 2006/10/23 07:43:31 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4StateManager.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4StateManager.hh,v 1.10 2006/06/29 19:02:59 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4StateManager.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4StateManager.icc,v 1.2 2006/06/29 19:03:02 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4String.hh
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4String.hh,v 1.6 2006/06/29 19:03:05 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4String.hh,v 1.7 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//---------------------------------------------------------------
@@ -116,7 +116,7 @@ public:
inline G4String ( const G4String& );
inline G4String ( const G4SubString& );
inline G4String ( const std::string & );
virtual ~G4String () {}
~G4String () {}
inline G4String& operator=(const G4String&);
inline G4String& operator=(const std::string &);
@@ -163,7 +163,7 @@ public:
// stripType = 1 end
// stripType = 2 both
//
inline G4String strip (G4int stripType=trailing, char c=' ');
inline G4String strip (G4int strip_Type=trailing, char c=' ');
inline void toLower ();
inline void toUpper ();
source/global/management/include/G4String.icc
+4 -4
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4String.icc,v 1.8 2006/06/29 19:03:07 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4String.icc,v 1.9 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//---------------------------------------------------------------
@@ -360,12 +360,12 @@ G4bool G4String::contains(char c) const
{ return false; }
}
G4String G4String::strip (G4int stripType, char c)
G4String G4String::strip (G4int strip_Type, char c)
{
G4String retVal = *this;
if(length()==0) { return retVal; }
str_size i=0;
switch ( stripType ) {
switch ( strip_Type ) {
case leading:
{
for(i=0;i<length();i++)
source/global/management/include/G4ThreeVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ThreeVector.hh,v 1.5 2006/06/29 19:03:12 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ----------------------------------------------------------------------
source/global/management/include/G4Timer.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Timer.hh,v 1.14 2006/06/29 19:03:15 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ----------------------------------------------------------------------
source/global/management/include/G4Timer.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Timer.icc,v 1.2 2006/06/29 19:03:17 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4Tokenizer.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Tokenizer.hh,v 1.2 2006/06/29 19:03:20 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//---------------------------------------------------------------
source/global/management/include/G4TwoVector.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4TwoVector.hh,v 1.1 2007/02/09 12:10:30 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ----------------------------------------------------------------------
source/global/management/include/G4Types.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4Types.hh,v 1.14 2006/06/29 19:03:22 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// GEANT4 native types
source/global/management/include/G4UnitsTable.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4UnitsTable.hh,v 1.18 2006/11/30 10:37:57 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// -----------------------------------------------------------------
source/global/management/include/G4UnitsTable.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4UnitsTable.icc,v 1.2 2006/06/29 19:03:26 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4UserLimits.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4UserLimits.hh,v 1.9 2006/06/29 19:03:28 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// class G4UserLimits
source/global/management/include/G4UserLimits.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4UserLimits.icc,v 1.8 2006/06/29 19:03:31 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
//
source/global/management/include/G4VExceptionHandler.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VExceptionHandler.hh,v 1.2 2006/06/29 19:03:33 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4VNotifier.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VNotifier.hh,v 1.2 2006/06/29 19:03:35 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// class G4VNotifier
//
source/global/management/include/G4VStateDependent.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4VStateDependent.hh,v 1.5 2006/06/29 19:03:37 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ------------------------------------------------------------
source/global/management/include/G4Version.hh
+6 -6
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Version.hh,v 1.10 2007/05/30 10:37:01 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4Version.hh,v 1.12 2007/11/20 10:54:18 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
// Version information
//
@@ -46,18 +46,18 @@
// |--> patch number
#ifndef G4VERSION_NUMBER
#define G4VERSION_NUMBER 900
#define G4VERSION_NUMBER 910
#endif
#ifndef G4VERSION_TAG
#define G4VERSION_TAG "$Name: geant4-09-00 $"
#define G4VERSION_TAG "$Name: geant4-09-01 $"
#endif
// as variables
#include "G4String.hh"
static const G4String G4Version = "$Name: geant4-09-00 $";
static const G4String G4Date = "(29-June-2007)";
static const G4String G4Version = "$Name: geant4-09-01 $";
static const G4String G4Date = "(14-December-2007)";
#endif
source/global/management/include/G4coutDestination.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4coutDestination.hh,v 1.6 2006/06/29 19:03:41 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ---------------------------------------------------------------
source/global/management/include/G4ios.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ios.hh,v 1.10 2006/06/29 19:03:43 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ---------------------------------------------------------------
source/global/management/include/G4strstreambuf.hh
+3 -3
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4strstreambuf.hh,v 1.15 2006/06/29 19:03:46 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4strstreambuf.hh,v 1.16 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
// ====================================================================
//
// G4strstreambuf
@@ -63,7 +63,7 @@ class G4strstreambuf : public std::basic_streambuf<char>
#endif
void SetDestination(G4coutDestination* dest);
G4int ReceiveString ();
inline G4int ReceiveString ();
private:
source/global/management/include/G4strstreambuf.icc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4strstreambuf.icc,v 1.13 2006/06/29 19:03:49 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
// ====================================================================
// G4strstreambuf.icc
//
source/global/management/include/globals.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: globals.hh,v 1.27 2006/06/29 19:03:51 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// Global Constants and typedefs
source/global/management/include/templates.hh
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: templates.hh,v 1.10 2006/06/29 19:03:54 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// -*- C++ -*-
source/global/management/src/G4AllocatorPool.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4AllocatorPool.cc,v 1.4 2006/06/29 19:03:57 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ----------------------------------------------------------------------
source/global/management/src/G4DataVector.cc
+6 -6
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4DataVector.cc,v 1.8 2006/06/29 19:03:59 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4DataVector.cc,v 1.9 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// --------------------------------------------------------------
@@ -45,13 +45,13 @@ G4DataVector::G4DataVector()
{
}
G4DataVector::G4DataVector(size_t capacity)
: std::vector<G4double>(capacity, 0.0)
G4DataVector::G4DataVector(size_t cap)
: std::vector<G4double>(cap, 0.0)
{
}
G4DataVector::G4DataVector(size_t capacity, G4double value)
: std::vector<G4double>(capacity, value)
G4DataVector::G4DataVector(size_t cap, G4double value)
: std::vector<G4double>(cap, value)
{
}
source/global/management/src/G4ErrorPropagatorData.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4ErrorPropagatorData.cc,v 1.3 2007/06/05 13:04:30 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// --------------------------------------------------------------------
source/global/management/src/G4Exception.cc
+9 -9
View File
@@ -24,8 +24,8 @@
// ********************************************************************
//
//
// $Id: G4Exception.cc,v 1.20 2006/06/29 19:04:01 gunter Exp $
// GEANT4 tag $Name: geant4-09-00 $
// $Id: G4Exception.cc,v 1.21 2007/11/13 17:35:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// ----------------------------------------------------------------------
@@ -41,10 +41,10 @@
#include "G4String.hh"
#include "G4StateManager.hh"
void G4Exception(const char* s)
void G4Exception(const char* emessage)
{
if(s) { G4cerr << s << G4endl; }
if(G4StateManager::GetStateManager()->SetNewState(G4State_Abort,s))
if(emessage) { G4cerr << emessage << G4endl; }
if(G4StateManager::GetStateManager()->SetNewState(G4State_Abort,emessage))
{
G4cerr << G4endl << "*** G4Exception: Aborting execution ***" << G4endl;
abort();
@@ -114,12 +114,12 @@ void G4Exception(const char* originOfException,
}
}
void G4Exception(std::string s)
void G4Exception(std::string emessage)
{
G4Exception(s.c_str());
G4Exception(emessage.c_str());
}
void G4Exception(G4String s)
void G4Exception(G4String emessage)
{
G4Exception(s.c_str());
G4Exception(emessage.c_str());
}
source/global/management/src/G4GeometryTolerance.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4GeometryTolerance.cc,v 1.2 2007/06/18 13:26:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
// class G4GeometryTolerance
//
source/global/management/src/G4LPhysicsFreeVector.cc
+1 -1
View File
@@ -25,7 +25,7 @@
//
//
// $Id: G4LPhysicsFreeVector.cc,v 1.12 2007/05/14 10:27:06 gcosmo Exp $
// GEANT4 tag $Name: geant4-09-00 $
// GEANT4 tag $Name: geant4-09-01 $
//
//
// --------------------------------------------------------------------

Some files were not shown because too many files have changed in this diff Show More