Import Geant4 10.3.0 source tree
This commit is contained in:
@@ -82,7 +82,9 @@ G4LMsdGenerator::IsApplicable( const G4HadProjectile& aTrack,
|
||||
if( ( aTrack.GetDefinition() == G4Proton::Proton() ||
|
||||
aTrack.GetDefinition() == G4Neutron::Neutron() ) &&
|
||||
targetNucleus.GetA_asInt() >= 1 &&
|
||||
aTrack.GetKineticEnergy() > 1800*CLHEP::MeV ) // 750*CLHEP::MeV )
|
||||
// aTrack.GetKineticEnergy() > 1800*CLHEP::MeV
|
||||
aTrack.GetKineticEnergy() > 300*CLHEP::MeV
|
||||
) // 750*CLHEP::MeV )
|
||||
{
|
||||
applied = true;
|
||||
}
|
||||
@@ -116,7 +118,7 @@ G4LMsdGenerator::ApplyYourself( const G4HadProjectile& aTrack,
|
||||
const G4HadProjectile* aParticle = &aTrack;
|
||||
G4double eTkin = aParticle->GetKineticEnergy();
|
||||
|
||||
if( eTkin <= 1.*CLHEP::GeV )
|
||||
if( eTkin <= 1.*CLHEP::GeV && aTrack.GetDefinition() != G4Proton::Proton())
|
||||
{
|
||||
theParticleChange.SetEnergyChange(eTkin);
|
||||
theParticleChange.SetMomentumChange(aTrack.Get4Momentum().vect().unit());
|
||||
@@ -307,7 +309,8 @@ G4double G4LMsdGenerator::SampleMx(const G4HadProjectile* aParticle)
|
||||
if( aParticle->GetDefinition() == G4Proton::Proton() )
|
||||
{
|
||||
Mx = 1.44;
|
||||
fPDGencoding = 12212;
|
||||
// fPDGencoding = 12212;
|
||||
fPDGencoding = 2214;
|
||||
}
|
||||
else if( aParticle->GetDefinition() == G4Neutron::Neutron() )
|
||||
{
|
||||
@@ -344,7 +347,8 @@ G4double G4LMsdGenerator::SampleMx(const G4HadProjectile* aParticle)
|
||||
if( aParticle->GetDefinition() == G4Proton::Proton() )
|
||||
{
|
||||
Mx = 1.52;
|
||||
fPDGencoding = 2124;
|
||||
// fPDGencoding = 2124;
|
||||
fPDGencoding = 2214;
|
||||
}
|
||||
else if( aParticle->GetDefinition() == G4Neutron::Neutron() )
|
||||
{
|
||||
@@ -381,7 +385,8 @@ G4double G4LMsdGenerator::SampleMx(const G4HadProjectile* aParticle)
|
||||
if( aParticle->GetDefinition() == G4Proton::Proton() )
|
||||
{
|
||||
Mx = 1.68;
|
||||
fPDGencoding = 12216;
|
||||
// fPDGencoding = 12216;
|
||||
fPDGencoding = 2214;
|
||||
}
|
||||
else if( aParticle->GetDefinition() == G4Neutron::Neutron() )
|
||||
{
|
||||
@@ -416,7 +421,8 @@ G4double G4LMsdGenerator::SampleMx(const G4HadProjectile* aParticle)
|
||||
if(fPDGencoding == 0)
|
||||
{
|
||||
Mx = 1.44;
|
||||
fPDGencoding = 12212;
|
||||
// fPDGencoding = 12212;
|
||||
fPDGencoding = 2214;
|
||||
}
|
||||
G4ParticleDefinition* myResonance =
|
||||
G4ParticleTable::GetParticleTable()->FindParticle( fPDGencoding );
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4NuclNuclDiffuseElastic.cc 91806 2015-08-06 12:20:45Z gcosmo $
|
||||
// $Id: G4NuclNuclDiffuseElastic.cc 98826 2016-08-12 12:36:07Z gcosmo $
|
||||
//
|
||||
//
|
||||
// Physics model class G4NuclNuclDiffuseElastic
|
||||
@@ -1872,7 +1872,7 @@ G4NuclNuclDiffuseElastic::GetHadronNucleonXscNS( G4ParticleDefinition* pParticle
|
||||
|
||||
//if( proj_energy < 40. ) Delta = 0.916+0.0021*proj_energy;
|
||||
|
||||
if( proj_momentum >= 10.)
|
||||
//AR-12Aug2016 if( proj_momentum >= 10.)
|
||||
{
|
||||
B0 = 7.5;
|
||||
A0 = 100. - B0*G4Log(3.0e7);
|
||||
|
||||
@@ -179,7 +179,6 @@ G4hhElastic::G4hhElastic( G4ParticleDefinition* target, G4ParticleDefinition* pr
|
||||
thePionMinus= G4PionMinus::PionMinus();
|
||||
|
||||
fTarget = G4Proton::Proton(); // later vmg
|
||||
fProjectile = 0;
|
||||
fMassTarg = fTarget->GetPDGMass();
|
||||
fMassProj = fProjectile->GetPDGMass();
|
||||
fMassSum2 = (fMassTarg+fMassProj)*(fMassTarg+fMassProj);
|
||||
|
||||
Reference in New Issue
Block a user