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

Import Geant4 10.4.0 source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2017-12-08 12:52:30 +01:00
parent 98e455a940
commit fc6af9e721
2166 changed files with 276760 additions and 100873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/run/History
+10 -1
View File
@@ -1,4 +1,4 @@
$Id: History 104521 2017-06-02 07:17:28Z gcosmo $
$Id: History 107529 2017-11-21 07:38:24Z gcosmo $
-------------------------------------------------------------------
=========================================================
@@ -17,6 +17,15 @@ committal in the CVS repository !
* Reverse chronological order (last date on top), please *
----------------------------------------------------------
November 21, 2017, G. Cosmo (run-V10-03-16)
- Fixed compilation warning on clang compiler.
November 20, 2017, M. Asai (run-V10-03-13, -14, -15)
- Delete G4RNGHelper singleton object at the end of program.
September 12, 2017, K.L.Genser (run-V10-03-12)
- G4PhysicsListHelper added MuAtomicCapture & DecayMuAtom
June 1, 2017, A.Dotti (run-V10-03-11)
- Prevent adding multiple times the same SD to the same LV via
G4VUserDetectorConsturction::SetSensitiveDetector.
source/run/include/G4RNGHelper.hh
+3 -7
View File
@@ -38,7 +38,6 @@
#ifndef G4RNGHELPER_HH
#define G4RNGHELPER_HH
#include "G4Types.hh"
#include <vector>
#include <queue>
#include "globals.hh"
@@ -49,14 +48,11 @@ class G4TemplateRNGHelper
public:
// The container is modeled as a (shared) singleton
static G4TemplateRNGHelper<T>* GetInstance();
static G4TemplateRNGHelper<T>* GetInstanceIfExist();
typedef std::vector<T> SeedsQueue;
typedef typename SeedsQueue::size_type SeedsQueueSize_type;
virtual ~G4TemplateRNGHelper()
{
Clear();
instance = 0;
}
virtual ~G4TemplateRNGHelper();
//Returns seed given id
virtual const T GetSeed(const G4int& sdId )
source/run/src/G4PhysicsListHelper.cc
+21 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4PhysicsListHelper.cc 97386 2016-06-02 10:01:40Z gcosmo $
// $Id: G4PhysicsListHelper.cc 106147 2017-09-14 06:38:11Z gcosmo $
//
//
// ------------------------------------------------------------
@@ -991,6 +991,16 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
theTable->push_back(tmp);
sizeOfTable +=1;
tmp.processTypeName = "MuAtomicCapture";
tmp.processType = 4;
tmp.processSubType = 132;
tmp.ordering[0] = -1;
tmp.ordering[1] = -1;
tmp.ordering[2] = 1000;
tmp.isDuplicable = false;
theTable->push_back(tmp);
sizeOfTable +=1;
tmp.processTypeName = "HadFission";
tmp.processType = 4;
tmp.processSubType = 141;
@@ -1071,6 +1081,16 @@ void G4PhysicsListHelper::ReadInDefaultOrderingParameter()
theTable->push_back(tmp);
sizeOfTable +=1;
tmp.processTypeName = "DecayMuAtom";
tmp.processType = 6;
tmp.processSubType = 221;
tmp.ordering[0] = 1000;
tmp.ordering[1] = -1;
tmp.ordering[2] = 1000;
tmp.isDuplicable = false;
theTable->push_back(tmp);
sizeOfTable +=1;
tmp.processTypeName = "DecayExt";
tmp.processType = 6;
tmp.processSubType = 231;
source/run/src/G4RNGHelper.cc
+22
View File
@@ -42,6 +42,11 @@ G4TemplateRNGHelper<T>* G4TemplateRNGHelper<T>::GetInstance()
}
return instance;
}
template<class T>
G4TemplateRNGHelper<T>* G4TemplateRNGHelper<T>::GetInstanceIfExist()
{
return instance;
}
template<>
G4TemplateRNGHelper<G4long>* G4TemplateRNGHelper<G4long>::GetInstance()
@@ -52,6 +57,11 @@ G4TemplateRNGHelper<G4long>* G4TemplateRNGHelper<G4long>::GetInstance()
}
return instance;
}
template<>
G4TemplateRNGHelper<G4long>* G4TemplateRNGHelper<G4long>::GetInstanceIfExist()
{
return instance;
}
template<>
G4TemplateRNGHelper<G4String>* G4TemplateRNGHelper<G4String>::GetInstance()
@@ -62,3 +72,15 @@ G4TemplateRNGHelper<G4String>* G4TemplateRNGHelper<G4String>::GetInstance()
}
return instance;
}
template<>
G4TemplateRNGHelper<G4String>* G4TemplateRNGHelper<G4String>::GetInstanceIfExist()
{
return instance;
}
template<class T>
G4TemplateRNGHelper<T>::~G4TemplateRNGHelper()
{
Clear();
instance = 0;
}
source/run/src/G4RunManagerKernel.cc
+13 -1
View File
@@ -24,7 +24,7 @@
// ********************************************************************
//
//
// $Id: G4RunManagerKernel.cc 103291 2017-03-24 14:00:49Z gcosmo $
// $Id: G4RunManagerKernel.cc 107524 2017-11-21 07:15:27Z gcosmo $
//
//
@@ -62,6 +62,7 @@
#include "G4AllocatorList.hh"
#include "G4AutoLock.hh"
#include "G4RNGHelper.hh"
#ifdef G4FPE_DEBUG
#include "G4FPEDetection.hh"
@@ -312,6 +313,17 @@ G4RunManagerKernel::~G4RunManagerKernel()
if(verboseLevel>1) G4NavigationHistoryPool::GetInstance()->Print();
delete G4NavigationHistoryPool::GetInstance();
// deletion of G4RNGHelper singleton
if(runManagerKernelType!=workerRMK)
{
G4RNGHelper * rngHelper = G4RNGHelper::GetInstanceIfExist();
if(rngHelper)
{
delete rngHelper;
if(verboseLevel>1) G4cout << "G4RNGHelper object is deleted." << G4endl;
}
}
// deletion of allocators
G4AllocatorList* allocList = G4AllocatorList::GetAllocatorListIfExist();
if(allocList)