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

Import Geant4 1.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-08 15:34:16 +02:00
parent ca1c8cb059
commit 103bda00c8
2654 changed files with 29719 additions and 20203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/Boolean/src/G4IntersectionSolid.cc
+8 -8
View File
@@ -87,8 +87,8 @@ G4IntersectionSolid::CalculateExtent(const EAxis pAxis,
retA= fPtrSolidA->CalculateExtent( pAxis, pVoxelLimit, pTransform, minA, maxA);
retB= fPtrSolidB->CalculateExtent( pAxis, pVoxelLimit, pTransform, minB, maxB);
pMin = max( minA, minB );
pMax = min( maxA, maxB );
pMin = G4std::max( minA, minB );
pMax = G4std::min( maxA, maxB );
return retA && retB ; // It exists in this slice only if both exist in it.
}
@@ -317,7 +317,7 @@ G4IntersectionSolid::DistanceToIn( const G4ThreeVector& p) const
}
else
{
dist = min(fPtrSolidA->DistanceToIn(p),
dist = G4std::min(fPtrSolidA->DistanceToIn(p),
fPtrSolidB->DistanceToIn(p) ) ;
}
}
@@ -341,10 +341,10 @@ G4IntersectionSolid::DistanceToOut( const G4ThreeVector& p,
}
G4double distA = fPtrSolidA->DistanceToOut(p,v,calcNorm,validNorm,n) ;
G4double distB = fPtrSolidB->DistanceToOut(p,v,calcNorm,validNorm,n) ;
G4double dist = min(distA,distB) ;
G4double dist = G4std::min(distA,distB) ;
return dist ;
// return min(fPtrSolidA->DistanceToOut(p,v,calcNorm,validNorm,n),
// fPtrSolidB->DistanceToOut(p,v,calcNorm,validNorm,n) ) ;
// return G4std::min(fPtrSolidA->DistanceToOut(p,v,calcNorm,validNorm,n),
// fPtrSolidB->DistanceToOut(p,v,calcNorm,validNorm,n) ) ;
}
//////////////////////////////////////////////////////////////
@@ -360,8 +360,8 @@ G4IntersectionSolid::DistanceToOut( const G4ThreeVector& p ) const
}
return min(fPtrSolidA->DistanceToOut(p),
fPtrSolidB->DistanceToOut(p) ) ;
return G4std::min(fPtrSolidA->DistanceToOut(p),
fPtrSolidB->DistanceToOut(p) ) ;
}
source/geometry/solids/Boolean/src/G4SubtractionSolid.cc
+1 -1
View File
@@ -306,7 +306,7 @@ G4SubtractionSolid::DistanceToOut( const G4ThreeVector& p ) const
}
else
{
dist= min(fPtrSolidA->DistanceToOut(p),
dist= G4std::min(fPtrSolidA->DistanceToOut(p),
fPtrSolidB->DistanceToIn(p) ) ;
}
return dist;
source/geometry/solids/Boolean/src/G4UnionSolid.cc
+6 -6
View File
@@ -89,8 +89,8 @@ G4UnionSolid::CalculateExtent(const EAxis pAxis,
touchesA= fPtrSolidA->CalculateExtent( pAxis, pVoxelLimit, pTransform, minA, maxA);
touchesB= fPtrSolidB->CalculateExtent( pAxis, pVoxelLimit, pTransform, minB, maxB);
pMin = min( minA, minB );
pMax = max( maxA, maxB );
pMin = G4std::min( minA, minB );
pMax = G4std::max( maxA, maxB );
return touchesA || touchesB ; // It exists in this slice if either one does.
}
@@ -169,8 +169,8 @@ G4UnionSolid::DistanceToIn( const G4ThreeVector& p,
{
G4Exception("Invalid call in G4IntersectionSolid::DistanceToIn(p,v), point p is inside") ;
}
return min(fPtrSolidA->DistanceToIn(p,v),
fPtrSolidB->DistanceToIn(p,v) ) ;
return G4std::min(fPtrSolidA->DistanceToIn(p,v),
fPtrSolidB->DistanceToIn(p,v) ) ;
}
////////////////////////////////////////////////////////
@@ -188,7 +188,7 @@ G4UnionSolid::DistanceToIn( const G4ThreeVector& p) const
G4double distA = fPtrSolidA->DistanceToIn(p) ;
G4double distB = fPtrSolidB->DistanceToIn(p) ;
return min(distA,distB) ;
return G4std::min(distA,distB) ;
}
//////////////////////////////////////////////////////////
@@ -284,7 +284,7 @@ G4UnionSolid::DistanceToOut( const G4ThreeVector& p ) const
(positionA == kInside && positionB == kSurface ) ||
(positionA == kSurface && positionB == kInside ) )
{
distout= max(fPtrSolidA->DistanceToOut(p),
distout= G4std::max(fPtrSolidA->DistanceToOut(p),
fPtrSolidB->DistanceToOut(p) ) ;
}
else