Import Geant4 10.5.0.beta source tree

2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
@@ -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;