Import Geant4 11.1.0.beta source tree

source/particles/CMakeLists.txt

@@ -1,11 +1,8 @@
 # - G4particles category build
-
-# Add (private) allocation export symbol
 add_definitions(-DG4PARTICLES_ALLOC_EXPORT)
 
 # Compose library from subcategories
-geant4_global_library_target(NAME G4particles
-  COMPONENTS
+foreach(modfile
     adjoint/sources.cmake
     bosons/sources.cmake
     hadrons/barions/sources.cmake
@@ -15,3 +12,17 @@ geant4_global_library_target(NAME G4particles
     management/sources.cmake
     shortlived/sources.cmake
     utils/sources.cmake)
+  include(${modfile})
+endforeach()
+
+geant4_add_category(G4particles
+  MODULES
+    G4partadj
+    G4bosons
+    G4baryons
+    G4ions
+    G4mesons
+    G4leptons
+    G4partman
+    G4shortlived
+    G4partutils )

source/particles/History

@@ -1,24 +1,31 @@
--------------------------------------------------------------------
+# Category particles History
 
-     =========================================================
-     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
-     =========================================================
+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!
 
-                      Category History file
-                      ---------------------
-This file should be used by G4 developers and category coordinators
-to briefly summarize all major modifications introduced in the code
-and keep track of all category-tags.
-It DOES NOT substitute the  CVS log-message one should put at every
-committal in the CVS repository !
+-------------------------------------------------------------------------------
 
-     ----------------------------------------------------------
-     * Reverse chronological order (last date on top), please *
-     ----------------------------------------------------------
+## 2022-05-16 Guilherme Amadio (particles-V11-00-04)
+- Replace getenv() calls for data variables with G4FindDataDir()
 
-- 09 February 2022 Gabriele Cosmo (particles-V10-07-11)
+## 2022-02-09 Gabriele Cosmo (particles-V11-00-03)
 - Fixed compilation warnings on Intel compiler for unused variables.
 
+## 2022-01-28 Ben Morgan (particles-V11-00-02)
+- Replace `geant4_global_library_target` with direct file inclusion and
+  call to `geant4_add_category` to define library build from source modules.
+  
+## 2021-12-15 Ben Morgan (particles-V11-00-01)
+- Minor code formatting.
+
+## 2021-12-10 Ben Morgan (particles-V11-00-00)
+- Change to new Markdown History format.
+
+---
+
+# History entries prior to 11.0
+
 - 02 November 2021 Gabriele Cosmo (particles-V10-07-10)
 - Fix for potential null pointer dereference in G4ParticleTable::FindParticle().
   Based on GitHub PR#30 (https://github.com/Geant4/geant4/pull/30).

source/particles/adjoint/History

@@ -1,20 +1,17 @@
--------------------------------------------------------------------
+# Category partadjoint History
 
-     =========================================================
-     Geant4 - an Object-Oriented Toolkit for Simulation in HEP
-     =========================================================
+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!
 
-                      Category History file
-                      ---------------------
-This file should be used by G4 developers and category coordinators
-to briefly summarize all major modifications introduced in the code
-and keep track of all category-tags.
-It DOES NOT substitute the  CVS log-message one should put at every
-committal in the CVS repository !
 
-     ----------------------------------------------------------
-     * Reverse chronological order (last date on top), please *
-     ----------------------------------------------------------
+## 2021-12-10 Ben Morgan (partadjoint-V11-00-00)
+- Change to new Markdown History format
+
+---
+
+# History entries prior to 11.0
+
 -Dec 23 2016    Laurent Desorgher (partadjoint-V10-03-00)
  -Add particle G4AdjointElectronFI, needed for reverse electron forced interaction.
 

source/particles/management/include/G4DynamicParticle.icc

@@ -37,7 +37,9 @@ extern G4PART_DLL G4Allocator<G4DynamicParticle>*& pDynamicParticleAllocator();
 inline void * G4DynamicParticle::operator new(size_t)
 {
   if (pDynamicParticleAllocator() == nullptr)
+  {
     pDynamicParticleAllocator() = new G4Allocator<G4DynamicParticle>;
+  }
   return pDynamicParticleAllocator()->MallocSingle();
 }
 

source/particles/management/src/G4NuclideTable.cc

@@ -188,7 +188,7 @@ void G4NuclideTable::GenerateNuclide()
   if ( threshold_of_half_life < minimum_threshold_of_half_life )
   {
     // Need to update full list
-    char* path = std::getenv("G4ENSDFSTATEDATA");
+    const char* path = G4FindDataDir("G4ENSDFSTATEDATA");
 
     if ( path == nullptr )
     {