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

Import Geant4 10.5.0.beta source tree

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
examples/extended/parallel/ThreadsafeScorers/include/G4TAtomicHitsCollection.hh
+2 -4
View File
@@ -161,15 +161,14 @@ protected:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
template <class T>
G4TAtomicHitsCollection<T>::G4TAtomicHitsCollection()
: theCollection(new container_type), fMutex(G4MUTEX_INITIALIZER)
: theCollection(new container_type)
{ }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
template <class T>
G4TAtomicHitsCollection<T>::G4TAtomicHitsCollection(G4String detName,
G4String colNam)
: G4VHitsCollection(detName,colNam),
theCollection(new container_type),
fMutex(G4MUTEX_INITIALIZER)
theCollection(new container_type)
{ }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
template <class T> G4TAtomicHitsCollection<T>::~G4TAtomicHitsCollection()
@@ -178,7 +177,6 @@ template <class T> G4TAtomicHitsCollection<T>::~G4TAtomicHitsCollection()
delete (*theCollection)[i];
theCollection->clear();
delete theCollection;
G4MUTEXDESTROY(fMutex);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
template <class T>
examples/extended/parallel/ThreadsafeScorers/include/G4TAtomicHitsMap.hh
+2 -5
View File
@@ -153,16 +153,14 @@ private:
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
template <typename T>
G4TAtomicHitsMap<T>::G4TAtomicHitsMap()
: theCollection(new container_type),
fMutex(G4MUTEX_INITIALIZER)
: theCollection(new container_type)
{ }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
template <typename T>
G4TAtomicHitsMap<T>::G4TAtomicHitsMap(G4String detName,
G4String colNam)
: G4VHitsCollection(detName,colNam),
theCollection(new container_type),
fMutex(G4MUTEX_INITIALIZER)
theCollection(new container_type)
{ }
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
template <typename T>
@@ -172,7 +170,6 @@ G4TAtomicHitsMap<T>::~G4TAtomicHitsMap()
delete itr->second;
delete theCollection;
G4MUTEXDESTROY(fMutex);
}
//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
template <typename T>
examples/extended/parallel/ThreadsafeScorers/include/G4atomic.hh
+29 -35
View File
@@ -80,28 +80,31 @@
template<typename _Tp>
class G4atomic
{
public:
public:
typedef typename std::atomic<_Tp> base_type;
typedef _Tp value_type;
private:
using mem_odr = std::memory_order;
private:
using mem_ord = std::memory_order;
public:
public:
// constructors
explicit
G4atomic(mem_odr odr = std::memory_order_acq_rel) : fMemOrder(odr)
G4atomic(mem_ord mo = std::memory_order_acq_rel) : fMemOrder(mo)
{ atomics::set(&fvalue, value_type()); }
explicit
G4atomic(const value_type& _init,
mem_odr odr = std::memory_order_acq_rel) : fMemOrder(odr)
mem_ord mo = std::memory_order_acq_rel) : fMemOrder(mo)
{ atomics::set(&fvalue, _init); }
// copy-constructor from pure C++11 atomic
explicit
G4atomic(const base_type& rhs,
mem_odr odr = std::memory_order_acq_rel) : fMemOrder(odr)
mem_ord mo = std::memory_order_acq_rel) : fMemOrder(mo)
{ atomics::set(&fvalue, rhs); }
// copy-constructor
@@ -143,20 +146,16 @@ public:
bool is_lock_free() const volatile { return fvalue.is_lock_free(); }
// store functions
void store(_Tp _desired, std::memory_order mem_odr
= std::memory_order_seq_cst)
{ atomics::set(fvalue, _desired, mem_odr); }
void store(_Tp _desired, std::memory_order mem_odr
= std::memory_order_seq_cst) volatile
{ atomics::set(fvalue, _desired, mem_odr); }
void store(_Tp _desired, mem_ord mo = std::memory_order_seq_cst)
{ atomics::set(fvalue, _desired, mo); }
void store(_Tp _desired, mem_ord mo = std::memory_order_seq_cst) volatile
{ atomics::set(fvalue, _desired, mo); }
// load functions
_Tp load(std::memory_order mem_odr
= std::memory_order_seq_cst) const
{ return atomics::get(fvalue, mem_odr); }
_Tp load(std::memory_order mem_odr
= std::memory_order_seq_cst) const volatile
{ return atomics::get(fvalue, mem_odr); }
_Tp load(mem_ord mo = std::memory_order_seq_cst) const
{ return atomics::get(fvalue, mo); }
_Tp load(mem_ord mo = std::memory_order_seq_cst) const volatile
{ return atomics::get(fvalue, mo); }
// implicit conversion functions
operator _Tp() const { return this->load(); }
@@ -166,39 +165,33 @@ public:
// compare-and-swap functions
bool compare_exchange_weak(_Tp& _expected, _Tp _desired,
std::memory_order _success,
std::memory_order _failure)
mem_ord _success, mem_ord _failure)
{ return fvalue.compare_exchange_weak(_expected, _desired,
_success, _failure); }
bool compare_exchange_weak(_Tp& _expected, _Tp _desired,
std::memory_order _success,
std::memory_order _failure) volatile
mem_ord _success, mem_ord _failure) volatile
{ return fvalue.compare_exchange_weak(_expected, _desired,
_success, _failure); }
bool compare_exchange_weak(_Tp& _expected, _Tp _desired,
std::memory_order _order)
bool compare_exchange_weak(_Tp& _expected, _Tp _desired, mem_ord _order)
{ return fvalue.compare_exchange_weak(_expected, _desired, _order); }
bool compare_exchange_weak(_Tp& _expected, _Tp _desired,
std::memory_order _order) volatile
mem_ord _order) volatile
{ return fvalue.compare_exchange_weak(_expected, _desired, _order); }
bool compare_exchange_strong(_Tp& _expected, _Tp _desired,
std::memory_order _success,
std::memory_order _failure)
mem_ord _success, mem_ord _failure)
{ return fvalue.compare_exchange_weak(_expected, _desired,
_success, _failure); }
bool compare_exchange_strong(_Tp& _expected, _Tp _desired,
std::memory_order _success,
std::memory_order _failure) volatile
mem_ord _success, mem_ord _failure) volatile
{ return fvalue.compare_exchange_weak(_expected, _desired,
_success, _failure); }
bool compare_exchange_strong(_Tp& _expected, _Tp _desired,
std::memory_order _order)
bool compare_exchange_strong(_Tp& _expected, _Tp _desired, mem_ord _order)
{ return fvalue.compare_exchange_weak(_expected, _desired, _order); }
bool compare_exchange_strong(_Tp& _expected, _Tp _desired,
std::memory_order _order) volatile
mem_ord _order) volatile
{ return fvalue.compare_exchange_weak(_expected, _desired, _order); }
// value_type operators
@@ -258,9 +251,10 @@ public:
value_type operator--(int)
{ value_type _tmp = fvalue--; return _tmp; }
protected:
protected:
base_type fvalue;
mem_odr fMemOrder;
mem_ord fMemOrder;
};
examples/extended/parallel/ThreadsafeScorers/include/TSPhysicsList.hh
+2 -20
View File
@@ -47,14 +47,7 @@
#include "globals.hh"
#include "G4VUserPhysicsList.hh"
#include "G4EmStandardPhysics_option4.hh"
#include "G4RadioactiveDecayPhysics.hh"
#include "G4HadronPhysicsQGSP_BERT_HP.hh"
#include "G4HadronElasticPhysicsHP.hh"
#include "G4IonElasticPhysics.hh"
#include "G4IonBinaryCascadePhysics.hh"
#include "G4DecayPhysics.hh"
#include "G4VPhysicsConstructor.hh"
#include <deque>
class TSPhysicsList : public G4VUserPhysicsList
@@ -66,26 +59,15 @@ public:
TSPhysicsList();
virtual ~TSPhysicsList();
static TSPhysicsList* Instance();
public:
static TSPhysicsList* Instance();
void ConstructParticle();
void ConstructProcess();
void SetCuts();
private:
static TSPhysicsList* fgInstance;
G4EmStandardPhysics_option4* fEmPhysics_opt4;
G4DecayPhysics* fDecayPhysics;
G4RadioactiveDecayPhysics* fRadDecayPhysics;
G4HadronPhysicsQGSP_BERT_HP* fHadronInelasticPhysics;
G4HadronElasticPhysicsHP* fHadronElasticPhysics;
G4IonElasticPhysics* fIonElasticPhysics;
G4IonBinaryCascadePhysics* fIonBinaryCascadePhysics;
PhysicsSet_t fConstructors;
G4double fDefaultCutValue;
};