Import Geant4 11.3.1 source tree
This commit is contained in:
@@ -6,8 +6,16 @@ It must **not** be used as a substitute for writing good git commit messages!
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
## 2025-03-07 Soon Yung Jun (geom-specific-V11-02-09)
|
||||
- G4Polyhedra, G4UPolyhedra: Verify the validity of the delta phi to restore
|
||||
visualization of HepPolyhedronPgon
|
||||
|
||||
## 2025-02-03 Gabriele Cosmo
|
||||
- Removed fake default constructor from G4U* wrappers, clearing compilation
|
||||
warnings on gcc-14.
|
||||
|
||||
## 2024-10-01 Evgueni Tcherniaev (geom-specific-V11-02-08)
|
||||
- G4GenericTrap: Fixed minor defect reported by Coverity
|
||||
- G4GenericTrap: Fixed minor defect reported by Coverity.
|
||||
|
||||
## 2024-07-18 Alvaro Tolosa-Delgado (geom-specific-V11-02-07)
|
||||
- Remove internal state of G4TwistedTubs and G4VTwistedFaceted.
|
||||
|
||||
@@ -69,11 +69,6 @@ class G4UEllipsoid : public G4UAdapter<vecgeom::UnplacedEllipsoid>
|
||||
|
||||
inline G4GeometryType GetEntityType() const override;
|
||||
|
||||
G4UEllipsoid(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UEllipsoid( const G4UEllipsoid &source );
|
||||
G4UEllipsoid &operator=( const G4UEllipsoid &source );
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -68,11 +68,6 @@ class G4UEllipticalCone : public G4UAdapter<vecgeom::UnplacedEllipticalCone>
|
||||
|
||||
inline G4GeometryType GetEntityType() const override;
|
||||
|
||||
G4UEllipticalCone(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UEllipticalCone( const G4UEllipticalCone& source );
|
||||
G4UEllipticalCone& operator=( const G4UEllipticalCone& source );
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -66,11 +66,6 @@ class G4UEllipticalTube : public G4UAdapter<vecgeom::UnplacedEllipticalTube>
|
||||
|
||||
inline G4GeometryType GetEntityType() const override;
|
||||
|
||||
G4UEllipticalTube(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UEllipticalTube( const G4UEllipticalTube& source );
|
||||
G4UEllipticalTube &operator=( const G4UEllipticalTube& source );
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -88,11 +88,6 @@ class G4UExtrudedSolid : public G4UAdapter<vecgeom::UnplacedExtruded>
|
||||
|
||||
inline G4bool IsFaceted() const override;
|
||||
|
||||
G4UExtrudedSolid(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UExtrudedSolid( const G4UExtrudedSolid& source );
|
||||
G4UExtrudedSolid &operator=(const G4UExtrudedSolid& source);
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -73,11 +73,6 @@ class G4UGenericPolycone : public G4UAdapter<vecgeom::UnplacedGenericPolycone>
|
||||
|
||||
G4VSolid* Clone() const override;
|
||||
|
||||
G4UGenericPolycone(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UGenericPolycone( const G4UGenericPolycone& source );
|
||||
G4UGenericPolycone& operator=(const G4UGenericPolycone& source);
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -70,11 +70,6 @@ class G4UGenericTrap : public G4UAdapter<vecgeom::UnplacedGenTrap>
|
||||
|
||||
inline G4bool IsFaceted() const override;
|
||||
|
||||
G4UGenericTrap(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UGenericTrap( const G4UGenericTrap& source );
|
||||
G4UGenericTrap& operator=(const G4UGenericTrap& source);
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -77,11 +77,6 @@ class G4UHype : public G4UAdapter<vecgeom::GenericUnplacedHype>
|
||||
|
||||
inline G4GeometryType GetEntityType() const override;
|
||||
|
||||
G4UHype(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UHype( const G4UHype& source );
|
||||
G4UHype& operator=( const G4UHype& source );
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -66,11 +66,6 @@ class G4UParaboloid : public G4UAdapter<vecgeom::UnplacedParaboloid>
|
||||
|
||||
inline G4GeometryType GetEntityType() const override;
|
||||
|
||||
G4UParaboloid(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UParaboloid( const G4UParaboloid& source );
|
||||
G4UParaboloid& operator=( const G4UParaboloid& source );
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -92,11 +92,6 @@ class G4UPolycone : public G4UAdapter<vecgeom::GenericUnplacedPolycone>
|
||||
|
||||
inline G4GeometryType GetEntityType() const override;
|
||||
|
||||
G4UPolycone(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UPolycone( const G4UPolycone& source );
|
||||
G4UPolycone& operator=( const G4UPolycone& source );
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -100,11 +100,6 @@ class G4UPolyhedra : public G4UAdapter<vecgeom::UnplacedPolyhedron>
|
||||
|
||||
inline G4bool IsFaceted() const override;
|
||||
|
||||
G4UPolyhedra(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UPolyhedra( const G4UPolyhedra& source );
|
||||
G4UPolyhedra& operator=( const G4UPolyhedra& source );
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -78,11 +78,6 @@ class G4UTessellatedSolid : public G4UAdapter<vecgeom::UnplacedTessellated>
|
||||
G4int AllocatedMemory();
|
||||
void DisplayAllocatedMemory();
|
||||
|
||||
G4UTessellatedSolid(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UTessellatedSolid( const G4UTessellatedSolid& source );
|
||||
G4UTessellatedSolid& operator=(const G4UTessellatedSolid& source);
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -69,11 +69,6 @@ class G4UTet : public G4UAdapter<vecgeom::UnplacedTet>
|
||||
|
||||
inline G4bool IsFaceted() const override;
|
||||
|
||||
G4UTet(__void__&);
|
||||
// Fake default constructor for usage restricted to direct object
|
||||
// persistency for clients requiring preallocation of memory for
|
||||
// persistifiable objects.
|
||||
|
||||
G4UTet(const G4UTet& rhs);
|
||||
G4UTet& operator=(const G4UTet& rhs);
|
||||
// Copy constructor and assignment operator.
|
||||
|
||||
@@ -1038,7 +1038,14 @@ G4Polyhedron* G4Polyhedra::CreatePolyhedron() const
|
||||
std::vector<G4TwoVector> rz(numCorner);
|
||||
for (G4int i = 0; i < numCorner; ++i)
|
||||
rz[i].set(corners[i].r, corners[i].z);
|
||||
return new G4PolyhedronPgon(startPhi, endPhi - startPhi, numSide, rz);
|
||||
|
||||
// Check the validity of the delta phi
|
||||
G4double wrDelta = endPhi - startPhi;
|
||||
if (wrDelta <= 0. || wrDelta >= twopi*(1-DBL_EPSILON))
|
||||
{
|
||||
wrDelta = twopi;
|
||||
}
|
||||
return new G4PolyhedronPgon(startPhi, wrDelta, numSide, rz);
|
||||
}
|
||||
|
||||
// SetOriginalParameters
|
||||
|
||||
@@ -53,15 +53,6 @@ G4UEllipsoid::G4UEllipsoid(const G4String& pName,
|
||||
: Base_t(pName, dx, dy, dz, bcut, tcut)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
|
||||
G4UEllipsoid::G4UEllipsoid( __void__& a )
|
||||
: Base_t(a)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -52,15 +52,6 @@ G4UEllipticalCone::G4UEllipticalCone(const G4String& pName,
|
||||
: Base_t(pName, a, b, h, cut)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
|
||||
G4UEllipticalCone::G4UEllipticalCone( __void__& a )
|
||||
: Base_t(a)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -51,15 +51,6 @@ G4UEllipticalTube::G4UEllipticalTube(const G4String& pName,
|
||||
: Base_t(pName, dx, dy, dz)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
|
||||
G4UEllipticalTube::G4UEllipticalTube( __void__& a )
|
||||
: Base_t(a)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -97,17 +97,6 @@ G4UExtrudedSolid::G4UExtrudedSolid(const G4String& name,
|
||||
delete[] sections;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
//
|
||||
G4UExtrudedSolid::G4UExtrudedSolid(__void__& a)
|
||||
: Base_t(a)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -71,17 +71,6 @@ G4UGenericPolycone::G4UGenericPolycone(const G4String& name,
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
//
|
||||
G4UGenericPolycone::G4UGenericPolycone(__void__& a)
|
||||
: Base_t(a)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -54,17 +54,6 @@ G4UGenericTrap::G4UGenericTrap(const G4String& name, G4double halfZ,
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
//
|
||||
G4UGenericTrap::G4UGenericTrap(__void__& a)
|
||||
: Base_t(a), fVisSubdivisions(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -53,15 +53,6 @@ G4UHype::G4UHype(const G4String& pName,
|
||||
newInnerStereo, newOuterStereo, newHalfLenZ)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
|
||||
G4UHype::G4UHype( __void__& a )
|
||||
: Base_t(a)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -51,15 +51,6 @@ G4UParaboloid::G4UParaboloid(const G4String& pName,
|
||||
: Base_t(pName, rlo, rhi, dz)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
|
||||
G4UParaboloid::G4UParaboloid( __void__& a )
|
||||
: Base_t(a)
|
||||
{ }
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -115,17 +115,6 @@ G4UPolycone::G4UPolycone(const G4String& name,
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
//
|
||||
G4UPolycone::G4UPolycone( __void__& a )
|
||||
: Base_t(a)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -126,17 +126,6 @@ G4UPolyhedra::G4UPolyhedra(const G4String& name,
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
//
|
||||
G4UPolyhedra::G4UPolyhedra( __void__& a )
|
||||
: Base_t(a)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
@@ -593,7 +582,13 @@ G4UPolyhedra::CalculateExtent(const EAxis pAxis,
|
||||
//
|
||||
G4Polyhedron* G4UPolyhedra::CreatePolyhedron() const
|
||||
{
|
||||
return new G4PolyhedronPgon(wrStart, wrDelta, wrNumSide, rzcorners);
|
||||
// Check the validity of the delta phi
|
||||
G4double deltaPhi = wrDelta;
|
||||
if (deltaPhi <= 0. || deltaPhi >= twopi*(1-DBL_EPSILON))
|
||||
{
|
||||
deltaPhi = twopi;
|
||||
}
|
||||
return new G4PolyhedronPgon(wrStart, deltaPhi, wrNumSide, rzcorners);
|
||||
}
|
||||
|
||||
#endif // G4GEOM_USE_USOLIDS
|
||||
|
||||
@@ -54,16 +54,6 @@ G4UTessellatedSolid::G4UTessellatedSolid(const G4String& name)
|
||||
{
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
//
|
||||
G4UTessellatedSolid::G4UTessellatedSolid(__void__& a)
|
||||
: Base_t(a)
|
||||
{
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
@@ -75,16 +75,6 @@ G4UTet::G4UTet(const G4String& pName,
|
||||
}
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Fake default constructor - sets only member data and allocates memory
|
||||
// for usage restricted to object persistency.
|
||||
//
|
||||
G4UTet::G4UTet( __void__& a )
|
||||
: Base_t(a)
|
||||
{
|
||||
}
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Destructor
|
||||
|
||||
Reference in New Issue
Block a user