lars/geant4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import Geant4 10.5.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/dna/models/include/G4DNAOneStepThermalizationModel.hh
+40 -7
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4DNAOneStepThermalizationModel.hh 108498 2018-02-15 15:33:07Z gcosmo $
// $Id: G4DNAOneStepThermalizationModel.hh 110873 2018-06-22 13:11:22Z gcosmo $
//
// Author: Mathieu Karamitros
@@ -47,6 +47,7 @@
#ifndef G4DNAOneStepThermalizationModel_hh
#define G4DNAOneStepThermalizationModel_hh
#include <memory>
#include "G4VEmModel.hh"
class G4ITNavigator;
@@ -86,6 +87,21 @@ namespace DNA{
static const double gEnergies_T1990[11];
static const double gStdDev_T1990[11];
};
//-----------------------
/*
* Article: Ritchie RH, Hamm RN, Turner JE, Bolch WE (1994) Interaction of
* low-energy electrons with condensed matter: relevance for track
* structure.
* Computational approaches in molecular radiation biology, Plenum,
* New York, Vol. 63, pp. 155–166
* Note: also used in Ballarini et al., 2000
*/
struct Ritchie1994{
static void GetPenetration(G4double energy,
G4ThreeVector& displacement);
static double GetRmean(double energy);
};
}
}
@@ -102,7 +118,7 @@ class G4TDNAOneStepThermalizationModel : public G4VEmModel
public:
typedef MODEL Model;
G4TDNAOneStepThermalizationModel(const G4ParticleDefinition* p = 0,
const G4String& nam =
const G4String& nam =
"DNAOneStepThermalizationModel");
virtual ~G4TDNAOneStepThermalizationModel();
@@ -123,19 +139,19 @@ public:
inline void SetVerbose(int flag){
fVerboseLevel = flag;
}
void GetPenetration(G4double energy,
G4ThreeVector& displacement);
double GetRmean(double energy);
protected:
const std::vector<G4double>* fpWaterDensity;
G4ParticleChangeForGamma* fParticleChangeForGamma;
G4ParticleChangeForGamma* fpParticleChangeForGamma;
G4bool fIsInitialised;
G4int fVerboseLevel;
G4Navigator* fNavigator;
std::unique_ptr<G4Navigator> fpNavigator;
private:
G4TDNAOneStepThermalizationModel&
@@ -151,4 +167,21 @@ typedef G4TDNAOneStepThermalizationModel<DNA::Penetration::Meesungnoen2002> G4DN
// Note: if you use the above distribution, it would be
// better to follow the electrons down to 6 eV and only then apply
// the one step thermalization
class G4DNASolvationModelFactory
{
public:
/// @param penetrationType Available options:
/// Meesungnoen2002, Terrisol1990, Ritchie1994
static G4VEmModel* Create(const G4String& penetrationModel);
/// \brief One step thermalization model can be chosen via macro using
/// /process/dna/e-SolvationSubType Ritchie1994
/// \return Create the model defined via the command macro
/// /process/dna/e-SolvationSubType
/// In case the command is unused, it returns the default model set in
/// G4EmParameters.
static G4VEmModel* GetMacroDefinedModel();
};
#endif
source/processes/electromagnetic/dna/models/include/G4DNAOneStepThermalizationModel.hpp
+14 -19
View File
@@ -54,16 +54,15 @@
template<typename MODEL>
G4TDNAOneStepThermalizationModel<MODEL>::
G4TDNAOneStepThermalizationModel(const G4ParticleDefinition*,
const G4String& nam) :
const G4String& nam) :
G4VEmModel(nam), fIsInitialised(false)
{
fVerboseLevel = 0;
SetLowEnergyLimit(0.);
G4DNAWaterExcitationStructure exStructure;
SetHighEnergyLimit(exStructure.ExcitationEnergy(0));
fParticleChangeForGamma = 0;
fpParticleChangeForGamma = 0;
fpWaterDensity = 0;
fNavigator = 0;
}
//------------------------------------------------------------------------------
@@ -71,12 +70,8 @@ G4VEmModel(nam), fIsInitialised(false)
template<typename MODEL>
G4TDNAOneStepThermalizationModel<MODEL>::~G4TDNAOneStepThermalizationModel()
{
if(fNavigator)
{
// if(fNavigator->GetNavigatorState())
// delete fNavigator->GetNavigatorState();
delete fNavigator;
}
// if(fpNavigator && fpNavigator->GetNavigatorState())
// delete fpNavigator->GetNavigatorState();
}
//------------------------------------------------------------------------------
@@ -104,19 +99,19 @@ Initialise(const G4ParticleDefinition* particleDefinition,
if(!fIsInitialised)
{
fIsInitialised = true;
fParticleChangeForGamma = GetParticleChangeForGamma();
fpParticleChangeForGamma = GetParticleChangeForGamma();
}
G4Navigator* navigator =
G4TransportationManager::GetTransportationManager()->
GetNavigatorForTracking();
fNavigator = new G4Navigator();
fpNavigator.reset(new G4Navigator());
if(navigator){ // add these checks for testing mode
auto world=navigator->GetWorldVolume();
if(world){
fNavigator->SetWorldVolume(world);
fpNavigator->SetWorldVolume(world);
//fNavigator->NewNavigatorState();
}
}
@@ -188,8 +183,8 @@ SampleSecondaries(std::vector<G4DynamicParticle*>*,
if (k <= HighEnergyLimit())
{
fParticleChangeForGamma->ProposeTrackStatus(fStopAndKill);
fParticleChangeForGamma->ProposeLocalEnergyDeposit(k);
fpParticleChangeForGamma->ProposeTrackStatus(fStopAndKill);
fpParticleChangeForGamma->ProposeLocalEnergyDeposit(k);
if(G4DNAChemistryManager::IsActivated())
{
@@ -198,10 +193,10 @@ SampleSecondaries(std::vector<G4DynamicParticle*>*,
//______________________________________________________________
const G4Track * theIncomingTrack =
fParticleChangeForGamma->GetCurrentTrack();
fpParticleChangeForGamma->GetCurrentTrack();
G4ThreeVector finalPosition(theIncomingTrack->GetPosition()+displacement);
fNavigator->SetWorldVolume(theIncomingTrack->GetTouchable()->
fpNavigator->SetWorldVolume(theIncomingTrack->GetTouchable()->
GetVolume(theIncomingTrack->GetTouchable()->
GetHistoryDepth()));
@@ -229,12 +224,12 @@ SampleSecondaries(std::vector<G4DynamicParticle*>*,
// }
//--
fNavigator->ResetHierarchyAndLocate(theIncomingTrack->GetPosition(),
fpNavigator->ResetHierarchyAndLocate(theIncomingTrack->GetPosition(),
direction,
*((G4TouchableHistory*)
theIncomingTrack->GetTouchable()));
fNavigator->ComputeStep(theIncomingTrack->GetPosition(),
fpNavigator->ComputeStep(theIncomingTrack->GetPosition(),
displacement/displacementMag,
displacementMag,
safety);
@@ -248,7 +243,7 @@ SampleSecondaries(std::vector<G4DynamicParticle*>*,
G4DNAChemistryManager::Instance()->CreateSolvatedElectron(theIncomingTrack,
&finalPosition);
fParticleChangeForGamma->SetProposedKineticEnergy(25.e-3*eV);
fpParticleChangeForGamma->SetProposedKineticEnergy(25.e-3*eV);
}
}
}