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
examples/extended/electromagnetic/TestEm7/src/G4ScreenedNuclearRecoil.cc
+7 -9
View File
@@ -26,7 +26,7 @@
/// \file electromagnetic/TestEm7/src/G4ScreenedNuclearRecoil.cc
/// \brief Implementation of the G4ScreenedNuclearRecoil class
//
// $Id: G4ScreenedNuclearRecoil.cc 91266 2015-06-29 06:48:42Z gcosmo $
// $Id: G4ScreenedNuclearRecoil.cc 110821 2018-06-15 12:53:27Z gcosmo $
//
//
// Class Description
@@ -999,7 +999,7 @@ void G4NativeScreenedCoulombCrossSection::LoadData(G4String screeningKey,
G4double recoilCutoff)
{
static const size_t sigLen=200;
// since sigma doesn't matter much, a very coarse table will do
// since sigma doesn't matter much, a very coarse table will do
G4DataVector energies(sigLen);
G4DataVector data(sigLen);
@@ -1007,9 +1007,6 @@ void G4NativeScreenedCoulombCrossSection::LoadData(G4String screeningKey,
// use standardized values for mass for building tables
const G4MaterialTable* materialTable = G4Material::GetMaterialTable();
if (materialTable == 0) { return; }
//G4Exception("mhmNativeCrossSection::LoadData - no MaterialTable found)");
G4int nMaterials = G4Material::GetNumberOfMaterials();
for (G4int im=0; im<nMaterials; im++)
@@ -1068,7 +1065,7 @@ void G4NativeScreenedCoulombCrossSection::LoadData(G4String screeningKey,
// this will be phi(x)/(x*eps) when c2eps is correctly set
x0func->set_domain(1e-6*angstrom/au, 0.9999*screen->xmax()/au);
// needed for inverse function
// use the c2_inverse_function interface for the root finder...
// use the c2_inverse_function interface for the root finder
// it is more efficient for an ordered
// computation of values.
G4_c2_ptr x0_solution(c2.inverse_function(x0func));
@@ -1114,9 +1111,10 @@ void G4NativeScreenedCoulombCrossSection::LoadData(G4String screeningKey,
G4double x0=0;
try {
x0=x0_solution(2*q-q*q);
} catch(c2_exception e) {
//G4Exception(G4String("G4ScreenedNuclearRecoil: failure
//in inverse solution to generate MFP Tables: ")+e.what());
} catch(c2_exception& e) {
G4Exception("G4ScreenedNuclearRecoil::LoadData",
"em0003",FatalException,
"failure in inverse solution to generate MFP tables");
}
G4double betasquared=x0*x0 - x0*phiau(x0)/eps;
G4double sigma=pi*betasquared*au*au;
examples/extended/electromagnetic/TestEm7/src/SteppingAction.cc
+2 -1
View File
@@ -26,7 +26,7 @@
/// \file electromagnetic/TestEm7/src/SteppingAction.cc
/// \brief Implementation of the SteppingAction class
//
// $Id: SteppingAction.cc 101250 2016-11-10 08:54:02Z gcosmo $
// $Id: SteppingAction.cc 110643 2018-06-04 16:49:29Z gcosmo $
//
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
@@ -86,6 +86,7 @@ void SteppingAction::UserSteppingAction(const G4Step* step)
G4double x2 = postPoint->GetPosition().x() + xmax*0.5;
if(x1 >= 0.0 && x2 <= xmax) {
G4double x = x1 + G4UniformRand()*(x2-x1);
if (step->GetTrack()->GetDefinition()->GetPDGCharge() == 0.) x = x2;
G4AnalysisManager* analysisManager = G4AnalysisManager::Instance();
analysisManager->FillH1(1, x, edep);
analysisManager->FillH1(2, x, edep);