Import Geant4 10.5.0.beta source tree

This commit is contained in:
Gabriele Cosmo
2018-06-29 10:58:11 +02:00
parent fe81a77428
commit 6aa23be517
1581 changed files with 124288 additions and 83758 deletions
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4DecayProducts.hh 67971 2013-03-13 10:13:24Z gcosmo $
// $Id: G4DecayProducts.hh 108369 2018-02-09 08:39:32Z gcosmo $
//
//
// ------------------------------------------------------------
@@ -92,8 +92,6 @@ class G4DecayProducts
void DumpInfo() const;
typedef std::vector<G4DynamicParticle*> G4DecayProductVector;
protected:
enum {MaxNumberOfProducts = 64};
private:
G4int numberOfProducts;
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4DynamicParticle.icc 98352 2016-07-08 08:21:00Z gcosmo $
// $Id: G4DynamicParticle.icc 110257 2018-05-17 14:20:12Z gcosmo $
//
//
// ------------------------------------------------------------
@@ -33,7 +33,7 @@
// History: first implementation, based on object model of
// 17 AUg. 1999 H.Kurashige
// ------------------------------------------------------------
extern G4PART_DLL G4ThreadLocal G4Allocator<G4DynamicParticle> *pDynamicParticleAllocator;
extern G4PART_DLL G4Allocator<G4DynamicParticle>*& pDynamicParticleAllocator();
// ------------------------
// Inlined operators
@@ -41,14 +41,14 @@ extern G4PART_DLL G4ThreadLocal G4Allocator<G4DynamicParticle> *pDynamicParticle
inline void * G4DynamicParticle::operator new(size_t)
{
if (!pDynamicParticleAllocator) pDynamicParticleAllocator =
if (!pDynamicParticleAllocator()) pDynamicParticleAllocator() =
new G4Allocator<G4DynamicParticle>;
return pDynamicParticleAllocator->MallocSingle();
return pDynamicParticleAllocator()->MallocSingle();
}
inline void G4DynamicParticle::operator delete(void * aDynamicParticle)
{
pDynamicParticleAllocator->FreeSingle((G4DynamicParticle *) aDynamicParticle);
pDynamicParticleAllocator()->FreeSingle((G4DynamicParticle *) aDynamicParticle);
}
// ------------------------
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ElectronOccupancy.hh 79357 2014-02-25 10:06:54Z gcosmo $
// $Id: G4ElectronOccupancy.hh 110257 2018-05-17 14:20:12Z gcosmo $
//
//
// ------------------------------------------------------------
@@ -102,7 +102,7 @@ class G4ElectronOccupancy
};
extern G4PART_DLL G4ThreadLocal G4Allocator<G4ElectronOccupancy> *aElectronOccupancyAllocator;
extern G4PART_DLL G4Allocator<G4ElectronOccupancy>*& aElectronOccupancyAllocator();
// ------------------------
// Inlined operators
@@ -110,16 +110,16 @@ extern G4PART_DLL G4ThreadLocal G4Allocator<G4ElectronOccupancy> *aElectronOccup
inline void * G4ElectronOccupancy::operator new(size_t)
{
if (!aElectronOccupancyAllocator)
if (!aElectronOccupancyAllocator())
{
aElectronOccupancyAllocator = new G4Allocator<G4ElectronOccupancy>;
aElectronOccupancyAllocator() = new G4Allocator<G4ElectronOccupancy>;
}
return (void *) aElectronOccupancyAllocator->MallocSingle();
return (void *) aElectronOccupancyAllocator()->MallocSingle();
}
inline void G4ElectronOccupancy::operator delete(void * aElectronOccupancy)
{
aElectronOccupancyAllocator->FreeSingle((G4ElectronOccupancy *) aElectronOccupancy);
aElectronOccupancyAllocator()->FreeSingle((G4ElectronOccupancy *) aElectronOccupancy);
}
inline
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PDefManager.hh 103108 2017-03-16 13:00:35Z gcosmo $
// $Id: G4PDefManager.hh 110257 2018-05-17 14:20:12Z gcosmo $
//
//
// ------------------------------------------------------------
@@ -111,8 +111,8 @@ class G4PDefManager
public:
G4PART_DLL G4ThreadLocalStatic G4int slavetotalspace;
G4PART_DLL G4ThreadLocalStatic G4PDefData* offset;
G4PART_DLL static G4int& slavetotalspace(); // thread-local
G4PART_DLL static G4PDefData*& offset(); // thread-local
private:
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4ParticleTable.hh 106143 2017-09-14 06:34:42Z gcosmo $
// $Id: G4ParticleTable.hh 110257 2018-05-17 14:20:12Z gcosmo $
//
//
// ------------------------------------------------------------
@@ -236,8 +236,8 @@ class G4ParticleTable
#ifdef G4MULTITHREADED
public:
//Andrea Dotti January 16. Shared instance of a mutex
static G4Mutex particleTableMutex;
static G4int lockCount;
static G4GLOB_DLL G4Mutex& particleTableMutex();
static G4GLOB_DLL G4int& lockCount();
#endif
};
#include "G4ParticleTable.icc"
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PrimaryParticle.hh 99159 2016-09-07 08:11:50Z gcosmo $
// $Id: G4PrimaryParticle.hh 110257 2018-05-17 14:20:12Z gcosmo $
//
//
@@ -179,20 +179,20 @@ class G4PrimaryParticle
};
extern G4PART_DLL G4ThreadLocal G4Allocator<G4PrimaryParticle> *aPrimaryParticleAllocator;
extern G4PART_DLL G4Allocator<G4PrimaryParticle>*& aPrimaryParticleAllocator();
inline void * G4PrimaryParticle::operator new(size_t)
{
if (!aPrimaryParticleAllocator)
if (!aPrimaryParticleAllocator())
{
aPrimaryParticleAllocator = new G4Allocator<G4PrimaryParticle>;
aPrimaryParticleAllocator() = new G4Allocator<G4PrimaryParticle>;
}
return (void *) aPrimaryParticleAllocator->MallocSingle();
return (void *) aPrimaryParticleAllocator()->MallocSingle();
}
inline void G4PrimaryParticle::operator delete(void * aPrimaryParticle)
{
aPrimaryParticleAllocator->FreeSingle((G4PrimaryParticle *) aPrimaryParticle);
aPrimaryParticleAllocator()->FreeSingle((G4PrimaryParticle *) aPrimaryParticle);
}
inline G4double G4PrimaryParticle::GetMass() const
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PrimaryVertex.hh 99159 2016-09-07 08:11:50Z gcosmo $
// $Id: G4PrimaryVertex.hh 110257 2018-05-17 14:20:12Z gcosmo $
//
//
@@ -102,20 +102,20 @@ class G4PrimaryVertex
};
extern G4PART_DLL G4ThreadLocal G4Allocator<G4PrimaryVertex> *aPrimaryVertexAllocator;
extern G4PART_DLL G4Allocator<G4PrimaryVertex>*& aPrimaryVertexAllocator();
inline void * G4PrimaryVertex::operator new(size_t)
{
if (!aPrimaryVertexAllocator)
if (!aPrimaryVertexAllocator())
{
aPrimaryVertexAllocator = new G4Allocator<G4PrimaryVertex>;
aPrimaryVertexAllocator() = new G4Allocator<G4PrimaryVertex>;
}
return (void *) aPrimaryVertexAllocator->MallocSingle();
return (void *) aPrimaryVertexAllocator()->MallocSingle();
}
inline void G4PrimaryVertex::operator delete(void * aPrimaryVertex)
{
aPrimaryVertexAllocator->FreeSingle((G4PrimaryVertex *) aPrimaryVertex);
aPrimaryVertexAllocator()->FreeSingle((G4PrimaryVertex *) aPrimaryVertex);
}
inline G4ThreeVector G4PrimaryVertex::GetPosition() const