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

Import Geant4 10.1.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2016-06-10 12:08:39 +02:00
parent 286caacf06
commit c9b32a6c0a
5770 changed files with 1050949 additions and 367105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/geometry/solids/specific/src/G4Paraboloid.cc
+20 -6
View File
@@ -23,7 +23,7 @@
// * acceptance of all terms of the Geant4 Software license. *
// ********************************************************************
//
// $Id: G4Paraboloid.cc 66356 2012-12-18 09:02:32Z gcosmo $
// $Id: G4Paraboloid.cc 83572 2014-09-01 15:23:27Z gcosmo $
//
// class G4Paraboloid
//
@@ -45,9 +45,15 @@
#include "Randomize.hh"
#include "G4VGraphicsScene.hh"
#include "G4Polyhedron.hh"
#include "G4VisExtent.hh"
#include "G4AutoLock.hh"
namespace
{
G4Mutex polyhedronMutex = G4MUTEX_INITIALIZER;
}
using namespace CLHEP;
///////////////////////////////////////////////////////////////////////////////
@@ -58,7 +64,8 @@ G4Paraboloid::G4Paraboloid(const G4String& pName,
G4double pDz,
G4double pR1,
G4double pR2)
: G4VSolid(pName), fpPolyhedron(0), fSurfaceArea(0.), fCubicVolume(0.)
: G4VSolid(pName), fRebuildPolyhedron(false), fpPolyhedron(0),
fSurfaceArea(0.), fCubicVolume(0.)
{
if( (pDz <= 0.) || (pR2 <= pR1) || (pR1 < 0.) )
@@ -90,7 +97,8 @@ G4Paraboloid::G4Paraboloid(const G4String& pName,
// for usage restricted to object persistency.
//
G4Paraboloid::G4Paraboloid( __void__& a )
: G4VSolid(a), fpPolyhedron(0), fSurfaceArea(0.), fCubicVolume(0.),
: G4VSolid(a), fRebuildPolyhedron(false), fpPolyhedron(0),
fSurfaceArea(0.), fCubicVolume(0.),
dz(0.), r1(0.), r2(0.), k1(0.), k2(0.)
{
}
@@ -101,6 +109,7 @@ G4Paraboloid::G4Paraboloid( __void__& a )
G4Paraboloid::~G4Paraboloid()
{
delete fpPolyhedron; fpPolyhedron = 0;
}
///////////////////////////////////////////////////////////////////////////////
@@ -108,7 +117,7 @@ G4Paraboloid::~G4Paraboloid()
// Copy constructor
G4Paraboloid::G4Paraboloid(const G4Paraboloid& rhs)
: G4VSolid(rhs), fpPolyhedron(0),
: G4VSolid(rhs), fRebuildPolyhedron(false), fpPolyhedron(0),
fSurfaceArea(rhs.fSurfaceArea), fCubicVolume(rhs.fCubicVolume),
dz(rhs.dz), r1(rhs.r1), r2(rhs.r2), k1(rhs.k1), k2(rhs.k2)
{
@@ -131,9 +140,10 @@ G4Paraboloid& G4Paraboloid::operator = (const G4Paraboloid& rhs)
// Copy data
//
fpPolyhedron = 0;
fSurfaceArea = rhs.fSurfaceArea; fCubicVolume = rhs.fCubicVolume;
dz = rhs.dz; r1 = rhs.r1; r2 = rhs.r2; k1 = rhs.k1; k2 = rhs.k2;
fRebuildPolyhedron = false;
delete fpPolyhedron; fpPolyhedron = 0;
return *this;
}
@@ -1153,11 +1163,15 @@ G4Polyhedron* G4Paraboloid::CreatePolyhedron () const
G4Polyhedron* G4Paraboloid::GetPolyhedron () const
{
if (!fpPolyhedron ||
fRebuildPolyhedron ||
fpPolyhedron->GetNumberOfRotationStepsAtTimeOfCreation() !=
fpPolyhedron->GetNumberOfRotationSteps())
{
G4AutoLock l(&polyhedronMutex);
delete fpPolyhedron;
fpPolyhedron = CreatePolyhedron();
fRebuildPolyhedron = false;
l.unlock();
}
return fpPolyhedron;
}