Import Geant4 11.0.2 source tree
This commit is contained in:
@@ -15,6 +15,10 @@ code and to keep track of all tags.
|
||||
* Please list in reverse chronological order (last date on top)
|
||||
---------------------------------------------------------------
|
||||
|
||||
09 February 2022 Gabriele Cosmo (hadr-proc-V11-00-02)
|
||||
-----------------------------------------------------
|
||||
- Fixed compilation warning on Intel compilers for unused variables.
|
||||
|
||||
04 August 2021 Alberto Ribon (hadr-proc-V10-07-06)
|
||||
--------------------------------------------------
|
||||
- G4HadronElasticProcess : set the creator model ID for the elastic recoil,
|
||||
|
||||
@@ -210,8 +210,6 @@ G4ElNeutrinoNucleusProcess::PostStepDoIt(const G4Track& track, const G4Step& ste
|
||||
const G4DynamicParticle* aParticle = track.GetDynamicParticle();
|
||||
G4ThreeVector position = pPostStepPoint->GetPosition(), newPosition=position;
|
||||
G4ParticleMomentum direction = aParticle->GetMomentumDirection();
|
||||
G4double startTime = pPostStepPoint->GetGlobalTime();
|
||||
|
||||
|
||||
if( fNuNuclCcBias > 1.0 || fNuNuclNcBias > 1.0) // = true, if fBiasingfactor != 1., i.e. xsc is biased
|
||||
{
|
||||
@@ -235,29 +233,16 @@ G4ElNeutrinoNucleusProcess::PostStepDoIt(const G4Track& track, const G4Step& ste
|
||||
|
||||
G4double range = -backward+G4UniformRand()*distance;
|
||||
|
||||
G4double delta = range - backward;
|
||||
|
||||
startTime += delta/track.GetVelocity();
|
||||
|
||||
newPosition = position + range*direction;
|
||||
|
||||
safetyHelper->ReLocateWithinVolume(newPosition);
|
||||
|
||||
theTotalResult->ProposePosition(newPosition); // G4Exception : GeomNav1002
|
||||
// theTotalResult->ProposeGlobalTime(startTime); // time is updated for 'elastic' only
|
||||
}
|
||||
G4HadProjectile theProj( track );
|
||||
G4HadronicInteraction* hadi = nullptr;
|
||||
G4HadFinalState* result = nullptr;
|
||||
|
||||
// Select element
|
||||
const G4Element* elm = nullptr;
|
||||
G4int ZZ=1;
|
||||
|
||||
if( elm ) ZZ = elm->GetZ();
|
||||
|
||||
G4double xsc = fTotXsc->GetElementCrossSection(dynParticle, ZZ, material);
|
||||
xsc *= 1.;
|
||||
G4double ccTotRatio = fTotXsc->GetCcTotRatio();
|
||||
|
||||
if( G4UniformRand() < ccTotRatio ) // Cc-model
|
||||
@@ -305,7 +290,7 @@ G4ElNeutrinoNucleusProcess::PostStepDoIt(const G4Track& track, const G4Step& ste
|
||||
G4ExceptionDescription ed;
|
||||
aR.Report(ed);
|
||||
ed << "Call for " << hadi->GetModelName() << G4endl;
|
||||
ed << "Target element "<< elm->GetName()<<" Z= "
|
||||
ed << " Z= "
|
||||
<< targNucleus->GetZ_asInt()
|
||||
<< " A= " << targNucleus->GetA_asInt() << G4endl;
|
||||
DumpState(track,"ApplyYourself",ed);
|
||||
|
||||
@@ -210,8 +210,6 @@ G4MuNeutrinoNucleusProcess::PostStepDoIt(const G4Track& track, const G4Step& ste
|
||||
const G4DynamicParticle* aParticle = track.GetDynamicParticle();
|
||||
G4ThreeVector position = pPostStepPoint->GetPosition(), newPosition=position;
|
||||
G4ParticleMomentum direction = aParticle->GetMomentumDirection();
|
||||
G4double startTime = pPostStepPoint->GetGlobalTime();
|
||||
|
||||
|
||||
if( fNuNuclCcBias > 1.0 || fNuNuclNcBias > 1.0) // = true, if fBiasingfactor != 1., i.e. xsc is biased
|
||||
{
|
||||
@@ -235,29 +233,16 @@ G4MuNeutrinoNucleusProcess::PostStepDoIt(const G4Track& track, const G4Step& ste
|
||||
|
||||
G4double range = -backward+G4UniformRand()*distance;
|
||||
|
||||
G4double delta = range - backward;
|
||||
|
||||
startTime += delta/track.GetVelocity();
|
||||
|
||||
newPosition = position + range*direction;
|
||||
|
||||
safetyHelper->ReLocateWithinVolume(newPosition);
|
||||
|
||||
theTotalResult->ProposePosition(newPosition); // G4Exception : GeomNav1002
|
||||
// theTotalResult->ProposeGlobalTime(startTime); // time is updated for 'elastic' only
|
||||
}
|
||||
G4HadProjectile theProj( track );
|
||||
G4HadronicInteraction* hadi = nullptr;
|
||||
G4HadFinalState* result = nullptr;
|
||||
|
||||
// Select element
|
||||
const G4Element* elm = nullptr;
|
||||
G4int ZZ=1;
|
||||
|
||||
if( elm ) ZZ = elm->GetZ();
|
||||
|
||||
G4double xsc = fTotXsc->GetElementCrossSection(dynParticle, ZZ, material);
|
||||
xsc *= 1.;
|
||||
G4double ccTotRatio = fTotXsc->GetCcTotRatio();
|
||||
|
||||
if( G4UniformRand() < ccTotRatio ) // Cc-model
|
||||
@@ -305,7 +290,7 @@ G4MuNeutrinoNucleusProcess::PostStepDoIt(const G4Track& track, const G4Step& ste
|
||||
G4ExceptionDescription ed;
|
||||
aR.Report(ed);
|
||||
ed << "Call for " << hadi->GetModelName() << G4endl;
|
||||
ed << "Target element "<< elm->GetName()<<" Z= "
|
||||
ed << " Z= "
|
||||
<< targNucleus->GetZ_asInt()
|
||||
<< " A= " << targNucleus->GetA_asInt() << G4endl;
|
||||
DumpState(track,"ApplyYourself",ed);
|
||||
|
||||
@@ -219,8 +219,6 @@ G4NeutrinoElectronProcess::PostStepDoIt(const G4Track& track, const G4Step& step
|
||||
const G4DynamicParticle* aParticle = track.GetDynamicParticle();
|
||||
G4ThreeVector position = pPostStepPoint->GetPosition(), newPosition=position;
|
||||
G4ParticleMomentum direction = aParticle->GetMomentumDirection();
|
||||
G4double startTime = pPostStepPoint->GetGlobalTime();
|
||||
|
||||
|
||||
if( fNuEleCcBias > 1.0 || fNuEleNcBias > 1.0) // = true, if fBiasingfactor != 1., i.e. xsc is biased
|
||||
{
|
||||
@@ -244,16 +242,11 @@ G4NeutrinoElectronProcess::PostStepDoIt(const G4Track& track, const G4Step& step
|
||||
|
||||
G4double range = -backward+G4UniformRand()*distance;
|
||||
|
||||
G4double delta = range - backward;
|
||||
|
||||
startTime += delta/track.GetVelocity();
|
||||
|
||||
newPosition = position + range*direction;
|
||||
|
||||
safetyHelper->ReLocateWithinVolume(newPosition);
|
||||
|
||||
theTotalResult->ProposePosition(newPosition); // G4Exception : GeomNav1002
|
||||
// theTotalResult->ProposeGlobalTime(startTime); // time is updated for 'elastic' only
|
||||
}
|
||||
G4HadProjectile theProj( track );
|
||||
G4HadronicInteraction* hadi = nullptr;
|
||||
@@ -261,7 +254,6 @@ G4NeutrinoElectronProcess::PostStepDoIt(const G4Track& track, const G4Step& step
|
||||
|
||||
// Select element
|
||||
const G4Element* elm = nullptr;
|
||||
G4int ZZ=1;
|
||||
|
||||
try
|
||||
{
|
||||
@@ -277,10 +269,7 @@ G4NeutrinoElectronProcess::PostStepDoIt(const G4Track& track, const G4Step& step
|
||||
G4Exception("G4NeutrinoElectronProcess::PostStepDoIt", "had003",
|
||||
FatalException, ed);
|
||||
}
|
||||
if( elm ) ZZ = elm->GetZ();
|
||||
|
||||
G4double xsc = fTotXsc->GetElementCrossSection(dynParticle, ZZ, material);
|
||||
xsc *= 1.;
|
||||
G4double ccTotRatio = fTotXsc->GetCcRatio();
|
||||
|
||||
if( G4UniformRand() < ccTotRatio ) // Cc-model
|
||||
|
||||
Reference in New Issue
Block a user