Import Geant4 1.1.0 source tree
This commit is contained in:
@@ -5,8 +5,8 @@
|
||||
// based on the Program) you indicate your acceptance of this statement,
|
||||
// and all its terms.
|
||||
//
|
||||
// $Id: G4ParameterisedNavigation.icc,v 1.1.10.1 1999/12/07 20:48:41 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-00 $
|
||||
// $Id: G4ParameterisedNavigation.icc,v 1.2 1999/12/15 14:50:23 gunter Exp $
|
||||
// GEANT4 tag $Name: geant4-01-01 $
|
||||
//
|
||||
//
|
||||
// class G4ParameterisedNavigation Inline implementation
|
||||
@@ -70,7 +70,7 @@ inline G4double G4ParameterisedNavigation::ComputeVoxelSafety(const G4ThreeVecto
|
||||
plusVoxelSafety= minCurNodeNoDelta*fVoxelSliceWidth+minCurCommonDelta;
|
||||
minusVoxelSafety=maxCurNodeNoDelta*fVoxelSliceWidth+maxCurCommonDelta;
|
||||
|
||||
voxelSafety= min(plusVoxelSafety,minusVoxelSafety);
|
||||
voxelSafety= G4std::min(plusVoxelSafety,minusVoxelSafety);
|
||||
|
||||
if (voxelSafety<0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user