Import Geant4 1.1.0 source tree
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4EnergyRangeManager.cc,v 1.2.8.1 1999/12/07 20:51:31 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
// Hadronic Process: Energy Range Manager
|
||||
// original by H.P. Wellisch
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4HadronInelasticProcess.cc,v 1.1.8.1.2.1 1999/12/07 20:51:31 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
// Hadronic Inelastic Process Class
|
||||
// J.L. Chuma, TRIUMF, 24-Mar-1997
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4HadronicInteraction.cc,v 1.1.10.1 1999/12/07 20:51:31 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4HadronicInteraction.cc,v 1.1.10.1.2.1 1999/12/08 17:34:35 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
// Hadronic Interaction base class
|
||||
// original by H.P. Wellisch
|
||||
@@ -31,9 +31,9 @@
|
||||
if( aMaterial == theMinMaterials[i] )return theMinEnergyList[i];
|
||||
}
|
||||
if( verboseLevel > 0 )
|
||||
G4cout << "*** Warning from HadronicInteraction::GetMinEnergy" << endl
|
||||
G4cout << "*** Warning from HadronicInteraction::GetMinEnergy" << G4endl
|
||||
<< " material " << aMaterial->GetName()
|
||||
<< " not found in min energy List" << endl;
|
||||
<< " not found in min energy List" << G4endl;
|
||||
return theMinEnergy;
|
||||
}
|
||||
|
||||
@@ -43,9 +43,9 @@
|
||||
G4Element *anElement )
|
||||
{
|
||||
if( IsBlocked(anElement) )
|
||||
G4cout << "*** Warning from HadronicInteraction::SetMinEnergy" << endl
|
||||
G4cout << "*** Warning from HadronicInteraction::SetMinEnergy" << G4endl
|
||||
<< " The model is not active for the Element "
|
||||
<< anElement->GetName() << "." << endl;
|
||||
<< anElement->GetName() << "." << G4endl;
|
||||
|
||||
for( G4int i=0; i<theMinCounterElements; ++i )
|
||||
{
|
||||
@@ -67,9 +67,9 @@
|
||||
G4Material *aMaterial )
|
||||
{
|
||||
if( IsBlocked(aMaterial) )
|
||||
G4cout << "*** Warning from HadronicInteraction::SetMinEnergy" << endl
|
||||
G4cout << "*** Warning from HadronicInteraction::SetMinEnergy" << G4endl
|
||||
<< " The model is not active for the Material "
|
||||
<< aMaterial->GetName() << "." << endl;
|
||||
<< aMaterial->GetName() << "." << G4endl;
|
||||
|
||||
for( G4int i=0; i<theMinCounter; ++i )
|
||||
{
|
||||
@@ -101,9 +101,9 @@
|
||||
if( aMaterial == theMaxMaterials[i] )return theMaxEnergyList[i];
|
||||
}
|
||||
if( verboseLevel > 0 )
|
||||
G4cout << "*** Warning from HadronicInteraction::GetMaxEnergy" << endl
|
||||
G4cout << "*** Warning from HadronicInteraction::GetMaxEnergy" << G4endl
|
||||
<< " material " << aMaterial->GetName()
|
||||
<< " not found in min energy List" << endl;
|
||||
<< " not found in min energy List" << G4endl;
|
||||
|
||||
return theMaxEnergy;
|
||||
}
|
||||
@@ -114,9 +114,9 @@
|
||||
G4Element *anElement )
|
||||
{
|
||||
if( IsBlocked(anElement) )
|
||||
G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << endl
|
||||
G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << G4endl
|
||||
<< "Warning: The model is not active for the Element "
|
||||
<< anElement->GetName() << "." << endl;
|
||||
<< anElement->GetName() << "." << G4endl;
|
||||
|
||||
for( G4int i=0; i<theMaxCounterElements; ++i )
|
||||
{
|
||||
@@ -138,9 +138,9 @@
|
||||
G4Material *aMaterial )
|
||||
{
|
||||
if( IsBlocked(aMaterial) )
|
||||
G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << endl
|
||||
G4cout << "*** Warning from HadronicInteraction::SetMaxEnergy" << G4endl
|
||||
<< "Warning: The model is not active for the Material "
|
||||
<< aMaterial->GetName() << "." << endl;
|
||||
<< aMaterial->GetName() << "." << G4endl;
|
||||
|
||||
for( G4int i=0; i<theMaxCounter; ++i )
|
||||
{
|
||||
|
||||
@@ -5,16 +5,12 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4HadronicProcess.cc,v 1.7.2.1 1999/12/07 20:51:31 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4HadronicProcess.cc,v 1.7.2.1.2.5 1999/12/14 09:16:48 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
// HPW to implement the choosing of an element for scattering.
|
||||
#include <fstream.h>
|
||||
#ifdef WIN32
|
||||
#include <strstrea.h>
|
||||
#else
|
||||
#include <strstream.h>
|
||||
#endif
|
||||
#include "g4std/fstream"
|
||||
#include "g4std/strstream"
|
||||
#include <stdlib.h>
|
||||
#include "G4HadronicProcess.hh"
|
||||
//@@ add model name info, once typeinfo available #include <typeinfo.h>
|
||||
@@ -162,7 +158,7 @@
|
||||
|
||||
// prepare the IsoResult.
|
||||
char the1[100] = {""};
|
||||
ostrstream ost1(the1, 100, ios::out);
|
||||
G4std::ostrstream ost1(the1, 100, G4std::ios::out);
|
||||
ost1 <<Z<<"_"<<A;
|
||||
G4String * biff = new G4String(the1);
|
||||
G4IsoResult * theResult = new G4IsoResult(*biff, aNucleus);
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
for( i=2; i<=nm; i++ )nmf += log((double)i);
|
||||
for( i=2; i<=nz; i++ )nzf += log((double)i);
|
||||
G4double r;
|
||||
r = min( expxu, max( expxl, -(np-nm+nz+b)*(np-nm+nz+b)/(2*c*c*n*n)-npf-nmf-nzf ) );
|
||||
r = G4std::min( expxu, G4std::max( expxl, -(np-nm+nz+b)*(np-nm+nz+b)/(2*c*c*n*n)-npf-nmf-nzf ) );
|
||||
return exp(r);
|
||||
}
|
||||
|
||||
@@ -136,7 +136,7 @@
|
||||
for( G4int i=iBegin; i<=numSec; ++i )
|
||||
{
|
||||
temp = pi*i/(2.0*n*n);
|
||||
test = exp( min( expxu, max( expxl, -(pi/4.0)*(i*i)/(n*n) ) ) );
|
||||
test = exp( G4std::min( expxu, G4std::max( expxl, -(pi/4.0)*(i*i)/(n*n) ) ) );
|
||||
if( temp < 1.0 )
|
||||
{
|
||||
if( test >= 1.0e-10 )anpn += temp*test;
|
||||
@@ -199,7 +199,7 @@
|
||||
//
|
||||
G4double tkin = targetNucleus.EvaporationEffects( ek*GeV )/GeV;
|
||||
ek -= tkin;
|
||||
ek = max( 0.0001, ek );
|
||||
ek = G4std::max( 0.0001, ek );
|
||||
modifiedOriginal.SetKineticEnergy( ek*GeV );
|
||||
G4double amas = originalIncident->GetDefinition()->GetPDGMass()/GeV;
|
||||
G4double et = ek + amas;
|
||||
@@ -267,8 +267,8 @@
|
||||
// there is no kinetic energy available for either proton/neutron
|
||||
// or for deuteron/triton/alpha black track particles
|
||||
// For diffraction scattering on heavy nuclei use elastic routines instead
|
||||
//G4cerr << "*** Error in G4InelasticInteraction::CalculateMomenta" << endl;
|
||||
//G4cerr << "*** the elastic scattering would be better here ***" <<endl;
|
||||
//G4cerr << "*** Error in G4InelasticInteraction::CalculateMomenta" << G4endl;
|
||||
//G4cerr << "*** the elastic scattering would be better here ***" <<G4endl;
|
||||
//}
|
||||
theReactionDynamics.TwoBody( vec, vecLen,
|
||||
modifiedOriginal, originalTarget,
|
||||
|
||||
Reference in New Issue
Block a user