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

Import Geant4 11.3.0.beta source tree

Browse Source
This commit is contained in:
Gabriele Cosmo
2024-06-28 13:08:51 +02:00
parent f7b23877ed
commit e58e650b32
5232 changed files with 239416 additions and 244360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/physics_lists/constructors/factory/History
+8 -4
View File
@@ -1,15 +1,19 @@
# Category phys-ctor-fact History
See `CONTRIBUTING.rst` for details of **required** info/format for each entry,
which **must** added in reverse chronological order (newest at the top). It must **not**
be used as a substitute for writing good git commit messages!
which **must** added in reverse chronological order (newest at the top).
It must **not** be used as a substitute for writing good git commit messages!
-------------------------------------------------------------------------------
## 2024-05-15 Gabriele Cosmo (phys-ctor-fact-V11-02-00)
- Minor code cleanup in G4PhysicsConstructorRegistry source.
## 2023-05-15 Alberto Ribon (phys-ctor-fact-V11-01-00)
- Added G4StoppingPhysicsWithINCLXX in G4RegisterPhysicsConstructors .
- Added G4StoppingPhysicsWithINCLXX in G4RegisterPhysicsConstructors.
## 2021-12-10 Ben Morgan (phys-ctor-fact-V11-00-00)
- Change to new Markdown History format
- Change to new Markdown History format.
---
source/physics_lists/constructors/factory/src/G4PhysicsConstructorRegistry.cc
+20 -32
View File
@@ -24,18 +24,12 @@
// ********************************************************************
//
//
//
// -------------------------------------------------------------------
//
// GEANT4 Class file
//
//
// File name: G4PhysicsConstructorRegistry
// File name: G4PhysicsConstructorRegistry.cc
//
// Author W. Pokorski 21.09.2012
//
// Modifications:
//
// -------------------------------------------------------------------
#include "G4ios.hh"
#include <iomanip>
@@ -43,19 +37,17 @@
// force REFERENCE macros _not_ to be expanded here
// but wherever the class is used (w/ that .hh use)
#define G4PhysicsConstructorRegistry_cc 1
#include "G4PhysicsConstructorRegistry.hh"
#include "G4VPhysicsConstructor.hh"
#include "G4PhysicsConstructorFactory.hh"
G4ThreadLocal G4PhysicsConstructorRegistry* G4PhysicsConstructorRegistry::theInstance = 0;
G4ThreadLocal G4PhysicsConstructorRegistry* G4PhysicsConstructorRegistry::theInstance = nullptr;
G4PhysicsConstructorRegistry* G4PhysicsConstructorRegistry::Instance()
{
if(0 == theInstance) {
static G4ThreadLocal G4PhysicsConstructorRegistry *manager_G4MT_TLS_ = 0 ; if (!manager_G4MT_TLS_) manager_G4MT_TLS_ = new G4PhysicsConstructorRegistry ; G4PhysicsConstructorRegistry &manager = *manager_G4MT_TLS_;
theInstance = &manager;
}
if(nullptr == theInstance) theInstance = new G4PhysicsConstructorRegistry;
return theInstance;
}
@@ -69,12 +61,12 @@ G4PhysicsConstructorRegistry::~G4PhysicsConstructorRegistry()
void G4PhysicsConstructorRegistry::Clean()
{
size_t n = physConstr.size();
std::size_t n = physConstr.size();
if(n > 0) {
for (size_t i=0; i<n; ++i) {
for (std::size_t i=0; i<n; ++i) {
if(physConstr[i]) {
G4VPhysicsConstructor* p = physConstr[i];
physConstr[i] = 0;
physConstr[i] = nullptr;
delete p;
}
}
@@ -84,10 +76,10 @@ void G4PhysicsConstructorRegistry::Clean()
void G4PhysicsConstructorRegistry::Register(G4VPhysicsConstructor* p)
{
if(!p) return;
size_t n = physConstr.size();
if(nullptr == p) return;
std::size_t n = physConstr.size();
if(n > 0) {
for (size_t i=0; i<n; ++i) {
for (std::size_t i=0; i<n; ++i) {
if(physConstr[i] == p) { return; }
}
}
@@ -96,12 +88,12 @@ void G4PhysicsConstructorRegistry::Register(G4VPhysicsConstructor* p)
void G4PhysicsConstructorRegistry::DeRegister(G4VPhysicsConstructor* p)
{
if ( !p ) return;
size_t n = physConstr.size();
if (nullptr == p) return;
std::size_t n = physConstr.size();
if ( n > 0 ) {
for (size_t i=0; i<n; ++i) {
for (std::size_t i=0; i<n; ++i) {
if ( physConstr[i] == p ) {
physConstr[i] = 0;
physConstr[i] = nullptr;
return;
}
}
@@ -130,7 +122,7 @@ G4VPhysicsConstructor* G4PhysicsConstructorRegistry::GetPhysicsConstructor(const
G4ExceptionDescription ED;
ED << "The factory for the physics constructor ["<< name << "] does not exist!" << G4endl;
G4Exception("G4PhysicsConstructorRegistry::GetPhysicsConstructor", "PhysicsList001", FatalException, ED);
return 0;
return nullptr;
}
}
@@ -158,28 +150,24 @@ void G4PhysicsConstructorRegistry::PrintAvailablePhysicsConstructors() const
<< G4endl;
if ( avail.empty() ) G4cout << "... no registered processes" << G4endl;
else {
size_t n = avail.size();
for (size_t i=0; i<n; ++i ) {
std::size_t n = avail.size();
for (std::size_t i=0; i<n; ++i ) {
G4cout << " [" << std::setw(3) << i << "] "
<< " \"" << avail[i] << "\"" << G4endl;
}
}
}
//
// External reference to phy ctor factories for running with 'static'
// libraries to pull the references of the declared factories into the
// same compilation unit as the registry itself.
// No harm having them in the non-static case.
//
// Ideally we'd do the G4_REFERENCE_PHYSCONSTR_FACTORY() macros
// here, but this introduces a circular dependence between the
// ctor_phys_factory library and the other ctor_phys_* libraries
// when creating granular libraries.
// Instead we'll make the references in the location(s) where the
// G4PhysicsConstructorRegistry is _used_ :
// G4
/*
#include "G4RegisterPhysicsConstructors.icc"
*/
//
//#include "G4RegisterPhysicsConstructors.icc"