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

Import Geant4 3.0.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:55:53 +02:00
parent e7d7193284
commit cfcb558cfe
3050 changed files with 91703 additions and 48310 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/volumes/include/G4NormalNavigation.icc
+4 -5
View File
@@ -5,8 +5,8 @@
// based on the Program) you indicate your acceptance of this statement,
// and all its terms.
//
// $Id: G4NormalNavigation.icc,v 1.2 1999/12/15 14:50:23 gunter Exp $
// GEANT4 tag $Name: geant4-02-00 $
// $Id: G4NormalNavigation.icc,v 1.3 2000/11/20 18:59:40 gcosmo Exp $
// GEANT4 tag $Name: geant4-03-00 $
//
//
// G4NormalNavigation Inline Implementation
@@ -39,8 +39,6 @@ inline G4bool G4NormalNavigation::LevelLocate(G4NavigationHistory &history,
samplePhysical=targetLogical->GetDaughter(sampleNo);
if (samplePhysical!=blockedVol)
{
EInside sampleInside;
// Setup volume with mother ptr
samplePhysical->Setup(targetPhysical);
history.NewLevel(samplePhysical, kNormal, samplePhysical->GetCopyNo());
@@ -62,7 +60,8 @@ inline G4bool G4NormalNavigation::LevelLocate(G4NavigationHistory &history,
history.BackLevel();
}
#else
sampleInside= sampleSolid->Inside(samplePoint);
EInside sampleInside = sampleSolid->Inside(samplePoint);
if( sampleInside == kOutside)
{
history.BackLevel();