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

Import Geant4 11.2.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2023-06-30 09:09:57 +02:00
parent aef78ca386
commit dd1f179cda
3780 changed files with 212808 additions and 142780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/specific/src/G4TriangularFacet.cc
+16 -18
View File
@@ -57,7 +57,6 @@ G4TriangularFacet::G4TriangularFacet (const G4ThreeVector& vt0,
const G4ThreeVector& vt1,
const G4ThreeVector& vt2,
G4FacetVertexType vertexType)
: G4VFacet()
{
fVertices = new vector<G4ThreeVector>(3);
@@ -142,7 +141,6 @@ G4TriangularFacet::G4TriangularFacet (const G4ThreeVector& vt0,
///////////////////////////////////////////////////////////////////////////////
//
G4TriangularFacet::G4TriangularFacet ()
: fSqrDist(0.)
{
fVertices = new vector<G4ThreeVector>(3);
G4ThreeVector zero(0,0,0);
@@ -170,7 +168,7 @@ G4TriangularFacet::~G4TriangularFacet ()
//
void G4TriangularFacet::CopyFrom (const G4TriangularFacet& rhs)
{
char *p = (char *) &rhs;
auto p = (char *) &rhs;
copy(p, p + sizeof(*this), (char *)this);
if (fIndices[0] < 0 && fVertices == nullptr)
@@ -185,16 +183,16 @@ void G4TriangularFacet::CopyFrom (const G4TriangularFacet& rhs)
void G4TriangularFacet::MoveFrom (G4TriangularFacet& rhs)
{
fSurfaceNormal = std::move(rhs.fSurfaceNormal);
fArea = std::move(rhs.fArea);
fArea = rhs.fArea;
fCircumcentre = std::move(rhs.fCircumcentre);
fRadius = std::move(rhs.fRadius);
fIndices = std::move(rhs.fIndices);
fA = std::move(rhs.fA); fB = std::move(rhs.fB); fC = std::move(rhs.fC);
fDet = std::move(rhs.fDet);
fSqrDist = std::move(rhs.fSqrDist);
fRadius = rhs.fRadius;
fIndices = rhs.fIndices;
fA = rhs.fA; fB = rhs.fB; fC = rhs.fC;
fDet = rhs.fDet;
fSqrDist = rhs.fSqrDist;
fE1 = std::move(rhs.fE1); fE2 = std::move(rhs.fE2);
fIsDefined = std::move(rhs.fIsDefined);
fVertices = std::move(rhs.fVertices);
fIsDefined = rhs.fIsDefined;
fVertices = rhs.fVertices;
rhs.fVertices = nullptr;
}
@@ -208,7 +206,7 @@ G4TriangularFacet::G4TriangularFacet (const G4TriangularFacet& rhs)
///////////////////////////////////////////////////////////////////////////////
//
G4TriangularFacet::G4TriangularFacet (G4TriangularFacet&& rhs)
G4TriangularFacet::G4TriangularFacet (G4TriangularFacet&& rhs) noexcept
: G4VFacet(rhs)
{
MoveFrom(rhs);
@@ -233,7 +231,7 @@ G4TriangularFacet::operator=(const G4TriangularFacet& rhs)
///////////////////////////////////////////////////////////////////////////////
//
G4TriangularFacet&
G4TriangularFacet::operator=(G4TriangularFacet&& rhs)
G4TriangularFacet::operator=(G4TriangularFacet&& rhs) noexcept
{
SetVertices(nullptr);
@@ -254,8 +252,8 @@ G4TriangularFacet::operator=(G4TriangularFacet&& rhs)
//
G4VFacet* G4TriangularFacet::GetClone ()
{
G4TriangularFacet* fc =
new G4TriangularFacet (GetVertex(0), GetVertex(1), GetVertex(2), ABSOLUTE);
auto fc = new G4TriangularFacet (GetVertex(0), GetVertex(1),
GetVertex(2), ABSOLUTE);
return fc;
}
@@ -268,8 +266,8 @@ G4VFacet* G4TriangularFacet::GetClone ()
//
G4TriangularFacet* G4TriangularFacet::GetFlippedFacet ()
{
G4TriangularFacet* flipped =
new G4TriangularFacet (GetVertex(0), GetVertex(1), GetVertex(2), ABSOLUTE);
auto flipped = new G4TriangularFacet (GetVertex(0), GetVertex(1),
GetVertex(2), ABSOLUTE);
return flipped;
}
@@ -811,7 +809,7 @@ G4ThreeVector G4TriangularFacet::GetSurfaceNormal () const
////////////////////////////////////////////////////////////////////////
//
void G4TriangularFacet::SetSurfaceNormal (G4ThreeVector normal)
void G4TriangularFacet::SetSurfaceNormal (const G4ThreeVector& normal)
{
fSurfaceNormal = normal;
}