simple-build-dgcode 0.0.16__tar.gz → 0.0.17__tar.gz

{simple-build-dgcode-0.0.16/src/simple_build_dgcode.egg-info → simple-build-dgcode-0.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-build-dgcode
-Version: 0.0.16
+Version: 0.0.17
 Summary: The Geant4-based coding framework originating in the ESS Detector Group, provided as a simplebuild bundle of packages.
 Author-email: Thomas Kittelmann <thomas.kittelmann@ess.eu>
 License: The Apache 2.0 license is reproduced in the following. See the NOTICE file for

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17/src/simple_build_dgcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-build-dgcode
-Version: 0.0.16
+Version: 0.0.17
 Summary: The Geant4-based coding framework originating in the ESS Detector Group, provided as a simplebuild bundle of packages.
 Author-email: Thomas Kittelmann <thomas.kittelmann@ess.eu>
 License: The Apache 2.0 license is reproduced in the following. See the NOTICE file for

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simple_build_dgcode.egg-info/SOURCES.txt

@@ -181,13 +181,12 @@ src/simplebuild_dgcode/data/pkgs/G4/G4OSG/libsrc/WireframeUtils.hh
 src/simplebuild_dgcode/data/pkgs/G4/G4OSG/pycpp_Viewer/mod.cc
 src/simplebuild_dgcode/data/pkgs/G4/G4OSG/scripts/viewgriff
 src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/pkg.info
+src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/data/plugin_g4physlist_Empty.txt
+src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libinc/PhysListMgr.hh
 src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libinc/PhysicsListEmpty.hh
-src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libinc/PhysicsListFactory.hh
+src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libsrc/PhysListMgr.cc
 src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libsrc/PhysicsListEmpty.cc
-src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libsrc/PhysicsListFactory.cc
-src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libsrc/PhysicsListFactory_py.cc
 src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/pycpp__init/mod.cc
-src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/pycpp_g4physlist_Empty/mod.cc
 src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/python/__init__.py
 src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/scripts/showall
 src/simplebuild_dgcode/data/pkgs/G4/G4Random/pkg.info
@@ -525,6 +524,10 @@ src/simplebuild_dgcode/data/pkgs/Utils/Mesh3D/pycpp__init/mod.cc
 src/simplebuild_dgcode/data/pkgs/Utils/Mesh3D/python/viewer.py
 src/simplebuild_dgcode/data/pkgs/Utils/Mesh3D/scripts/browse
 src/simplebuild_dgcode/data/pkgs/Utils/Mesh3D/scripts/merge
+src/simplebuild_dgcode/data/pkgs/Utils/PluginUtils/pkg.info
+src/simplebuild_dgcode/data/pkgs/Utils/PluginUtils/libinc/PluginHelper.hh
+src/simplebuild_dgcode/data/pkgs/Utils/PluginUtils/libinc/PluginHelper.icc
+src/simplebuild_dgcode/data/pkgs/Utils/PluginUtils/libsrc/PluginHelper.cc
 src/simplebuild_dgcode/data/pkgs/Utils/RandUtils/pkg.info
 src/simplebuild_dgcode/data/pkgs/Utils/RandUtils/libinc/Rand.hh
 src/simplebuild_dgcode/data/pkgs/Utils/RandUtils/libinc/RandHelper.hh
@@ -544,6 +547,7 @@ src/simplebuild_dgcode/data/pkgs/Utils/ScanUtils/scripts/inspectscans
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/pkg.info
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/ArrayMath.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/ByteStream.hh
+src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/Cmd.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/DelayedAllocVector.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/DummyParamHolder.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/FastLookupSet.hh
@@ -564,6 +568,7 @@ src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/RefCountBase.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/StrSwitch.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/StringSort.hh
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libinc/Url2Local.hh
+src/simplebuild_dgcode/data/pkgs/Utils/Utils/libsrc/Cmd.cc
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libsrc/DummyParamHolder.cc
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libsrc/Format.cc
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/libsrc/Glob.cc
@@ -593,6 +598,7 @@ src/simplebuild_dgcode/data/pkgs/Utils/Utils/python/runscript.py
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/python/textball.py
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/scripts/md5sum
 src/simplebuild_dgcode/data/pkgs/Utils/Utils/scripts/sort
+src/simplebuild_dgcode/data/pkgs/Utils/Utils/scripts/url2local
 src/simplebuild_dgcode/data/pkgs/Utils/XSectUtils/G4XSectDump/pkg.info
 src/simplebuild_dgcode/data/pkgs/Utils/XSectUtils/G4XSectDump/pycpp_XSectSpy/XSectSpySteppingAction.hh
 src/simplebuild_dgcode/data/pkgs/Utils/XSectUtils/G4XSectDump/pycpp_XSectSpy/mod.cc
@@ -900,6 +906,11 @@ src/simplebuild_dgcode/data/pkgs_val/UnitTests/MeshTests/scripts/testreadref.log
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/NCrystalRelTests/pkg.info
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/NCrystalRelTests/scripts/testnamedmat
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/NCrystalRelTests/scripts/teststdpy
+src/simplebuild_dgcode/data/pkgs_val/UnitTests/PlugUtilsTests/pkg.info
+src/simplebuild_dgcode/data/pkgs_val/UnitTests/PlugUtilsTests/app_test/main.cc
+src/simplebuild_dgcode/data/pkgs_val/UnitTests/PlugUtilsTests/data/plugin_mytestplugintype_Bla_bla.txt
+src/simplebuild_dgcode/data/pkgs_val/UnitTests/PlugUtilsTests/data/plugin_mytestplugintype_WUHU.txt
+src/simplebuild_dgcode/data/pkgs_val/UnitTests/PlugUtilsTests/libsrc/plugins.cc
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/PyAnaTests/pkg.info
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/PyAnaTests/scripts/test
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/RandTests/pkg.info
@@ -930,6 +941,7 @@ src/simplebuild_dgcode/data/pkgs_val/UnitTests/UtilsTests/app_testmurmurhash/tes
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/UtilsTests/app_testparameterbase/main.cc
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/UtilsTests/app_testpsv/main.cc
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/UtilsTests/app_testreadnbrs/main.cc
+src/simplebuild_dgcode/data/pkgs_val/UnitTests/UtilsTests/app_url2local_cpp/main.cc
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/UtilsTests/pycpp_usenp/mod.cc
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/UtilsTests/scripts/testmaxwell
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/UtilsTests/scripts/testmaxwell.log

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/G4/G4Launcher/libsrc/Launcher.cc

@@ -7,7 +7,7 @@
 #include "Core/String.hh"
 #include "G4Launcher/Launcher.hh"
 #include "G4Launcher/SingleParticleGun.hh"
-#include "G4PhysicsLists/PhysicsListFactory.hh"
+#include "G4PhysicsLists/PhysListMgr.hh"
 #include "G4Interfaces/GeoConstructBase.hh"
 #include "G4Interfaces/ParticleGenBase.hh"
 #include "G4Interfaces/StepFilterBase.hh"
@@ -431,19 +431,7 @@ void G4Launcher::Launcher::Imp::preinit()
           }
         }
 
