Import Geant4 10.6.0.beta source tree
This commit is contained in:
@@ -16,9 +16,12 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
15 March 19: D. Sawkey (xrays-V10-04-06)
|
||||
- G4Cerenkov: increase protection against infinite loops
|
||||
(backport of xrays-V10-05-00)
|
||||
03 April 19: V. Ivanchenko (xrays-V10-05-01)
|
||||
- G4Cerenkov, G4Scintillation, G4SynchrotronRadiation, G4VTransitionRadiation
|
||||
added Register/DeRegister mechnism
|
||||
|
||||
11 March 19: D. Sawkey (xrays-V10-05-00)
|
||||
- G4Cerenkov: increase protection against infinite loops (see xrays-V10-04-04)
|
||||
|
||||
20 September 18: D. Sawkey (xrays-V10-04-05)
|
||||
- G4Cerenkov, G4Scintillation. Reset fNumPhotons to 0 correctly each step.
|
||||
|
||||
@@ -179,8 +179,8 @@ private:
|
||||
|
||||
G4ForwardXrayTR& operator=(const G4ForwardXrayTR& right) = delete;
|
||||
|
||||
// G4int operator==(const G4ForwardXrayTR& right)const;
|
||||
// G4int operator!=(const G4ForwardXrayTR& right)const;
|
||||
// G4bool operator==(const G4ForwardXrayTR& right)const;
|
||||
// G4bool operator!=(const G4ForwardXrayTR& right)const;
|
||||
|
||||
}; // end of G4ForwardXrayTR class ---------------------------
|
||||
|
||||
|
||||
@@ -72,26 +72,6 @@
|
||||
|
||||
#include "G4Cerenkov.hh"
|
||||
|
||||
/////////////////////////
|
||||
// Class Implementation
|
||||
/////////////////////////
|
||||
|
||||
//G4bool G4Cerenkov::fTrackSecondariesFirst = false;
|
||||
//G4double G4Cerenkov::fMaxBetaChange = 0.;
|
||||
//G4int G4Cerenkov::fMaxPhotons = 0;
|
||||
|
||||
//////////////
|
||||
// Operators
|
||||
//////////////
|
||||
|
||||
// G4Cerenkov::operator=(const G4Cerenkov &right)
|
||||
// {
|
||||
// }
|
||||
|
||||
/////////////////
|
||||
// Constructors
|
||||
/////////////////
|
||||
|
||||
G4Cerenkov::G4Cerenkov(const G4String& processName, G4ProcessType type)
|
||||
: G4VProcess(processName, type),
|
||||
fTrackSecondariesFirst(false),
|
||||
@@ -109,14 +89,6 @@ G4Cerenkov::G4Cerenkov(const G4String& processName, G4ProcessType type)
|
||||
}
|
||||
}
|
||||
|
||||
// G4Cerenkov::G4Cerenkov(const G4Cerenkov &right)
|
||||
// {
|
||||
// }
|
||||
|
||||
////////////////
|
||||
// Destructors
|
||||
////////////////
|
||||
|
||||
G4Cerenkov::~G4Cerenkov()
|
||||
{
|
||||
if (thePhysicsTable != nullptr) {
|
||||
@@ -125,20 +97,12 @@ G4Cerenkov::~G4Cerenkov()
|
||||
}
|
||||
}
|
||||
|
||||
////////////
|
||||
// Methods
|
||||
////////////
|
||||
|
||||
G4bool G4Cerenkov::IsApplicable(const G4ParticleDefinition& aParticleType)
|
||||
{
|
||||
G4bool result = false;
|
||||
|
||||
if (aParticleType.GetPDGCharge() != 0.0 &&
|
||||
aParticleType.GetPDGMass() != 0.0 &&
|
||||
aParticleType.GetParticleName() != "chargedgeantino" &&
|
||||
!aParticleType.IsShortLived() ) { result = true; }
|
||||
|
||||
return result;
|
||||
return (aParticleType.GetPDGCharge() != 0.0 &&
|
||||
aParticleType.GetPDGMass() != 0.0 &&
|
||||
aParticleType.GetParticleName() != "chargedgeantino" &&
|
||||
!aParticleType.IsShortLived() ) ? true : false;
|
||||
}
|
||||
|
||||
void G4Cerenkov::SetTrackSecondariesFirst(const G4bool state)
|
||||
|
||||
@@ -76,36 +76,6 @@
|
||||
|
||||
#include "G4Scintillation.hh"
|
||||
|
||||
/////////////////////////
|
||||
// Class Implementation
|
||||
/////////////////////////
|
||||
|
||||
//////////////////////
|
||||
// static data members
|
||||
//////////////////////
|
||||
|
||||
|
||||
//G4bool G4Scintillation::fTrackSecondariesFirst = false;
|
||||
//G4bool G4Scintillation::fFiniteRiseTime = false;
|
||||
//G4double G4Scintillation::fYieldFactor = 1.0;
|
||||
//G4double G4Scintillation::fExcitationRatio = 1.0;
|
||||
//G4bool G4Scintillation::fScintillationByParticleType = false;
|
||||
//G4bool G4Scintillation::fScintillationTrackInfo = false;
|
||||
//G4bool G4Scintillation::fStackingFlag = true;
|
||||
//G4EmSaturation* G4Scintillation::fEmSaturation = NULL;
|
||||
|
||||
//////////////
|
||||
// Operators
|
||||
//////////////
|
||||
|
||||
// G4Scintillation::operator=(const G4Scintillation &right)
|
||||
// {
|
||||
// }
|
||||
|
||||
/////////////////
|
||||
// Constructors
|
||||
/////////////////
|
||||
|
||||
G4Scintillation::G4Scintillation(const G4String& processName,
|
||||
G4ProcessType type)
|
||||
: G4VRestDiscreteProcess(processName, type) ,
|
||||
@@ -134,10 +104,6 @@ G4Scintillation::G4Scintillation(const G4String& processName,
|
||||
}
|
||||
}
|
||||
|
||||
////////////////
|
||||
// Destructors
|
||||
////////////////
|
||||
|
||||
G4Scintillation::~G4Scintillation()
|
||||
{
|
||||
if (fFastIntegralTable != nullptr) {
|
||||
@@ -150,16 +116,10 @@ G4Scintillation::~G4Scintillation()
|
||||
}
|
||||
}
|
||||
|
||||
////////////
|
||||
// Methods
|
||||
////////////
|
||||
|
||||
G4bool G4Scintillation::IsApplicable(const G4ParticleDefinition& aParticleType)
|
||||
{
|
||||
if (aParticleType.GetParticleName() == "opticalphoton") return false;
|
||||
if (aParticleType.IsShortLived()) return false;
|
||||
|
||||
return true;
|
||||
return (aParticleType.GetPDGCharge() == 0.0 ||
|
||||
aParticleType.IsShortLived()) ? false : true;
|
||||
}
|
||||
|
||||
void G4Scintillation::BuildPhysicsTable(const G4ParticleDefinition&)
|
||||
|
||||
@@ -47,6 +47,7 @@
|
||||
#include "G4EmProcessSubType.hh"
|
||||
#include "G4DipBustGenerator.hh"
|
||||
#include "G4Log.hh"
|
||||
#include "G4LossTableManager.hh"
|
||||
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
@@ -68,6 +69,7 @@ G4SynchrotronRadiation::G4SynchrotronRadiation(const G4String& processName,
|
||||
FirstTime1 = true;
|
||||
genAngle = nullptr;
|
||||
SetAngularGenerator(new G4DipBustGenerator());
|
||||
G4LossTableManager::Instance()->Register(this);
|
||||
}
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////
|
||||
@@ -77,7 +79,8 @@ G4SynchrotronRadiation::G4SynchrotronRadiation(const G4String& processName,
|
||||
|
||||
G4SynchrotronRadiation::~G4SynchrotronRadiation()
|
||||
{
|
||||
delete genAngle;
|
||||
delete genAngle;
|
||||
G4LossTableManager::Instance()->DeRegister(this);
|
||||
}
|
||||
|
||||
/////////////////////////////// METHODS /////////////////////////////////
|
||||
|
||||
@@ -41,6 +41,7 @@
|
||||
#include "G4Region.hh"
|
||||
#include "G4TransportationManager.hh"
|
||||
#include "G4EmProcessSubType.hh"
|
||||
#include "G4LossTableManager.hh"
|
||||
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -55,6 +56,7 @@ G4VTransitionRadiation::G4VTransitionRadiation( const G4String& processName,
|
||||
{
|
||||
SetProcessSubType(fTransitionRadiation);
|
||||
Clear();
|
||||
G4LossTableManager::Instance()->Register(this);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
@@ -62,6 +64,7 @@ G4VTransitionRadiation::G4VTransitionRadiation( const G4String& processName,
|
||||
G4VTransitionRadiation::~G4VTransitionRadiation()
|
||||
{
|
||||
Clear();
|
||||
G4LossTableManager::Instance()->DeRegister(this);
|
||||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user