Import Geant4 10.4.0.beta source tree
This commit is contained in:
@@ -34,32 +34,29 @@
|
||||
#include "G4ParticleChangeForGamma.hh"
|
||||
#include "G4LPhysicsFreeVector.hh"
|
||||
#include "G4ProductionCutsTable.hh"
|
||||
#include "G4Log.hh"
|
||||
|
||||
class G4BoldyshevTripletModel : public G4VEmModel
|
||||
{
|
||||
|
||||
public:
|
||||
|
||||
G4BoldyshevTripletModel(const G4ParticleDefinition* p = 0, const G4String& nam = "BoldyshevTripletConversion");
|
||||
explicit G4BoldyshevTripletModel(const G4ParticleDefinition* p = nullptr,
|
||||
const G4String& nam = "BoldyshevTripletConversion");
|
||||
|
||||
virtual ~G4BoldyshevTripletModel();
|
||||
|
||||
virtual void Initialise(const G4ParticleDefinition*,
|
||||
const G4DataVector&);
|
||||
|
||||
//MT
|
||||
virtual void InitialiseLocal(const G4ParticleDefinition*,
|
||||
G4VEmModel* masterModel);
|
||||
|
||||
virtual void InitialiseForElement(const G4ParticleDefinition*, G4int Z);
|
||||
//END MT
|
||||
|
||||
virtual G4double ComputeCrossSectionPerAtom(
|
||||
const G4ParticleDefinition*,
|
||||
G4double kinEnergy,
|
||||
G4double Z,
|
||||
G4double A=0,
|
||||
G4double cut=0,
|
||||
G4double A=0.,
|
||||
G4double cut=0.,
|
||||
G4double emax=DBL_MAX);
|
||||
|
||||
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
|
||||
@@ -74,49 +71,30 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
void ReadData(size_t Z, const char* path = 0);
|
||||
void ReadData(size_t Z, const char* path = nullptr);
|
||||
|
||||
G4double ScreenFunction1(G4double screenVariable);
|
||||
G4double ScreenFunction2(G4double screenVariable);
|
||||
|
||||
G4BoldyshevTripletModel & operator=(const G4BoldyshevTripletModel &right);
|
||||
G4BoldyshevTripletModel(const G4BoldyshevTripletModel&);
|
||||
G4BoldyshevTripletModel & operator=(const G4BoldyshevTripletModel &right) = delete;
|
||||
G4BoldyshevTripletModel(const G4BoldyshevTripletModel&) = delete;
|
||||
|
||||
G4bool isInitialised;
|
||||
G4int verboseLevel;
|
||||
|
||||
G4double lowEnergyLimit;
|
||||
G4double smallEnergy;
|
||||
G4double energyThreshold;
|
||||
G4double momentumThreshold_c;
|
||||
G4double xb;
|
||||
G4double xn;
|
||||
|
||||
//MT
|
||||
static G4int maxZ;
|
||||
static G4LPhysicsFreeVector* data[100]; // 100 because Z range is 1-99
|
||||
// in LivermoreRayleighModel, 101
|
||||
// because Z range is 1-100
|
||||
//END MT
|
||||
|
||||
G4ParticleChangeForGamma* fParticleChange;
|
||||
|
||||
G4double asinh (G4double value);
|
||||
|
||||
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline G4double G4BoldyshevTripletModel::asinh (G4double value)
|
||||
{
|
||||
G4double out;
|
||||
|
||||
if (value>0)
|
||||
out = std::log(value+std::sqrt(value*value+1));
|
||||
else
|
||||
out = -std::log(-value+std::sqrt(value*value+1));
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4Generator2BS.hh 66241 2012-12-13 18:34:42Z gunter $
|
||||
// $Id: G4Generator2BS.hh 104410 2017-05-30 07:17:09Z gcosmo $
|
||||
//
|
||||
// -------------------------------------------------------------------
|
||||
//
|
||||
@@ -58,6 +58,7 @@
|
||||
#include "G4ios.hh"
|
||||
#include "globals.hh"
|
||||
#include "G4VEmAngularDistribution.hh"
|
||||
#include "G4Log.hh"
|
||||
|
||||
class G4Pow;
|
||||
|
||||
@@ -66,14 +67,14 @@ class G4Generator2BS : public G4VEmAngularDistribution
|
||||
|
||||
public:
|
||||
|
||||
G4Generator2BS(const G4String& name="");
|
||||
explicit G4Generator2BS(const G4String& name="");
|
||||
|
||||
virtual ~G4Generator2BS();
|
||||
|
||||
virtual G4ThreeVector& SampleDirection(const G4DynamicParticle* dp,
|
||||
G4double out_energy,
|
||||
G4int Z,
|
||||
const G4Material* mat = 0);
|
||||
const G4Material* mat = nullptr);
|
||||
|
||||
void PrintGeneratorInformation() const;
|
||||
|
||||
@@ -84,8 +85,8 @@ protected:
|
||||
private:
|
||||
|
||||
// hide assignment operator
|
||||
G4Generator2BS & operator=(const G4Generator2BS &right);
|
||||
G4Generator2BS(const G4Generator2BS&);
|
||||
G4Generator2BS & operator=(const G4Generator2BS &right)= delete;
|
||||
G4Generator2BS(const G4Generator2BS&) = delete;
|
||||
|
||||
G4double fz;
|
||||
G4double ratio;
|
||||
@@ -102,7 +103,7 @@ inline G4double G4Generator2BS::RejectionFunction(G4double y) const
|
||||
{
|
||||
G4double y2 = (1 + y)*(1 + y);
|
||||
G4double x = 4*y*ratio/y2;
|
||||
return 4*x - ratio1 - (ratio2 - x)*std::log(delta + fz/y2);
|
||||
return 4*x - ratio1 - (ratio2 - x)*G4Log(delta + fz/y2);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
+46
-26
@@ -32,38 +32,37 @@
|
||||
#define G4LivermoreGammaConversionModel_h 1
|
||||
|
||||
#include "G4VEmModel.hh"
|
||||
#include "G4Electron.hh"
|
||||
#include "G4Positron.hh"
|
||||
#include "G4ParticleChangeForGamma.hh"
|
||||
#include "G4LPhysicsFreeVector.hh"
|
||||
#include "G4ProductionCutsTable.hh"
|
||||
#include "G4Log.hh"
|
||||
|
||||
class G4ParticleChangeForGamma;
|
||||
class G4LPhysicsFreeVector;
|
||||
class G4PhysicsLogVector;
|
||||
|
||||
class G4LivermoreGammaConversionModel : public G4VEmModel
|
||||
{
|
||||
|
||||
public:
|
||||
|
||||
G4LivermoreGammaConversionModel(const G4ParticleDefinition* p = 0,
|
||||
const G4String& nam = "LivermoreConversion");
|
||||
explicit G4LivermoreGammaConversionModel(
|
||||
const G4ParticleDefinition* p = nullptr,
|
||||
const G4String& nam = "LivermoreConversion");
|
||||
|
||||
virtual ~G4LivermoreGammaConversionModel();
|
||||
|
||||
virtual void Initialise(const G4ParticleDefinition*,
|
||||
const G4DataVector&);
|
||||
|
||||
//MT
|
||||
virtual void InitialiseLocal(const G4ParticleDefinition*,
|
||||
G4VEmModel* masterModel);
|
||||
|
||||
virtual void InitialiseForElement(const G4ParticleDefinition*, G4int Z);
|
||||
//END MT
|
||||
|
||||
virtual G4double ComputeCrossSectionPerAtom(
|
||||
const G4ParticleDefinition*,
|
||||
G4double kinEnergy,
|
||||
G4double Z,
|
||||
G4double A=0,
|
||||
G4double cut=0,
|
||||
G4double A=0.0,
|
||||
G4double cut=0.0,
|
||||
G4double emax=DBL_MAX);
|
||||
|
||||
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
|
||||
@@ -78,31 +77,52 @@ public:
|
||||
|
||||
private:
|
||||
|
||||
void ReadData(size_t Z, const char* path = 0);
|
||||
void ReadData(size_t Z, const char* path = nullptr);
|
||||
void InitialiseProbability(const G4ParticleDefinition*, G4int Z);
|
||||
|
||||
G4double ScreenFunction1(G4double screenVariable);
|
||||
G4double ScreenFunction2(G4double screenVariable);
|
||||
inline G4double ScreenFunction1(G4double screenVariable);
|
||||
inline G4double ScreenFunction2(G4double screenVariable);
|
||||
|
||||
G4LivermoreGammaConversionModel & operator=(const G4LivermoreGammaConversionModel &right);
|
||||
G4LivermoreGammaConversionModel(const G4LivermoreGammaConversionModel&);
|
||||
G4LivermoreGammaConversionModel & operator=
|
||||
(const G4LivermoreGammaConversionModel &right) = delete;
|
||||
G4LivermoreGammaConversionModel(const G4LivermoreGammaConversionModel&) = delete;
|
||||
|
||||
G4bool isInitialised;
|
||||
G4int verboseLevel;
|
||||
|
||||
G4double lowEnergyLimit;
|
||||
G4double smallEnergy;
|
||||
static G4double lowEnergyLimit;
|
||||
static G4double tripletLowEnergy;
|
||||
static G4double tripletHighEnergy;
|
||||
|
||||
//MT
|
||||
static G4int verboseLevel;
|
||||
static G4int nbinsTriplet;
|
||||
static G4int maxZ;
|
||||
|
||||
static G4LPhysicsFreeVector* data[100]; // 100 because Z range is 1-99
|
||||
// in LivermoreRayleighModel, 101
|
||||
// because Z range is 1-100
|
||||
//END MT
|
||||
static G4PhysicsLogVector* probTriplet[100]; //
|
||||
|
||||
G4ParticleChangeForGamma* fParticleChange;
|
||||
|
||||
};
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline G4double
|
||||
G4LivermoreGammaConversionModel::ScreenFunction1(G4double screenVariable)
|
||||
{
|
||||
// Compute the value of the screening function 3*phi1 - phi2
|
||||
return (screenVariable > 1.)
|
||||
? 42.24 - 8.368 * G4Log(screenVariable + 0.952)
|
||||
: 42.392 - screenVariable * (7.796 - 1.961 * screenVariable);
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
inline G4double
|
||||
G4LivermoreGammaConversionModel::ScreenFunction2(G4double screenVariable)
|
||||
{
|
||||
// Compute the value of the screening function 1.5*phi1 - 0.5*phi2
|
||||
return (screenVariable > 1.)
|
||||
? 42.24 - 8.368 * G4Log(screenVariable + 0.952)
|
||||
: 41.405 - screenVariable * (5.828 - 0.8945 * screenVariable);
|
||||
}
|
||||
|
||||
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo....
|
||||
|
||||
#endif
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
// * acceptance of all terms of the Geant4 Software license. *
|
||||
// ********************************************************************
|
||||
//
|
||||
// $Id: G4LivermorePhotoElectricModel.hh 79446 2014-02-28 14:29:47Z gcosmo $
|
||||
// $Id: G4LivermorePhotoElectricModel.hh 104410 2017-05-30 07:17:09Z gcosmo $
|
||||
//
|
||||
// Author: Sebastien Incerti
|
||||
// 30 October 2008
|
||||
@@ -68,8 +68,8 @@ public:
|
||||
const G4ParticleDefinition*,
|
||||
G4double energy,
|
||||
G4double Z,
|
||||
G4double A=0,
|
||||
G4double cut=0,
|
||||
G4double A=0.,
|
||||
G4double cut=0.,
|
||||
G4double emax=DBL_MAX);
|
||||
|
||||
virtual void SampleSecondaries(std::vector<G4DynamicParticle*>*,
|
||||
@@ -89,7 +89,7 @@ protected:
|
||||
|
||||
private:
|
||||
|
||||
void ReadData(G4int Z, const char* path = 0);
|
||||
void ReadData(G4int Z, const char* path = nullptr);
|
||||
|
||||
G4LivermorePhotoElectricModel & operator=(const G4LivermorePhotoElectricModel &right);
|
||||
G4LivermorePhotoElectricModel(const G4LivermorePhotoElectricModel&);
|
||||
|
||||
@@ -58,9 +58,15 @@
|
||||
// | -------- |
|
||||
// | |
|
||||
// | Jan. 2015 JMCB - 1st Version based on G4LowEPComptonModel |
|
||||
// | Feb. 2016 JMCB - Geant4 10.2 FPE fix for bug 1676 |
|
||||
// | Nov. 2016 JMCB - Polarisation tracking fix in collaboration |
|
||||
// | of Dr. Merlin Reynaard Kole, |
|
||||
// | University of Geneva |
|
||||
// | |
|
||||
// *********************************************************************
|
||||
|
||||
|
||||
|
||||
#ifndef G4LowEPPolarizedComptonModel_h
|
||||
#define G4LowEPPolarizedComptonModel_h 1
|
||||
|
||||
@@ -131,6 +137,13 @@ private:
|
||||
G4double phi, G4double cosTheta);
|
||||
G4double SetPhi(G4double, G4double);
|
||||
|
||||
void SystemOfRefChange(G4ThreeVector& direction0, G4ThreeVector& direction1,
|
||||
G4ThreeVector& polarization0, G4ThreeVector& polarization1);
|
||||
|
||||
void SystemOfRefChangeElect(G4ThreeVector& pdirection, G4ThreeVector& edirection,
|
||||
G4ThreeVector& ppolarization);
|
||||
|
||||
|
||||
G4ThreeVector SetPerpendicularVector(G4ThreeVector& a);
|
||||
G4bool isInitialised;
|
||||
G4int verboseLevel;
|
||||
|
||||
Reference in New Issue
Block a user