Import Geant4 10.1.0 source tree
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
$Id: History 71228 2013-06-12 12:53:45Z gcosmo $
|
||||
$Id: History 79343 2014-02-24 11:44:06Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -16,7 +16,17 @@ committal in the CVS repository !
|
||||
----------------------------------------------------------
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
- Feb. 22, 14 H.Kurashige (decay-V10-00-02)
|
||||
- Fix the bug of assigning DBL_MAX for stable particle life time
|
||||
(Bug #1569)
|
||||
|
||||
- Feb. 21, 14 J.Apostolakis (decay-V10-00-01) corrected bug # below.
|
||||
|
||||
- Jan. 04, 14 H.Kurashige (decay-V10-00-00)
|
||||
- Fix the bug of wrong global time for secondaries
|
||||
in case that the primary track stops during along step
|
||||
(Bug #1555)
|
||||
|
||||
- Jun. 11, 13 M.Asai (decay-V09-06-01)
|
||||
- Remove the modification in the previous tag, as it is no longer needed as all ions
|
||||
are generated after GenericIon gets the collect process manager.
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Decay.hh 71045 2013-06-10 09:34:33Z gcosmo $
|
||||
// $Id: G4Decay.hh 78547 2014-01-07 09:40:38Z gcosmo $
|
||||
//
|
||||
//
|
||||
// ------------------------------------------------------------
|
||||
@@ -196,14 +196,6 @@ inline
|
||||
return DecayIt(aTrack, aStep);
|
||||
}
|
||||
|
||||
inline
|
||||
G4VParticleChange* G4Decay::PostStepDoIt(
|
||||
const G4Track& aTrack,
|
||||
const G4Step& aStep
|
||||
)
|
||||
{
|
||||
return DecayIt(aTrack, aStep);
|
||||
}
|
||||
|
||||
inline
|
||||
const G4VExtDecayer* G4Decay::GetExtDecayer() const
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4Decay.cc 71228 2013-06-12 12:53:45Z gcosmo $
|
||||
// $Id: G4Decay.cc 79343 2014-02-24 11:44:06Z gcosmo $
|
||||
//
|
||||
//
|
||||
// --------------------------------------------------------------
|
||||
@@ -111,7 +111,8 @@ G4double G4Decay::GetMeanLifeTime(const G4Track& aTrack ,
|
||||
|
||||
// check if the particle is stable?
|
||||
if (aParticleDef->GetPDGStable()) {
|
||||
meanlife = DBL_MAX;
|
||||
//1000000 times the life time of the universe
|
||||
meanlife = 1e24 * s;
|
||||
|
||||
} else {
|
||||
meanlife = aLife;
|
||||
@@ -295,7 +296,6 @@ G4VParticleChange* G4Decay::DecayIt(const G4Track& aTrack, const G4Step& )
|
||||
// PostStep case
|
||||
if (!isExtDecayer) products->Boost( ParentEnergy, ParentDirection);
|
||||
}
|
||||
|
||||
// set polarization for daughter particles
|
||||
DaughterPolarization(aTrack, products);
|
||||
|
||||
@@ -374,7 +374,6 @@ G4double G4Decay::PostStepGetPhysicalInteractionLength(
|
||||
G4ForceCondition* condition
|
||||
)
|
||||
{
|
||||
|
||||
// condition is set to "Not Forced"
|
||||
*condition = NotForced;
|
||||
|
||||
@@ -407,6 +406,7 @@ G4double G4Decay::PostStepGetPhysicalInteractionLength(
|
||||
G4double value;
|
||||
if (currentInteractionLength <DBL_MAX) {
|
||||
value = theNumberOfInteractionLengthLeft * currentInteractionLength;
|
||||
//fRemainderLifeTime = theNumberOfInteractionLengthLeft*aLife;
|
||||
} else {
|
||||
value = DBL_MAX;
|
||||
}
|
||||
@@ -464,3 +464,18 @@ void G4Decay::SetExtDecayer(G4VExtDecayer* val)
|
||||
SetProcessSubType(static_cast<int>(DECAY_External));
|
||||
}
|
||||
}
|
||||
|
||||
G4VParticleChange* G4Decay::PostStepDoIt(
|
||||
const G4Track& aTrack,
|
||||
const G4Step& aStep
|
||||
)
|
||||
{
|
||||
if ( (aTrack.GetTrackStatus() == fStopButAlive ) ||
|
||||
(aTrack.GetTrackStatus() == fStopAndKill ) ){
|
||||
fParticleChangeForDecay.Initialize(aTrack);
|
||||
return &fParticleChangeForDecay;
|
||||
} else {
|
||||
return DecayIt(aTrack, aStep);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user