Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
|
||||
$Id: History 110069 2018-05-15 09:32:07Z gcosmo $
|
||||
$Id: History 110606 2018-06-01 14:48:58Z gcosmo $
|
||||
-------------------------------------------------------------------
|
||||
|
||||
=========================================================
|
||||
@@ -20,21 +20,26 @@ committal in the CVS repository !
|
||||
* Reverse chronological order (last date on top), please *
|
||||
----------------------------------------------------------
|
||||
|
||||
April 24, 2018 E. Tcherniaev geom-bool-V10-03-05
|
||||
June 1, 2018 G. Cosmo geom-bool-V10-04-04
|
||||
- G4MultiUnion: added protection for normal initialisation in
|
||||
DistanceToOutVoxels(). (M.Gheata)
|
||||
Minor optimisation in DistanceToOut(p,v,..).
|
||||
|
||||
April 24, 2018 E. Tcherniaev geom-bool-V10-04-03
|
||||
- G4UnionSolid: define simple bounding-box and make use of early returns
|
||||
in Inside() for points laying outside.
|
||||
|
||||
April 11, 2018 E. Tcherniaev
|
||||
April 11, 2018 E. Tcherniaev geom-bool-V10-04-02
|
||||
- G4BooleanSolid: Use -1 instead of 0 as default initialisation value
|
||||
for area and capacity, so to distinguish cases when values are zero
|
||||
referring to NULL Boolean constructs.
|
||||
|
||||
April 11, 2018 G. Cosmo
|
||||
April 11, 2018 G. Cosmo geom-bool-V10-04-01
|
||||
- G4BooleanSolid: enhanced warning message for the case of an invalid
|
||||
(NULL) Boolean construct in GetPointOnSurface() and StackPolyhedron().
|
||||
- Replaced USOLIDS_LIBRARIES with VECGEOM_LIBRARIES in sources.cmake.
|
||||
|
||||
February 28, 2018 E. Tcherniaev
|
||||
February 28, 2018 E. Tcherniaev geom-bool-V10-04-00
|
||||
- Improved contruction of G4DiplaceSolid to combine transformations for
|
||||
nested displaced types.
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4BooleanSolid.icc 110069 2018-05-15 09:32:07Z gcosmo $
|
||||
// $Id: G4BooleanSolid.icc 109382 2018-04-13 13:01:28Z gcosmo $
|
||||
//
|
||||
// --------------------------------------------------------------------
|
||||
// GEANT 4 inline definitions file
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
// ********************************************************************
|
||||
//
|
||||
//
|
||||
// $Id: G4UnionSolid.hh 110069 2018-05-15 09:32:07Z gcosmo $
|
||||
// $Id: G4UnionSolid.hh 109479 2018-04-24 14:33:49Z gcosmo $
|
||||
//
|
||||
//
|
||||
// class G4UnionSolid
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#
|
||||
# Generated on : 24/9/2010
|
||||
#
|
||||
# $Id: sources.cmake 110069 2018-05-15 09:32:07Z gcosmo $
|
||||
# $Id: sources.cmake 109329 2018-04-11 08:40:52Z gcosmo $
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -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
|
||||
//
|
||||
|
||||
Reference in New Issue
Block a user