Import Geant4 10.5.0.beta source tree

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
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4BooleanSolid.cc 110069 2018-05-15 09:32:07Z gcosmo $
// $Id: G4BooleanSolid.cc 109382 2018-04-13 13:01:28Z gcosmo $
//
// Implementation for the abstract base class for solids created by boolean
// operations between other solids
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4DisplacedSolid.cc 110069 2018-05-15 09:32:07Z gcosmo $
// $Id: G4DisplacedSolid.cc 108788 2018-03-07 08:39:32Z gcosmo $
//
// Implementation for G4DisplacedSolid class for boolean
// operations between other solids
@@ -303,9 +303,7 @@ G4double G4MultiUnion::DistanceToOut(const G4ThreeVector& aPoint,
G4bool* /* validNorm */,
G4ThreeVector* aNormal) const
{
G4double distanceToOutVoxels = DistanceToOutVoxels(aPoint, aDirection,
aNormal);
return distanceToOutVoxels;
return DistanceToOutVoxels(aPoint, aDirection, aNormal);
}
//______________________________________________________________________________
@@ -392,7 +390,7 @@ G4double G4MultiUnion::DistanceToOutVoxels(const G4ThreeVector& aPoint,
const G4Transform3D& transform = fTransformObjs[maxCandidate];
// convert from local normal
*aNormal = GetGlobalVector(transform, maxNormal);
if (aNormal) *aNormal = GetGlobalVector(transform, maxNormal);
distance += maxDistance;
currentPoint += maxDistance * direction;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4UnionSolid.cc 110069 2018-05-15 09:32:07Z gcosmo $
// $Id: G4UnionSolid.cc 109479 2018-04-24 14:33:49Z gcosmo $
//
// Implementation of methods for the class G4UnionSolid
//