-        //A bit brute-force and inefficient, but no biggie:
-        std::vector<std::string> reflists;
-        PhysicsListFactory::getAllReferenceListNames(reflists);
-        for (auto it = reflists.begin();it!=reflists.end();++it) {
-          if (*it==pln_parts.front()) {
-            pl = PhysicsListFactory::createReferencePhysicsList(pln_parts.front());
-            assert(pl);
-          }
-        }
-        if (!pl) {
-          //Our own custom list which was simply specified via a string name rather than a provider?
-          pl = PhysicsListFactory::attemptCreateCustomPhysicsList(pln_parts.front());
-        }
+        pl = PhysListMgr::createList( pln_parts.front() );
         if (!pl) {
           printf("%sUnknown physics list: %s\n",prefix(),pln_parts.front().c_str());
           error("Physics list name is not known");

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/G4/G4Launcher/python/_launcher.py

@@ -583,19 +583,20 @@ def _swallowCmdLineAndLaunch(self):
 
     self._shutdown()#shutdown: Make sure run-manager deletion happens now and not when garbage collection runs
 
-_setPhysicsList_orig = Launcher.setPhysicsList
-def _setPhysicsList(self,physlistname):
-    #Make sure that custom physics lists will be translated into a provider
-    #rather than just the string (this assumes that the default physics list
-    #will not be custom, which it can't be if we want to avoid a direct
-    #dependency on the custom physics list code in question).
-    import G4PhysicsLists
-    if G4PhysicsLists.listIsCustom(physlistname):
-        #extract physics list provider and apply that:
-        self.setPhysicsListProvider(G4PhysicsLists.extractProvider(physlistname))
-    else:
-        _setPhysicsList_orig(self,physlistname)
+##_setPhysicsList_orig = Launcher.setPhysicsList
+##def _setPhysicsList(self,physlistname):
+##    #Make sure that custom physics lists will be translated into a provider
+##    #rather than just the string (this assumes that the default physics list
+##    #will not be custom, which it can't be if we want to avoid a direct
+##    #dependency on the custom physics list code in question).
+##    import G4PhysicsLists
+##    if G4PhysicsLists.listIsCustom(physlistname):
+##        #extract physics list provider and apply that:
+##        self.setPhysicsListProvider(G4PhysicsLists.extractProvider(physlistname))
+##    else:
+##        _setPhysicsList_orig(self,physlistname)
+##
+#Launcher.setPhysicsList = _setPhysicsList
 
-Launcher.setPhysicsList = _setPhysicsList
 Launcher.swallowCmdLineAndLaunch = _swallowCmdLineAndLaunch
 Launcher.go = _swallowCmdLineAndLaunch#alias

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/G4/G4Materials/libsrc/NamedMaterialProvider.cc

@@ -1,7 +1,7 @@
 #define DOSUPPORT_NCRYSTALDEV_MATERIALS
 
 #ifdef DOSUPPORT_NCRYSTALDEV_MATERIALS
-#  include "Core/Python.hh"//for dynamic NCrystalDev support
+#  include "PluginUtils/PluginHelper.hh"//for dynamic NCrystalDev support
 #endif
 #include "G4Materials/NamedMaterialProvider.hh"
 #include "G4Materials/CommonMaterials.hh"
@@ -26,6 +26,19 @@ namespace NC = NCrystal;
 
 namespace NamedMaterialProvider {
 
+#ifdef DOSUPPORT_NCRYSTALDEV_MATERIALS
+  namespace {
+    const G4Material * loadNCrystalDevMaterial( const std::string& cfgstr )
+    {
+      static auto thelib = PluginHelper::loadPkgLib( "NCrystalPreview" );
+      static auto thefunc =
+        thelib->getFunction<G4Material*(const char*)>
+        ("plugin_ncrystaldev_create_material");
+      return thefunc( cfgstr.c_str() );
+    }
+  }
+#endif
+
   static std::string s_prefix;
   void setPrintPrefix(const char* p)
   {
@@ -33,7 +46,6 @@ namespace NamedMaterialProvider {
     s_prefix += "NamedMaterial ";
   }
 
-
   struct MatInfo {
     MatInfo(const std::string&fullname);
     std::string fullname;
@@ -456,7 +468,7 @@ G4Material * NamedMaterialProvider::getMaterial(const std::string& sss)
     cfgstr += matinfo.getTempAsNCrystalCfgStrPostfix();
     cfgstr += matinfo.getDensityAsNCrystalCfgStrPostfix();
     //Use NCrystal from the NCrystalPreview package in the ncrystaldev repo, but
-    //use python bindings to avoid a static dependency (FIXME: It would be
+    //use dynamic bindings to avoid a static dependency (FIXME: It would be
     //better to enable dynamic "NamedMaterial factories" and have such a factory
     //in the NCrystalDev repo!!!).
     {
@@ -466,19 +478,11 @@ G4Material * NamedMaterialProvider::getMaterial(const std::string& sss)
                                  "must be enabled. This is intended solely for code in the ncrystaldev repo, most\n"
                                  "users should use \"NCrystal\" instead of \"NCrystalDev\".\n");
       }
-      pyextra::ensurePyInit();
-      py::object mod = pyextra::pyimport("NCrystalPreview");
-      py::object py_g4mat_str = mod.attr("createMaterial_AsSafeStr")(py::str(cfgstr));
-      if ( !py::isinstance<py::str>( py_g4mat_str ) )
-        throw std::runtime_error("Unexpected problem getting G4Material pointer for NCrystalDev material.");
-      std::string g4mat_str =  py_g4mat_str.cast<std::string>();
-      std::stringstream ss_int;
-      ss_int << g4mat_str;
-      std::uintptr_t g4mat_int;
-      ss_int >> g4mat_int;
-      mat = reinterpret_cast<G4Material*>(g4mat_int);
-      if (!mat)
-        throw std::runtime_error("Got null G4Material pointer for NCrystalDev material.");
+      const G4Material * ncdevmat = loadNCrystalDevMaterial(cfgstr);
+      if (!ncdevmat)
+        throw std::runtime_error("Got null G4Material pointer"
+                                 " for NCrystalDev material.");
+      mat = const_cast<G4Material *>(ncdevmat);//fixme: https://github.com/mctools/simplebuild-dgcode/issues/34
     }
 #else
     throw std::runtime_error("NamedMaterialProvider was compiled without support for NCrystalDev materials");
@@ -609,18 +613,21 @@ G4Material * NamedMaterialProvider::getMaterial(const std::string& sss)
 
   } else {
 
-    /////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    ////// NIST materials, NCrystal or Shielding MATERIALS - POSSIBLY WITH CHANGED DENSITY AND TEMPERATURE //////
-    /////////////////////////////////////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////////////////////////////////////
+    ////// NIST materials, NCrystal or Shielding MATERIALS //////
+    ////// - POSSIBLY WITH CHANGED DENSITY AND TEMPERATURE //////
+    /////////////////////////////////////////////////////////////
 
     if ( NC::contains(matinfo.name, ';') ) {
-      printf("%sERROR: Invalid request (did you use \";\" instead of \":\" ?): \"%s\".\n",
+      printf("%sERROR: Invalid request (did you use \";\" "
+             "instead of \":\" ?): \"%s\".\n",
              s_prefix.c_str(),matinfo.name.c_str());
       exit(1);
     }
 
     if ( NC::contains_any(matinfo.name, ";:<>/[]\\" ) ) {
-      printf("%sERROR: Unexpected special character in requested material name \"%s\"\n",
+      printf("%sERROR: Unexpected special character in requested"
+             " material name \"%s\"\n",
              s_prefix.c_str(),matinfo.name.c_str());
       exit(1);
     }
@@ -629,14 +636,17 @@ G4Material * NamedMaterialProvider::getMaterial(const std::string& sss)
       //Shielding material
       mat = ShieldingMaterials::createMat(matinfo.name);
       if (!mat) {
-        printf("%sERROR: Unknown shielding material \"%s\"\n",s_prefix.c_str(),matinfo.name.c_str());
+        printf("%sERROR: Unknown shielding material \"%s\"\n",
+               s_prefix.c_str(),matinfo.name.c_str());
         exit(1);
       }
     } else {
       //G4 nist material
-      mat = CommonMaterials::getNISTMaterial(matinfo.name.c_str(),s_prefix.c_str());
+      mat = CommonMaterials::getNISTMaterial(matinfo.name.c_str(),
+                                             s_prefix.c_str());
       if (!mat) {
-        printf("%sERROR: Unknown material \"%s\"\n",s_prefix.c_str(),matinfo.name.c_str());
+        printf("%sERROR: Unknown material \"%s\"\n",
+               s_prefix.c_str(),matinfo.name.c_str());
         exit(1);
       }
     }
@@ -650,7 +660,6 @@ G4Material * NamedMaterialProvider::getMaterial(const std::string& sss)
                            mat0->GetState(),
                            temperature,
                            mat0->GetPressure());
-      //      NXSG4::copyProperty(mat0,mat);//in case shielding materials ever use nxsg4 properties
     } else {
       assert(matinfo.name==matinfo.fullname);//no other properties
     }
@@ -658,10 +667,11 @@ G4Material * NamedMaterialProvider::getMaterial(const std::string& sss)
 
   assert(mat);
 
-  //make sure the name is set consistently (only when material does not already have a base material!!!)
-  //See also https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2520
+  //make sure the name is set consistently (only when material does not already
+  //have a base material!!!)  See also
+  //https://bugzilla-geant4.kek.jp/show_bug.cgi?id=2520
 
-  if ( matinfo.fullname != mat->GetName() && mat->GetBaseMaterial() == nullptr ) {
+  if ( matinfo.fullname != mat->GetName() && !mat->GetBaseMaterial() ) {
     G4Material * mat0 = mat;
     mat = new G4Material(matinfo.fullname.c_str(),
                          mat0->GetDensity(),
@@ -669,12 +679,12 @@ G4Material * NamedMaterialProvider::getMaterial(const std::string& sss)
                          mat0->GetState(),
                          mat0->GetTemperature(),
                          mat0->GetPressure());
-    //NXSG4::copyProperty(mat0,mat);
-    //No need to copy NCrystal property, since it resides in the
+    //NB: No need to copy NCrystal property, since it resides in the
     //G4MaterialPropertyTable which is copied over when used as a base material.
-    //update: the mat->GetBaseMaterial() check means we never do this for the NCrystal materials
+    //update: the mat->GetBaseMaterial() check means we never do this for the
+    //NCrystal materials
+    //assert(matinfo.fullname == mat->GetName());
   }
-  //  assert(matinfo.fullname == mat->GetName());
 
   cache[ss] = mat;
   return validate( mat );

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/G4/G4Materials/pkg.info

@@ -1,4 +1,4 @@
-package(USEPKG Utils IdealGasBuilder G4NCrystalRel)
+package(USEPKG Utils IdealGasBuilder G4NCrystalRel PluginUtils)
 
 ######################################################################
 

simple-build-dgcode-0.0.17/src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/data/plugin_g4physlist_Empty.txt

@@ -0,0 +1 @@
+Empty physics list.

simple-build-dgcode-0.0.17/src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libinc/PhysListMgr.hh

@@ -0,0 +1,20 @@
+#ifndef dgcode_PhysListMgr_hh
+#define dgcode_PhysListMgr_hh
+
+#include <string>
+#include <vector>
+class G4VUserPhysicsList;
+
+namespace PhysListMgr {
+  struct PhysListInfo {
+    std::string name;
+    std::string pkg_name;//not set for g4 ref lists
+    std::string description;//only set if loaded.
+  };
+  enum class LoadDescriptions { YES, NO };
+  std::vector<PhysListInfo> getAllLists( LoadDescriptions
+                                         = LoadDescriptions::NO );
+  G4VUserPhysicsList * createList( std::string name );
+}
+
+#endif

simple-build-dgcode-0.0.17/src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libsrc/PhysListMgr.cc

@@ -0,0 +1,116 @@
+#include "G4PhysicsLists/PhysListMgr.hh"
+#include "NCrystal/internal/NCStrView.hh"
+#include <cstdlib>
+#include "G4PhysListFactory.hh"
+#include "PluginUtils/PluginHelper.hh"
+
+namespace PhysListMgr {
+  namespace {
+    struct dgcode_PluginDef_G4PL {
+      using plugin_fct_signature_t = G4VUserPhysicsList *();
+      static constexpr const char * plugin_type = "g4physlist";
+    };
+
+    G4VUserPhysicsList *
+    createReferencePhysicsList(const std::string& name)
+    {
+      //G4 provided reference lists:
+      G4PhysListFactory reflist_factory;
+      return reflist_factory.GetReferencePhysList(name);
+    }
+
+    std::vector<std::string> getAllReferenceListNames()
+    {
+      //G4 provided reference lists:
+      G4PhysListFactory reflist_factory;
+      auto refpl_buggy = reflist_factory.AvailablePhysLists();
+      //alternative endings for EM physics:
+      auto refplEM = reflist_factory.AvailablePhysListsEM();
+
+      //Workaround bug in G4PhysListFactory: QGSP is too much, ShieldingLEND is
+      //missing. Also, ShieldingLEND should only be there when G4LENDDATA is
+      //set.
+      static const std::string envG4LENDDATA = []() {
+        const char * envG4LENDDATA_cstr = std::getenv("G4LENDDATA");
+        return std::string( envG4LENDDATA_cstr ? envG4LENDDATA_cstr : "" );
+      }();
+
+      bool allowLEND = !envG4LENDDATA.empty();
+
+      std::vector<std::string> refpl;
+      bool sawShieldingLEND = false;
+      for (auto it = refpl_buggy.begin();it != refpl_buggy.end();++it) {
+        if (*it=="QGSP")
+          continue;
+        if (*it=="ShieldingLEND") {
+          sawShieldingLEND = true;
+          if (allowLEND)
+            refpl.push_back(*it);
+        } else {
+          refpl.push_back(*it);
+        }
+      }
+      if (allowLEND&&!sawShieldingLEND)
+        refpl.push_back("ShieldingLEND");
+
+      //combine hadronic and em parts (a large number admittedly):
+      std::vector<std::string> v;
+      v.reserve(128);
+      for (auto it = refpl.begin();it != refpl.end();++it) {
+        for (auto itEM = refplEM.begin();itEM!= refplEM.end();++itEM)
+          v.push_back(*it+*itEM);
+      }
+      return v;
+    }
+  }
+}
+
+std::vector<PhysListMgr::PhysListInfo>
+PhysListMgr::getAllLists( LoadDescriptions load_descr_enum )
+{
+  bool load_descr( load_descr_enum==LoadDescriptions::YES );
+  auto load_descr_ph( load_descr
+                      ? PluginHelper::LoadDescriptions::YES
+                      : PluginHelper::LoadDescriptions::NO );
+  std::vector<PhysListMgr::PhysListInfo> res;
+
+  //First the G4 ref lists:
+  const std::string g4reflistdescr("Geant4 reference list");
+  for ( auto& reflistname : getAllReferenceListNames() ) {
+    if ( NCrystal::StrView( reflistname ).startswith("PL_") )
+      throw std::runtime_error("g4 ref lists are assumed"
+                               " to never start with \"PL_\"");
+    res.emplace_back();
+    auto& e = res.back();
+    e.name = reflistname;
+    if ( load_descr )
+      e.description = g4reflistdescr;
+  }
+  //Then the custom plugins:
+
+  for ( auto & plugininfo : PluginHelper::getAvailablePlugins
+          <dgcode_PluginDef_G4PL>( load_descr_ph ) )
+    {
+      res.emplace_back();
+      auto& e = res.back();
+      e.name = std::string("PL_")+plugininfo.plugin_key;
+      e.pkg_name = plugininfo.pkgname;
+      if ( plugininfo.description.has_value() )
+        e.description = plugininfo.description.value();
+    }
+  return res;
+}
+
+G4VUserPhysicsList * PhysListMgr::createList( std::string name )
+{
+  NCrystal::StrView name_sv(name);
+  if ( name_sv.startswith("PL_") ) {
+    //A custom plugins:
+    name_sv = name_sv.substr(3);//discard "PL_"
+    auto pl_fct
+      = PluginHelper::loadPlugin<dgcode_PluginDef_G4PL>(name_sv.to_string());
+    return pl_fct();
+  } else {
+    return createReferencePhysicsList( name );
+  }
+}

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/libsrc/PhysicsListEmpty.cc

@@ -35,3 +35,10 @@ void PhysicsListEmpty::ConstructProcess()
 }
 
 
+
+extern "C" {
+  G4VUserPhysicsList * sbldplugindef_g4physlist_Empty()
+  {
+    return new PhysicsListEmpty;
+  }
+}

simple-build-dgcode-0.0.17/src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/pycpp__init/mod.cc

@@ -0,0 +1,44 @@
+#include "Core/Python.hh"
+#include "G4PhysicsLists/PhysListMgr.hh"
+
+namespace {
+
+  py::list pyPhysListMgr_getLists( bool with_descr,
+                                   bool include_g4ref,
+                                   bool include_custom )
+  {
+    py::list l;
+    if ( !include_g4ref && !include_custom )
+      return l;
+    for ( auto& e : PhysListMgr::getAllLists() ) {
+      bool is_custom = !e.pkg_name.empty();
+      if ( !include_g4ref && !is_custom )
+        continue;
+      if ( !include_custom && is_custom )
+        continue;
+      if ( with_descr ) {
+        std::string descr;
+        if ( is_custom ) {
+          descr = "List defined in package ";
+          descr += e.pkg_name;
+        } else {
+          descr = "Geant4 reference list";
+        }
+        //FIXME: e.description could also be used?!?
+        l.append( py::make_tuple(py::str(e.name),
+                                 py::str(descr)) );
+      } else {
+        l.append( e.name );
+      }
+    }
+    return l;
+  }
+
+
+}
+
+PYTHON_MODULE( mod )
+{
+  mod.def("_get_lists",&pyPhysListMgr_getLists);
+}
+

simple-build-dgcode-0.0.17/src/simplebuild_dgcode/data/pkgs/G4/G4PhysicsLists/python/__init__.py

@@ -0,0 +1,20 @@
+#autogenerated file
+__doc__='python module for package G4PhysicsLists'
+from . _init import _get_lists as _cpp_get_lists
+
+def getAllListNames(include_description = False, include_base = True, include_custom = True):
+    base=[]
+    custom=[]
+    if include_base:
+        base = _cpp_get_lists( include_description, True, False )
+    if include_custom:
+        custom = _cpp_get_lists( include_description, False, True )
+    return sorted(base)+sorted(custom)
+
+def listIsCustom(plname):
+    return plname.startswith('PL_')
+
+def printAvailableLists():
+    print ("Available physics lists (append +TS or +OPTICAL to inject thermal scattering / optical processes):")
+    for l,descr in getAllListNames(include_description=True):
+        print ("   %s [%s]"%(l,descr))

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libsrc/DBStringsReader.cc

@@ -22,7 +22,7 @@ void EvtFile::DBStringsReader::load(const char*& data)
   unsigned oldnstr = m_stringdb.size();
   m_stringdb.resize(oldnstr+nstrings);
   str_type* it = &(m_stringdb[oldnstr]);
-  str_type* itE = &(m_stringdb[m_stringdb.size()]);
+  str_type* itE = std::next(it,nstrings);
 
   while(it!=itE)
     ByteStream::read(data,*(it++));

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libsrc/FileReader.cc

@@ -4,6 +4,7 @@
 #include "EvtFileDefs.hh"
 #include "Utils/ProgressiveHash.hh"
 #include "ZLibUtils/Compress.hh"
+#include <limits>
 #include <cassert>
 
 namespace EvtFile {
@@ -349,7 +350,11 @@ namespace EvtFile {
       if (m_fulldata_compressed) {
         //uncompress:
         assert(n>sizeof(std::uint32_t));
-        ZLibUtils::decompressToBuffer(&(m_section_fulldata_compressed[0]), n, m_section_fulldata,m_fulldata_size);
+        //ZLibUtils::decompressToBuffer(&(m_section_fulldata_compressed[0]), n, m_section_fulldata,m_fulldata_size);
+        ZLibUtils::decompressToBufferNew(&(m_section_fulldata_compressed[0]), n, m_section_fulldata);
+        if ( m_section_fulldata.size() >= std::numeric_limits<unsigned>::max() )
+          throw std::runtime_error("full data section size exceeds unsigned integer limits");
+        m_fulldata_size = static_cast<unsigned>(m_section_fulldata.size());
       }
     }
     m_fulldata_isloaded=true;

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/MCPL/MCNP/libsrc/sswmcpl.c

@@ -144,7 +144,8 @@ int ssw2mcpl2(const char * sswfile, const char * mcplfile,
     buf[0] = '\0';
     strcat(buf,"SSW file from ");
     strcat(buf,ssw_mcnpflavour(f));
-    strcat(buf," converted with ssw2mcpl (from MCPL release v" MCPL_VERSION_STR ")");
+    strcat(buf," converted with ssw2mcpl (from MCPL release v"
+           MCPL_VERSION_STR ")"); // cppcheck-suppress unknownMacro
     mcpl_hdr_add_comment(mcplfh,buf);
 
     buf[0] = '\0';

{simple-build-dgcode-0.0.16 → simple-build-dgcode-0.0.17}/src/simplebuild_dgcode/data/pkgs/MCPL/MCPL/libsrc/mcpl.c

@@ -1950,7 +1950,8 @@ mcpl_outfile_t mcpl_forcemerge_files( const char * file_output,
     opt_uf = 0;
 
   mcpl_outfile_t out = mcpl_create_outfile(file_output);
-  mcpl_hdr_set_srcname(out,"mcpl_forcemerge_files (from MCPL v" MCPL_VERSION_STR ")");
+  mcpl_hdr_set_srcname(out,"mcpl_forcemerge_files (from MCPL v"
+                       MCPL_VERSION_STR ")"); // cppcheck-suppress unknownMacro
   if ( opt_uf )
     mcpl_enable_userflags(out);
   if ( opt_pol )