Import Geant4 1.1.0 source tree
This commit is contained in:
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4LELambdaInelastic.cc,v 1.1.10.1 1999/12/07 20:52:23 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4LELambdaInelastic.cc,v 1.1.10.1.2.2 1999/12/10 15:42:13 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
// Hadronic Process: Lambda Inelastic Process
|
||||
// J.L. Chuma, TRIUMF, 18-Feb-1997
|
||||
@@ -31,11 +31,11 @@
|
||||
if( verboseLevel > 1 )
|
||||
{
|
||||
G4Material *targetMaterial = aTrack.GetMaterial();
|
||||
G4cout << "G4LELambdaInelastic::ApplyYourself called" << endl;
|
||||
G4cout << "G4LELambdaInelastic::ApplyYourself called" << G4endl;
|
||||
G4cout << "kinetic energy = " << originalIncident->GetKineticEnergy()/MeV << "MeV, ";
|
||||
G4cout << "target material = " << targetMaterial->GetName() << ", ";
|
||||
G4cout << "target particle = " << originalTarget->GetDefinition()->GetParticleName()
|
||||
<< endl;
|
||||
<< G4endl;
|
||||
}
|
||||
//
|
||||
// Fermi motion and evaporation
|
||||
@@ -153,7 +153,7 @@
|
||||
for( i=0; i<numSec; ++i )protnorm[i] = 0.0;
|
||||
counter = -1;
|
||||
for( np=0; np<(numSec/3); ++np ) {
|
||||
for( nm=max(0,np-2); nm<=(np+1); ++nm ) {
|
||||
for( nm=G4std::max(0,np-2); nm<=(np+1); ++nm ) {
|
||||
for( nz=0; nz<numSec/3; ++nz ) {
|
||||
if( ++counter < numMul ) {
|
||||
nt = np+nm+nz;
|
||||
@@ -169,7 +169,7 @@
|
||||
for( i=0; i<numSec; ++i )neutnorm[i] = 0.0;
|
||||
counter = -1;
|
||||
for( np=0; np<numSec/3; ++np ) {
|
||||
for( nm=max(0,np-1); nm<=(np+2); ++nm ) {
|
||||
for( nm=G4std::max(0,np-1); nm<=(np+2); ++nm ) {
|
||||
for( nz=0; nz<numSec/3; ++nz ) {
|
||||
if( ++counter < numMul ) {
|
||||
nt = np+nm+nz;
|
||||
@@ -205,12 +205,12 @@
|
||||
if( targetParticle.GetDefinition() == aProton ) {
|
||||
counter = -1;
|
||||
for( np=0; np<numSec/3 && ran>=excs; ++np ) {
|
||||
for( nm=max(0,np-2); nm<=(np+1) && ran>=excs; ++nm ) {
|
||||
for( nm=G4std::max(0,np-2); nm<=(np+1) && ran>=excs; ++nm ) {
|
||||
for( nz=0; nz<numSec/3 && ran>=excs; ++nz ) {
|
||||
if( ++counter < numMul ) {
|
||||
nt = np+nm+nz;
|
||||
if( nt>0 && nt<=numSec ) {
|
||||
test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
|
||||
test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
|
||||
dum = (pi/anpn)*nt*protmul[counter]*protnorm[nt-1]/(2.0*n*n);
|
||||
if( fabs(dum) < 1.0 ) {
|
||||
if( test >= 1.0e-10 )excs += dum*test;
|
||||
@@ -228,7 +228,7 @@
|
||||
return;
|
||||
}
|
||||
np--; nm--; nz--;
|
||||
G4int ncht = max( 1, np-nm );
|
||||
G4int ncht = G4std::max( 1, np-nm );
|
||||
switch( ncht ) {
|
||||
case 1:
|
||||
currentParticle.SetDefinitionAndUpdateE( aSigmaPlus );
|
||||
@@ -272,12 +272,12 @@
|
||||
{
|
||||
counter = -1;
|
||||
for( np=0; np<numSec/3 && ran>=excs; ++np ) {
|
||||
for( nm=max(0,np-1); nm<=(np+2) && ran>=excs; ++nm ) {
|
||||
for( nm=G4std::max(0,np-1); nm<=(np+2) && ran>=excs; ++nm ) {
|
||||
for( nz=0; nz<numSec/3 && ran>=excs; ++nz ) {
|
||||
if( ++counter < numMul ) {
|
||||
nt = np+nm+nz;
|
||||
if( nt>0 && nt<=numSec ) {
|
||||
test = exp( min( expxu, max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
|
||||
test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(nt*nt)/(n*n) ) ) );
|
||||
dum = (pi/anpn)*nt*neutmul[counter]*neutnorm[nt-1]/(2.0*n*n);
|
||||
if( fabs(dum) < 1.0 ) {
|
||||
if( test >= 1.0e-10 )excs += dum*test;
|
||||
@@ -295,7 +295,7 @@
|
||||
return;
|
||||
}
|
||||
np--; nm--; nz--;
|
||||
G4int ncht = max( 1, np-nm+3 );
|
||||
G4int ncht = G4std::max( 1, np-nm+3 );
|
||||
switch( ncht ) {
|
||||
case 1:
|
||||
currentParticle.SetDefinitionAndUpdateE( aSigmaPlus );
|
||||
|
||||
Reference in New Issue
Block a user