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

Import Geant4 10.6.1 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2020-02-14 15:32:52 +01:00
parent 5baee230e9
commit 8c87fe78c4
278 changed files with 24232 additions and 22963 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/magneticfield/History
+6
View File
@@ -15,6 +15,12 @@ committal in the CVS repository !
----------------------------------------------------------
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
January 13, 2020 G.Cosmo - field-V10-05-18
------------------------
- Turn off verbosity flags by default in G4IntegratorDriver,
G4InterpolationDriver and G4MagIntegratorDriver.
November 14, 2019 J.Apostolakis - field-V10-05-17
-------------------------------
- Added method / attribute to G4VIntegrationDriver DoesReIntegrate()
source/geometry/magneticfield/include/G4IntegrationDriver.hh
+1 -1
View File
@@ -53,7 +53,7 @@ class G4IntegrationDriver : public G4RKIntegrationDriver<T>,
G4IntegrationDriver( G4double hminimum,
T* stepper,
G4int numberOfComponents = 6,
G4int statisticsVerbosity = 1 );
G4int statisticsVerbosity = 0 );
virtual ~G4IntegrationDriver() override;
source/geometry/magneticfield/include/G4InterpolationDriver.hh
+1 -1
View File
@@ -51,7 +51,7 @@ class G4InterpolationDriver : public G4RKIntegrationDriver<T>
G4InterpolationDriver(G4double hminimum,
T* stepper,
G4int numberOfComponents = 6,
G4int statisticsVerbosity = 1);
G4int statisticsVerbosity = 0);
virtual ~G4InterpolationDriver() override;
source/geometry/magneticfield/include/G4MagIntegratorDriver.hh
+1 -1
View File
@@ -49,7 +49,7 @@ class G4MagInt_Driver : public G4VIntegrationDriver,
G4MagInt_Driver(G4double hminimum,
G4MagIntegratorStepper* pItsStepper,
G4int numberOfComponents = 6,
G4int statisticsVerbosity = 1);
G4int statisticsVerbosity = 0);
virtual ~G4MagInt_Driver() override;
// Constructor, destructor.
source/geometry/navigation/History
+5
View File
@@ -16,6 +16,11 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
February 5, 2020 - P.Arce (geomnav-V10-05-20)
-------------------------
- Fixed problem report #2196.
Avoid looping infinitely by pushing N times with increasing step size.
November 29, 2019 - J.Apostolakis (geomnav-V10-05-19)
---------------------------------
- Added method to PropagatorInField to Get/Set new parameter that
source/geometry/navigation/include/G4RegularNavigation.hh
+16 -1
View File
@@ -32,7 +32,7 @@
// navigation does not stop at the surface
// History:
// - Created: P.Arce, May 2007
// - Created. P.Arce, May 2007
// --------------------------------------------------------------------
#ifndef G4RegularNavigation_HH
#define G4RegularNavigation_HH
@@ -122,6 +122,21 @@ class G4RegularNavigation
G4NormalNavigation* fnormalNav = nullptr;
G4double kCarTolerance;
G4double fMinStep;
G4bool fLastStepWasZero;
// Whether the last ComputeStep moved Zero. Used to check for edges.
G4int fNumberZeroSteps;
// Number of preceding moves that were Zero. Reset to 0 after finite step
G4int fActionThreshold_NoZeroSteps;
// After this many failed/zero steps, act (push etc)
G4int fAbandonThreshold_NoZeroSteps;
// After this many failed/zero steps, abandon track
G4int fNoStepsAllowed;
// Maximum number of steps a track can travel skipping voxels
// (if there are more, track is assumed to be stuck and it is killed)
G4bool fWarnPush;
// Send warning message that a stuck particle has been pushed
};
#endif
source/geometry/navigation/src/G4RegularNavigation.cc
+98 -4
View File
@@ -26,6 +26,7 @@
// class G4RegularNavigation implementation
//
// Author: Pedro Arce, May 2007
//
// --------------------------------------------------------------------
#include "G4RegularNavigation.hh"
@@ -41,6 +42,12 @@
G4RegularNavigation::G4RegularNavigation()
{
kCarTolerance = G4GeometryTolerance::GetInstance()->GetSurfaceTolerance();
fMinStep = 101*kCarTolerance;
fActionThreshold_NoZeroSteps = 2;
fAbandonThreshold_NoZeroSteps = 25;
fNoStepsAllowed = 10000;
fWarnPush = true;
}
@@ -71,7 +78,7 @@ G4double G4RegularNavigation::
// problems would make this method to be called
G4ThreeVector globalPoint =
history.GetTopTransform().InverseTransformPoint(localPoint);
history.GetTopTransform().InverseTransformPoint(localPoint);
G4ThreeVector globalDirection =
history.GetTopTransform().InverseTransformAxis(localDirection);
@@ -156,7 +163,8 @@ G4double G4RegularNavigation::ComputeStepSkippingEqualMaterials(
//
G4int ide = history.GetDepth();
G4ThreeVector containerPoint = history.GetTransform(ide)
.InverseTransformPoint(localPoint);
.InverseTransformPoint(localPoint);
// Point in global frame
//
containerPoint = history.GetTransform(ide).InverseTransformPoint(localPoint);
@@ -191,9 +199,96 @@ G4double G4RegularNavigation::ComputeStepSkippingEqualMaterials(
// Loop while same material is found
//
for( ;; )
//
fNumberZeroSteps = 0;
for( G4int ii = 0; ii < fNoStepsAllowed+1; ++ii )
{
if( ii == fNoStepsAllowed ) {
// Must kill this stuck track
//
G4ThreeVector pGlobalpoint = history.GetTransform(ide)
.InverseTransformPoint(localPoint);
std::ostringstream message;
message << "G4RegularNavigation::ComputeStepSkippingEqualMaterials()"
<< "Stuck Track: potential geometry or navigation problem."
<< G4endl
<< " Track stuck, moving for more than "
<< ii << " steps" << G4endl
<< "- at point " << pGlobalpoint << G4endl
<< " local direction: " << localDirection << G4endl;
G4Exception("G4RegularNavigation::ComputeStepSkippingEqualMaterials()",
"GeomRegNav1001",
EventMustBeAborted,
message);
}
newStep = voxelBox->DistanceToOut( localPoint, localDirection );
fLastStepWasZero = (newStep<fMinStep);
if( fLastStepWasZero )
{
++fNumberZeroSteps;
//#ifdef G4DEBUG_NAVIGATION
if( fNumberZeroSteps > 1 )
{
G4ThreeVector pGlobalpoint = history.GetTransform(ide)
.InverseTransformPoint(localPoint);
G4cout << "G4RegularNavigation::ComputeStepSkippingEqualMaterials():"
<< " another 'zero' step, # "
<< fNumberZeroSteps
<< ", at " << pGlobalpoint
<< ", nav-comp-step calls # " << ii
<< ", Step= " << newStep
<< G4endl;
}
//#endif
if( fNumberZeroSteps > fActionThreshold_NoZeroSteps-1 )
{
// Act to recover this stuck track. Pushing it along direction
//
newStep = std::min(101*kCarTolerance*pow(10,fNumberZeroSteps-2),0.1);
#ifdef G4VERBOSE
if (fWarnPush)
{
G4ThreeVector pGlobalpoint = history.GetTransform(ide)
.InverseTransformPoint(localPoint);
std::ostringstream message;
message.precision(16);
message << "Track stuck or not moving." << G4endl
<< " Track stuck, not moving for "
<< fNumberZeroSteps << " steps" << G4endl
<< "- at point " << pGlobalpoint
<< " (local point " << localPoint << ")" << G4endl
<< " local direction: " << localDirection
<< " Potential geometry or navigation problem !"
<< G4endl
<< " Trying pushing it of " << newStep << " mm ...";
G4Exception("G4RegularNavigation::ComputeStepSkippingEqualMaterials()",
"GeomRegNav1002",
JustWarning,
message,
"Potential overlap in geometry!");
}
#endif
}
if( fNumberZeroSteps > fAbandonThreshold_NoZeroSteps-1 )
{
// Must kill this stuck track
//
G4ThreeVector pGlobalpoint = history.GetTransform(ide)
.InverseTransformPoint(localPoint);
std::ostringstream message;
message << "G4RegularNavigation::ComputeStepSkippingEqualMaterials()"
<< "Stuck Track: potential geometry or navigation problem."
<< G4endl
<< " Track stuck, not moving for "
<< fNumberZeroSteps << " steps" << G4endl
<< "- at point " << pGlobalpoint << G4endl
<< " local direction: " << localDirection << G4endl;
G4Exception("G4RegularNavigation::ComputeStepSkippingEqualMaterials()",
"GeomRegNav1003",
EventMustBeAborted,
message);
}
}
if( (bFirstStep) && (newStep < currentProposedStepLength) )
{
@@ -245,7 +340,6 @@ G4double G4RegularNavigation::ComputeStepSkippingEqualMaterials(
prevVoxelTranslation = voxelTranslation;
// Check if material of next voxel is the same as that of the current voxel
//
nextMate = param->ComputeMaterial( copyNo, nullptr, nullptr );
if( currentMate != nextMate ) { break; }
source/geometry/solids/specific/History
+22 -1
View File
@@ -16,8 +16,29 @@ committal in the source repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
17-January-2020 E.Tcherniaev (geom-specific-V10-05-22)
- Implemented G4Tet::SetVertices(), it addresses request made
at Geant4 Technical Forum.
14-January-2020 Gabriele Cosmo
- Added protection in G4VFacet header for double definition of global
symbols from Windows Kits code.
08-January-2020 E.Tcherniaev
- Complete revision of G4Tet, speed up, new testG4Tet.cc.
It also fixes issues spotted by new unit test.
16-December-2019 E.Tcherniaev
- Complete revision of G4Ellipsoid, it fixes issues with former
implementation, in particular it addresses problem report #2206.
30%-70% speed-up in all main methods
10-December-2019 G.Cosmo
- Re-established parameterisation mechanism for G4Tet and G4UTet which was
removed by mistake. Addressing problem report #2209.
26-November-2019 G.Cosmo (geom-specific-V10-05-21)
- Fixed cases of implicit type conversions from size_t to G4int.
- Fixed cases of implicit type conversions from size_t to G4int.
05-November-2019 E.Tcherniaev (geom-specific-V10-05-20)
- G4TesselatedSolid.cc: fixed minor Coverity defect (uninitialized array)
source/geometry/solids/specific/include/G4Ellipsoid.hh
+71 -40
View File
@@ -27,18 +27,19 @@
//
// Class description:
//
// A G4Ellipsoid is an ellipsoidal solid, optionally cut at a given z.
// A G4Ellipsoid is an ellipsoidal solid, optionally cut at a given z
//
// Member Data:
//
// xSemiAxis semi-axis, x
// ySemiAxis semi-axis, y
// zSemiAxis semi-axis, z
// zBottomCut lower cut plane level, z (solid lies above this plane)
// zTopCut upper cut plane level, z (solid lies below this plane)
// xSemiAxis semi-axis, X
// ySemiAxis semi-axis, Y
// zSemiAxis semi-axis, Z
// zBottomCut lower cut in Z (solid lies above this plane)
// zTopCut upper cut in Z (solid lies below this plane)
// 10.11.1999 G.Horton-Smith (Caltech, USA) - First implementation
// 10.02.2005 G.Guerrieri (INFN Genova, Italy) - Revision
// 15.12.2019 E.Tcherniaev - Complete revision
// --------------------------------------------------------------------
#ifndef G4ELLIPSOID_HH
#define G4ELLIPSOID_HH
@@ -61,32 +62,32 @@
class G4Ellipsoid : public G4VSolid
{
public: // with description
public:
G4Ellipsoid(const G4String& pName,
G4double pxSemiAxis,
G4double pySemiAxis,
G4double pzSemiAxis,
G4double pzBottomCut = 0,
G4double pzTopCut = 0);
// Constructor
G4Ellipsoid(const G4String& name,
G4double xSemiAxis,
G4double ySemiAxis,
G4double zSemiAxis,
G4double zBottomCut = 0.,
G4double zTopCut = 0.);
// Destructor
virtual ~G4Ellipsoid();
// Access functions
// Accessors
inline G4double GetDx() const;
inline G4double GetDy() const;
inline G4double GetDz() const;
inline G4double GetSemiAxisMax (G4int i) const;
inline G4double GetZBottomCut() const;
inline G4double GetZTopCut() const;
// Modifiers
inline void SetSemiAxis (G4double x, G4double y, G4double z);
inline void SetZCuts (G4double newzBottomCut, G4double newzTopCut);
inline G4double GetCubicVolume();
inline G4double GetSurfaceArea();
// Solid standard methods
// Standard methods
void ComputeDimensions(G4VPVParameterisation* p,
const G4int n,
const G4VPhysicalVolume* pRep);
@@ -96,6 +97,7 @@ class G4Ellipsoid : public G4VSolid
const G4VoxelLimits& pVoxelLimit,
const G4AffineTransform& pTransform,
G4double& pmin, G4double& pmax) const;
EInside Inside(const G4ThreeVector& p) const;
G4ThreeVector SurfaceNormal( const G4ThreeVector& p) const;
G4double DistanceToIn(const G4ThreeVector& p,
@@ -114,40 +116,69 @@ class G4Ellipsoid : public G4VSolid
std::ostream& StreamInfo(std::ostream& os) const;
G4double GetCubicVolume();
G4double GetSurfaceArea();
G4ThreeVector GetPointOnSurface() const;
// Visualisation functions
G4Polyhedron* GetPolyhedron () const;
// Visualisation methods
void DescribeYourselfTo(G4VGraphicsScene& scene) const;
G4VisExtent GetExtent() const;
G4VisExtent GetExtent() const;
G4Polyhedron* CreatePolyhedron() const;
public: // without description
G4Polyhedron* GetPolyhedron () const;
public:
// Fake default constructor for usage restricted to direct object
// persistency for clients requiring preallocation of memory for
// persistifiable objects
G4Ellipsoid(__void__&);
// Fake default constructor for usage restricted to direct object
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
// Copy constructorassignment operator
G4Ellipsoid(const G4Ellipsoid& rhs);
G4Ellipsoid& operator=(const G4Ellipsoid& rhs);
// Copy constructor and assignment operator.
protected: // without description
mutable G4bool fRebuildPolyhedron = false;
mutable G4Polyhedron* fpPolyhedron = nullptr;
// Assignment
G4Ellipsoid& operator=(const G4Ellipsoid& rhs);
private:
G4double kRadTolerance;
G4double halfCarTolerance, halfRadTolerance;
// Check parameters and set cached values
void CheckParameters();
G4double fCubicVolume = 0.0;
G4double fSurfaceArea = 0.0;
G4double xSemiAxis, ySemiAxis, zSemiAxis,
semiAxisMax, zBottomCut, zTopCut;
// Return normal to surface closest to p
G4ThreeVector ApproxSurfaceNormal(const G4ThreeVector& p) const;
// Calculate area of lateral surface
G4double LateralSurfaceArea() const;
private:
// Ellipsoid parameters
G4double fDx; // X semi-axis
G4double fDy; // Y semi-axis
G4double fDz; // Z semi-axis
G4double fZBottomCut; // Bottom cut in Z
G4double fZTopCut; // Top cut in Z
// Precalculated cached values
G4double halfTolerance; // Surface tolerance
G4double fXmax; // X extent
G4double fYmax; // Y extent
G4double fRsph; // Radius of bounding sphere
G4double fR; // Radius of sphere after scaling
G4double fSx; // X scale factor
G4double fSy; // Y scale factor
G4double fSz; // Z scale factor
G4double fZMidCut; // Middle position between cuts after scaling
G4double fZDimCut; // Half distance between cut after scaling
G4double fQ1; // 1st coefficient in approximation of dist = Q1*(x^2+y^2+z^2) - Q2
G4double fQ2; // 2nd coefficient in approximation of dist = Q1*(x^2+y^2+z^2) - Q2
G4double fCubicVolume = 0.0; // Volume
G4double fSurfaceArea = 0.0; // Surface area
mutable G4double fLateralArea = 0.0; // Lateral surface area
mutable G4bool fRebuildPolyhedron = false;
mutable G4Polyhedron* fpPolyhedron = nullptr;
};
#include "G4Ellipsoid.icc"
source/geometry/solids/specific/include/G4Ellipsoid.icc
+17 -53
View File
@@ -31,94 +31,58 @@
inline
G4double G4Ellipsoid::GetDx() const
{
return xSemiAxis;
return fDx;
}
inline
G4double G4Ellipsoid::GetDy() const
{
return ySemiAxis;
return fDy;
}
inline
G4double G4Ellipsoid::GetDz() const
{
return zSemiAxis;
return fDz;
}
inline
G4double G4Ellipsoid::GetSemiAxisMax (G4int i) const
{
return (i==0) ? xSemiAxis
: (i==1) ? ySemiAxis
: zSemiAxis;
return (i==0) ? fDx : ((i==1) ? fDy : fDz);
}
inline
G4double G4Ellipsoid::GetZBottomCut() const
{
return zBottomCut;
return fZBottomCut;
}
inline
G4double G4Ellipsoid::GetZTopCut() const
{
return zTopCut;
return fZTopCut;
}
inline
void G4Ellipsoid::SetSemiAxis (G4double newxSemiAxis,
G4double newySemiAxis,
G4double newzSemiAxis)
void G4Ellipsoid::SetSemiAxis(G4double newxSemiAxis,
G4double newySemiAxis,
G4double newzSemiAxis)
{
xSemiAxis= newxSemiAxis; ySemiAxis= newySemiAxis; zSemiAxis= newzSemiAxis;
semiAxisMax = xSemiAxis > ySemiAxis ? xSemiAxis : ySemiAxis;
if (zSemiAxis > semiAxisMax) { semiAxisMax= zSemiAxis; }
if (zBottomCut < -zSemiAxis) { zBottomCut = -zSemiAxis; }
if (zTopCut > +zSemiAxis) { zTopCut = +zSemiAxis; }
fDx = newxSemiAxis;
fDy = newySemiAxis;
fDz = newzSemiAxis;
CheckParameters();
fRebuildPolyhedron = true;
}
inline
void G4Ellipsoid::SetZCuts (G4double newzBottomCut, G4double newzTopCut)
{
if (newzBottomCut < -zSemiAxis)
{ zBottomCut = -zSemiAxis; }
else
{ zBottomCut = newzBottomCut; }
fZBottomCut = newzBottomCut;
fZTopCut = newzTopCut;
if (newzTopCut > +zSemiAxis)
{ zTopCut = +zSemiAxis; }
else
{ zTopCut = newzTopCut; }
CheckParameters();
fRebuildPolyhedron = true;
}
inline
G4double G4Ellipsoid::GetCubicVolume()
{
if(fCubicVolume != 0 ) {;}
else
{
if ((zTopCut > +zSemiAxis && zBottomCut < -zSemiAxis)
|| (zTopCut == 0 && zBottomCut == 0) )
{
fCubicVolume = (4./3.)*CLHEP::pi*xSemiAxis*ySemiAxis*zSemiAxis;
}
else
{
fCubicVolume = CLHEP::pi*xSemiAxis*ySemiAxis
* ((zTopCut-std::pow(zTopCut,3.)/(3.*sqr(zSemiAxis)))
- (zBottomCut-std::pow(zBottomCut,3.)/(3.*sqr(zSemiAxis))));
}
}
return fCubicVolume;
}
inline
G4double G4Ellipsoid::GetSurfaceArea()
{
if(fSurfaceArea != 0.) {;}
else { fSurfaceArea = G4VSolid::GetSurfaceArea(); }
return fSurfaceArea;
}
source/geometry/solids/specific/include/G4Tet.hh
+69 -50
View File
@@ -34,6 +34,7 @@
// A G4Tet is a tetrahedra solid.
// 03.09.2004 - M.H.Mendenhall & R.A.Weller (Vanderbilt University, USA)
// 08.01.2020 - E.Tcherniaev, complete revision, speed up
// --------------------------------------------------------------------
#ifndef G4TET_HH
#define G4TET_HH
@@ -56,98 +57,116 @@ class G4Tet : public G4VSolid
public: // with description
// Constructor
G4Tet(const G4String& pName,
G4ThreeVector anchor,
G4ThreeVector p2,
G4ThreeVector p3,
G4ThreeVector p4,
const G4ThreeVector& anchor,
const G4ThreeVector& p1,
const G4ThreeVector& p2,
const G4ThreeVector& p3,
G4bool* degeneracyFlag = nullptr);
// Destructor
virtual ~G4Tet();
void ComputeDimensions(G4VPVParameterisation* p,
const G4int n,
const G4VPhysicalVolume* pRep);
// Modifier
void SetVertices(const G4ThreeVector& anchor,
const G4ThreeVector& p1,
const G4ThreeVector& p2,
const G4ThreeVector& p3);
// Accessors, return the four vertices of the shape
void GetVertices(G4ThreeVector& anchor,
G4ThreeVector& p1,
G4ThreeVector& p2,
G4ThreeVector& p3) const;
std::vector<G4ThreeVector> GetVertices() const;
// Set warning flag - depricated (dummy)
void PrintWarnings(G4bool) {};
// Return true if the tetrahedron is degenerate
G4bool CheckDegeneracy(const G4ThreeVector& p0,
const G4ThreeVector& p1,
const G4ThreeVector& p2,
const G4ThreeVector& p3) const;
// Standard methods
void ComputeDimensions(G4VPVParameterisation* p,
const G4int n,
const G4VPhysicalVolume* pRep);
void BoundingLimits(G4ThreeVector& pMin, G4ThreeVector& pMax) const;
G4bool CalculateExtent(const EAxis pAxis,
const G4VoxelLimits& pVoxelLimit,
const G4AffineTransform& pTransform,
G4double& pmin, G4double& pmax) const;
// Methods for solid
EInside Inside(const G4ThreeVector& p) const;
G4ThreeVector SurfaceNormal( const G4ThreeVector& p) const;
G4double DistanceToIn(const G4ThreeVector& p, const G4ThreeVector& v) const;
G4double DistanceToIn(const G4ThreeVector& p,
const G4ThreeVector& v) const;
G4double DistanceToIn(const G4ThreeVector& p) const;
G4double DistanceToOut(const G4ThreeVector& p, const G4ThreeVector& v,
G4double DistanceToOut(const G4ThreeVector& p,
const G4ThreeVector& v,
const G4bool calcNorm = false,
G4bool* validNorm = nullptr,
G4ThreeVector* n = nullptr) const;
G4double DistanceToOut(const G4ThreeVector& p) const;
G4double GetCubicVolume();
G4double GetSurfaceArea();
G4GeometryType GetEntityType() const;
G4VSolid* Clone() const;
std::ostream& StreamInfo(std::ostream& os) const;
G4double GetCubicVolume();
G4double GetSurfaceArea();
G4ThreeVector GetPointOnSurface() const;
// Functions for visualization
void DescribeYourselfTo (G4VGraphicsScene& scene) const;
G4VisExtent GetExtent () const;
G4Polyhedron* CreatePolyhedron () const;
G4Polyhedron* GetPolyhedron () const;
// Methods for visualization
void DescribeYourselfTo (G4VGraphicsScene& scene) const;
G4VisExtent GetExtent () const;
G4Polyhedron* CreatePolyhedron () const;
G4Polyhedron* GetPolyhedron () const;
public: // without description
// Fake default constructor for usage restricted to direct object
// persistency for clients requiring preallocation of memory for
// persistifiable objects
G4Tet(__void__&);
// Fake default constructor for usage restricted to direct object
// persistency for clients requiring preallocation of memory for
// persistifiable objects.
// Copy constructor
G4Tet(const G4Tet& rhs);
G4Tet& operator=(const G4Tet& rhs);
// Copy constructor and assignment operator.
void PrintWarnings(G4bool flag) { warningFlag=flag; }
static G4bool CheckDegeneracy(G4ThreeVector anchor,
G4ThreeVector p2,
G4ThreeVector p3,
G4ThreeVector p4);
std::vector<G4ThreeVector> GetVertices() const;
// Return the four vertices of the shape.
// Assignment operator
G4Tet& operator=(const G4Tet& rhs);
private:
G4double fCubicVolume = 0.0, fSurfaceArea = 0.0;
// Set data members
void Initialize(const G4ThreeVector& p0,
const G4ThreeVector& p1,
const G4ThreeVector& p2,
const G4ThreeVector& p3);
// Return normal to surface closest to p
G4ThreeVector ApproxSurfaceNormal(const G4ThreeVector& p) const;
private:
G4double halfTolerance = 0;
G4double fCubicVolume = 0; // Volume
G4double fSurfaceArea = 0; // Surface area
mutable G4bool fRebuildPolyhedron = false;
mutable G4Polyhedron* fpPolyhedron = nullptr;
G4ThreeVector GetPointOnFace(G4ThreeVector p1, G4ThreeVector p2,
G4ThreeVector p3, G4double& area) const;
private:
G4ThreeVector fAnchor, fP2, fP3, fP4, fMiddle;
G4ThreeVector fNormal123, fNormal142, fNormal134, fNormal234;
G4bool warningFlag = false;
G4double fCdotN123, fCdotN142, fCdotN134, fCdotN234;
G4double fXMin, fXMax, fYMin, fYMax, fZMin, fZMax;
G4double fDx, fDy, fDz, fTol, fMaxSize;
G4ThreeVector fVertex[4]; // thetrahedron vertices
G4ThreeVector fNormal[4]; // normals to faces
G4double fDist[4] = {0}; // distances from origin to faces
G4double fArea[4] = {0}; // face areas
G4ThreeVector fBmin, fBmax; // bounding box
};
#endif
source/geometry/solids/specific/include/G4UTet.hh
+6
View File
@@ -59,6 +59,12 @@ class G4UTet : public G4UAdapter<vecgeom::UnplacedTet>
~G4UTet();
void ComputeDimensions( G4VPVParameterisation* p,
const G4int n,
const G4VPhysicalVolume* pRep);
G4VSolid* Clone() const;
inline G4GeometryType GetEntityType() const;
public: // without description
source/geometry/solids/specific/include/G4VFacet.hh
+1
View File
@@ -41,6 +41,7 @@
#include <vector>
#include "globals.hh"
#include "windefs.hh"
#include "G4ThreeVector.hh"
#include "G4VSolid.hh"
source/geometry/solids/specific/src/G4Ellipsoid.cc
+629 -511
View File
File diff suppressed because it is too large Load Diff
source/geometry/solids/specific/src/G4Tet.cc
+375 -482
View File
File diff suppressed because it is too large Load Diff
source/geometry/solids/specific/src/G4UTet.cc
+20
View File
@@ -134,6 +134,26 @@ G4UTet& G4UTet::operator = (const G4UTet& rhs)
return *this;
}
////////////////////////////////////////////////////////////////////////
//
// Dispatch to parameterisation for replication mechanism dimension
// computation & modification.
//
void G4UTet::ComputeDimensions(G4VPVParameterisation*,
const G4int,
const G4VPhysicalVolume*)
{
}
//////////////////////////////////////////////////////////////////////////
//
// Make a clone of the object
//
G4VSolid* G4UTet::Clone() const
{
return new G4UTet(*this);
}
///////////////////////////////////////////////////////////////////////////////
//
// Accessors