Import Geant4 11.0.2 source tree
This commit is contained in:
@@ -419,7 +419,7 @@ static nfu_status MCGIDI_energy_parseMadlandNixFromTOM_callback( double Ep, doub
|
||||
*/
|
||||
static double MCGIDI_energy_parseMadlandNixFromTOM_callback_g( double Ep, double E_F, double T_M, nfu_status *status ) {
|
||||
|
||||
double u1, u2, E1, E2, gamma1, gamma2, signG = 1;
|
||||
double u1, u2, E1, E2 = 0., gamma1 = 0., gamma2 = 0., signG = 1;
|
||||
|
||||
u1 = std::sqrt( Ep ) - std::sqrt( E_F );
|
||||
u1 *= u1 / T_M;
|
||||
@@ -612,7 +612,7 @@ static int MCGIDI_energy_sampleWatt( statusMessageReporting * /*smr*/, double e_
|
||||
/*
|
||||
* From MCAPM via Sample Watt Spectrum as in TART ( Kalos algorithm ).
|
||||
*/
|
||||
double WattMin = 0., WattMax = e_in_U, x, y, z, energyOut, rand1, rand2;
|
||||
double WattMin = 0., WattMax = e_in_U, x, y, z, energyOut = 0., rand1, rand2;
|
||||
|
||||
x = 1. + ( Watt_b / ( 8. * Watt_a ) );
|
||||
y = ( x + std::sqrt( x * x - 1. ) ) / Watt_a;
|
||||
|
||||
@@ -266,7 +266,7 @@ static nfu_status ptwXY_thin2( ptwXYPoints *thinned, char *thin, double accuracy
|
||||
int64_t i, iMax = 0;
|
||||
double y, s, dY, dYMax = 0., dYR, dYRMax = 0;
|
||||
double x1 = thinned->points[i1].x, y1 = thinned->points[i1].y, x2 = thinned->points[i2].x, y2 = thinned->points[i2].y;
|
||||
nfu_status status;
|
||||
nfu_status status = nfu_Okay;
|
||||
|
||||
if( i1 + 1 >= i2 ) return( nfu_Okay );
|
||||
for( i = i1 + 1; i < i2; i++ ) {
|
||||
|
||||
@@ -41,7 +41,7 @@ ptwXYPoints *ptwXY_createFromFunction( int n, double *xs, ptwXY_createFromFuncti
|
||||
int biSectionMax, nfu_status *status ) {
|
||||
|
||||
int64_t i;
|
||||
double x1, y1, x2, y2, eps = ClosestAllowXFactor * DBL_EPSILON;
|
||||
double x1, y1, x2 = 0., y2, eps = ClosestAllowXFactor * DBL_EPSILON;
|
||||
ptwXYPoints *ptwXY;
|
||||
ptwXYPoint *p1, *p2;
|
||||
|
||||
|
||||
@@ -94,7 +94,6 @@ xDataXML_document *xDataXML_importFile2( statusMessageReporting *smr, char const
|
||||
int f;
|
||||
char buffer[10 * 1000];
|
||||
ssize_t count, n = sizeof( buffer ) - 1;
|
||||
ssize_t s = 0;
|
||||
xDataXML_document *doc;
|
||||
|
||||
if( ( doc = xDataXML_mallocDoc( smr ) ) == NULL ) return( NULL );
|
||||
@@ -105,7 +104,6 @@ xDataXML_document *xDataXML_importFile2( statusMessageReporting *smr, char const
|
||||
smr_setReportError2( smr, xDataTOM_smrLibraryID, xDataXML_errFileError, "could not open XML file %s", fileName ); }
|
||||
else {
|
||||
while( ( count = read( f, buffer, n ) ) > 0 ) {
|
||||
s += count;
|
||||
buffer[count] = 0;
|
||||
if( xDataXML_parse( doc, buffer ) ) break;
|
||||
if( !smr_isOk( doc->smr ) ) break;
|
||||
|
||||
Reference in New Issue
Block a user