Import Geant4 9.2.0 source tree
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4AntiProtonField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4ParticleDefinition.hh"
|
||||
@@ -86,7 +86,7 @@ G4double G4AntiProtonField::GetField(const G4ThreeVector & aPosition)
|
||||
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = antiProtonMass*nucleusMass/(antiProtonMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -85,7 +85,8 @@
|
||||
// C O N S T R U C T O R S A N D D E S T R U C T O R S
|
||||
//
|
||||
|
||||
G4BinaryCascade::G4BinaryCascade() : G4VIntraNuclearTransportModel()
|
||||
G4BinaryCascade::G4BinaryCascade() :
|
||||
G4VIntraNuclearTransportModel("Binary Cascade")
|
||||
{
|
||||
// initialise the resonance sector
|
||||
G4ShortLivedConstructor ShortLived;
|
||||
@@ -96,6 +97,7 @@ G4BinaryCascade::G4BinaryCascade() : G4VIntraNuclearTransportModel()
|
||||
theLateParticle= new G4BCLateParticle;
|
||||
theImR.push_back(theDecay);
|
||||
G4Scatterer * aSc=new G4Scatterer;
|
||||
theH1Scatterer = new G4Scatterer;
|
||||
theImR.push_back(aSc);
|
||||
G4MesonAbsorption * aAb=new G4MesonAbsorption;
|
||||
theImR.push_back(aAb);
|
||||
@@ -110,14 +112,14 @@ G4BinaryCascade::G4BinaryCascade() : G4VIntraNuclearTransportModel()
|
||||
SetDeExcitation(new G4PreCompoundModel(theExcitationHandler));
|
||||
SetMinEnergy(0.0*GeV);
|
||||
SetMaxEnergy(10.1*GeV);
|
||||
PrintWelcomeMessage();
|
||||
//PrintWelcomeMessage();
|
||||
thePrimaryEscape = true;
|
||||
thePrimaryType = 0;
|
||||
}
|
||||
|
||||
|
||||
G4BinaryCascade::G4BinaryCascade(const G4BinaryCascade& )
|
||||
: G4VIntraNuclearTransportModel()
|
||||
: G4VIntraNuclearTransportModel("Binary Cascade")
|
||||
{
|
||||
}
|
||||
|
||||
@@ -133,6 +135,7 @@ G4BinaryCascade::~G4BinaryCascade()
|
||||
std::for_each(theImR.begin(), theImR.end(), Delete<G4BCAction>());
|
||||
delete theLateParticle;
|
||||
delete theExcitationHandler;
|
||||
delete theH1Scatterer;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------
|
||||
@@ -2439,7 +2442,7 @@ G4ReactionProductVector * G4BinaryCascade::Propagate1H1(
|
||||
G4KineticTrack aTarget(aHTarg, 0., pos, mom);
|
||||
G4bool done(false);
|
||||
std::vector<G4KineticTrack *>::iterator iter, jter;
|
||||
static G4Scatterer theScatterer;
|
||||
// data member static G4Scatterer theH1Scatterer;
|
||||
//G4cout << " start 1H1 for " << (*secondaries).front()->GetDefinition()->GetParticleName()
|
||||
// << " on " << aHTarg->GetParticleName() << G4endl;
|
||||
G4int tryCount(0);
|
||||
@@ -2450,7 +2453,7 @@ G4ReactionProductVector * G4BinaryCascade::Propagate1H1(
|
||||
std::for_each(secs->begin(), secs->end(), DeleteKineticTrack());
|
||||
delete secs;
|
||||
}
|
||||
secs = theScatterer.Scatter(*(*secondaries).front(), aTarget);
|
||||
secs = theH1Scatterer->Scatter(*(*secondaries).front(), aTarget);
|
||||
for(size_t ss=0; secs && ss<secs->size(); ss++)
|
||||
{
|
||||
// G4cout << "1H1 " << (*secs)[ss]->GetDefinition()->GetParticleName()
|
||||
|
||||
@@ -38,7 +38,8 @@
|
||||
#include <cmath>
|
||||
|
||||
G4BinaryLightIonReaction::G4BinaryLightIonReaction()
|
||||
: theModel(), theHandler(), theProjectileFragmentation(&theHandler) {}
|
||||
: G4HadronicInteraction("Binary Cascade"), theModel(), theHandler(),
|
||||
theProjectileFragmentation(&theHandler) {}
|
||||
|
||||
G4HadFinalState *G4BinaryLightIonReaction::
|
||||
ApplyYourself(const G4HadProjectile &aTrack, G4Nucleus & targetNucleus )
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
// -------------------------------------------------------------------
|
||||
|
||||
#include "G4KM_OpticalEqRhs.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4HadTmpUtil.hh"
|
||||
|
||||
@@ -55,7 +55,7 @@ void G4KM_OpticalEqRhs::SetFactor(G4double mass, G4double opticalParameter)
|
||||
{
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = mass*nucleusMass/(mass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4KaonMinusField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4KaonMinus.hh"
|
||||
@@ -84,7 +84,7 @@ G4double G4KaonMinusField::GetField(const G4ThreeVector & aPosition)
|
||||
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4KaonPlusField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4KaonPlus.hh"
|
||||
@@ -84,7 +84,7 @@ G4double G4KaonPlusField::GetField(const G4ThreeVector & aPosition)
|
||||
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4KaonZeroField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4KaonZero.hh"
|
||||
@@ -84,7 +84,7 @@ G4double G4KaonZeroField::GetField(const G4ThreeVector & aPosition)
|
||||
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = kaonMass*nucleusMass/(kaonMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4PionMinusField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4PionMinus.hh"
|
||||
@@ -82,7 +82,7 @@ G4double G4PionMinusField::GetField(const G4ThreeVector & aPosition)
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double pionMinusMass = G4PionMinus::PionMinus()->GetPDGMass();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = pionMinusMass*nucleusMass/(pionMinusMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4PionPlusField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4PionPlus.hh"
|
||||
@@ -84,7 +84,7 @@ G4double G4PionPlusField::GetField(const G4ThreeVector & aPosition)
|
||||
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = pionPlusMass*nucleusMass/(pionPlusMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4PionZeroField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4PionZero.hh"
|
||||
@@ -84,7 +84,7 @@ G4double G4PionZeroField::GetField(const G4ThreeVector & aPosition)
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = pionZeroMass*nucleusMass/(pionZeroMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4SigmaMinusField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4SigmaMinus.hh"
|
||||
@@ -83,7 +83,7 @@ G4double G4SigmaMinusField::GetField(const G4ThreeVector & aPosition)
|
||||
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = sigmaMinusMass*nucleusMass/(sigmaMinusMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4SigmaPlusField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4SigmaPlus.hh"
|
||||
@@ -84,7 +84,7 @@ G4double G4SigmaPlusField::GetField(const G4ThreeVector & aPosition)
|
||||
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = sigmaPlusMass*nucleusMass/(sigmaPlusMass+nucleusMass);
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
// Creation date: 5 June 2000
|
||||
// -------------------------------------------------------------------
|
||||
#include "G4SigmaZeroField.hh"
|
||||
#include "G4NucleiPropertiesTable.hh"
|
||||
#include "G4NucleiProperties.hh"
|
||||
#include "G4VNuclearDensity.hh"
|
||||
#include "G4FermiMomentum.hh"
|
||||
#include "G4SigmaZero.hh"
|
||||
@@ -84,7 +84,7 @@ G4double G4SigmaZeroField::GetField(const G4ThreeVector & aPosition)
|
||||
|
||||
G4double A = theNucleus->GetMassNumber();
|
||||
G4double Z = theNucleus->GetCharge();
|
||||
G4double bindingEnergy = G4NucleiPropertiesTable::GetBindingEnergy(G4lrint(Z), G4lrint(A));
|
||||
G4double bindingEnergy = G4NucleiProperties::GetBindingEnergy(G4lrint(A), G4lrint(Z));
|
||||
G4double nucleusMass = Z*proton_mass_c2+(A-Z)*neutron_mass_c2+bindingEnergy;
|
||||
G4double reducedMass = sigmaZeroMass*nucleusMass/(sigmaZeroMass+nucleusMass);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user