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

Import Geant4 4.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 16:18:25 +02:00
parent 36c080dca6
commit 921d3b1cda
3990 changed files with 185376 additions and 82884 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/processes/electromagnetic/xrays/src/G4Scintillation.cc
+7 -10
View File
@@ -21,8 +21,8 @@
// ********************************************************************
//
//
// $Id: G4Scintillation.cc,v 1.5.4.1 2001/06/28 19:12:50 gunter Exp $
// GEANT4 tag $Name: $
// $Id: G4Scintillation.cc,v 1.8 2001/11/07 17:07:41 radoone Exp $
// GEANT4 tag $Name: geant4-04-00 $
//
////////////////////////////////////////////////////////////////////////
// Scintillation Light Class Implementation
@@ -36,6 +36,7 @@
// Updated: 2000-09-18 by Peter Gumplinger
// > change: aSecondaryPosition=x0+rand*aStep.GetDeltaPosition();
// aSecondaryTrack->SetTouchable(0);
// 2001-09-17, migration of Materials to pure STL (mma)
//
// mail: gum@triumf.ca
//
@@ -156,11 +157,7 @@ G4Scintillation::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
////////////////////////////////////////////////////////////////
G4double Pmin = Intensity->GetMinPhotonMomentum();
G4double Pmax = Intensity->GetMaxPhotonMomentum();
G4double dp = Pmax - Pmin;
G4int materialIndex = G4Material::GetMaterialTable()->index(aMaterial);
G4int materialIndex = aMaterial->GetIndex();
// Retrieve the Scintillation Integral for this material
// new G4PhysicsOrderedFreeVector allocated to hold CII's
@@ -252,7 +249,7 @@ G4Scintillation::PostStepDoIt(const G4Track& aTrack, const G4Step& aStep)
G4Track* aSecondaryTrack =
new G4Track(aScintillationPhoton,aSecondaryTime,aSecondaryPosition);
aSecondaryTrack->SetTouchable(0);
aSecondaryTrack->SetTouchableHandle((G4VTouchable*)0);
aSecondaryTrack->SetParentID(aTrack.GetTrackID());
@@ -278,7 +275,7 @@ void G4Scintillation::BuildThePhysicsTable()
const G4MaterialTable* theMaterialTable =
G4Material::GetMaterialTable();
G4int numOfMaterials = theMaterialTable->length();
G4int numOfMaterials = G4Material::GetNumberOfMaterials();
// create new physics table
@@ -295,7 +292,7 @@ void G4Scintillation::BuildThePhysicsTable()
// for the material from the material's optical
// properties table
G4Material* aMaterial = (*theMaterialTable)(i);
G4Material* aMaterial = (*theMaterialTable)[i];
G4MaterialPropertiesTable* aMaterialPropertiesTable =
aMaterial->GetMaterialPropertiesTable();