simple-build-dgcode 1.3.2__tar.gz → 1.4.0__tar.gz

{simple_build_dgcode-1.3.2/src/simple_build_dgcode.egg-info → simple_build_dgcode-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-build-dgcode
-Version: 1.3.2
+Version: 1.4.0
 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-1.3.2 → simple_build_dgcode-1.4.0/src/simple_build_dgcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simple-build-dgcode
-Version: 1.3.2
+Version: 1.4.0
 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-1.3.2 → simple_build_dgcode-1.4.0}/src/simple_build_dgcode.egg-info/SOURCES.txt

@@ -417,6 +417,10 @@ src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/extras.py
 src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/fpe.py
 src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/scripts/guiexample
 src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/scripts/plotfct
+src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc/pkg.info
+src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc/python/_fix_backend_gtk.py
+src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc/python/dyncmap.py
+src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc/python/fpe.py
 src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaUtils/pkg.info
 src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaUtils/python/bins.py
 src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaUtils/python/divide.py
@@ -744,6 +748,7 @@ src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4Tests/scripts/testcollect_r15_c
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4Tests/scripts/testcollect_r15_cpp.log
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4Tests/scripts/testcollect_r15_volfilter
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4Tests/scripts/testcollect_r15_volfilter.log
+src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4Tests/scripts/testdatasets
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4Tests/scripts/testex
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4Tests/scripts/testfilterex
 src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4Tests/scripts/testheatmap

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/pkg.info

@@ -1,4 +1,4 @@
-package( USEPKG Units USEEXT Numpy )
+package( USEPKG Units PyAnaMisc USEEXT Numpy )
 
 ######################################################################
 

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/__init__.py

@@ -71,7 +71,7 @@ if matplotlib.get_backend().lower()=='tkagg':
 
 #3) disable FPE's certain matplotlib function calls (we don't care too
 #   much about FPE's in other peoples gui/plotting code):
-from PyAna.fpe import standardMPLFixes as _standardMPLFixes
+from PyAnaMisc.fpe import standardMPLFixes as _standardMPLFixes
 _standardMPLFixes()
 
 #4) Make all legends draggable by default (unless new kw notdraggable=True) and set default numpoints=1 :

simple_build_dgcode-1.4.0/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/_fix_backend_gtk.py

@@ -0,0 +1 @@
+import PyAnaMisc._fix_backend_gtk

simple_build_dgcode-1.4.0/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/dyncmap.py

@@ -0,0 +1 @@
+from PyAnaMisc.dyncmap import dynamic_2d_colormap

simple_build_dgcode-1.4.0/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc/pkg.info

@@ -0,0 +1,7 @@
+package()
+
+######################################################################
+
+Package providing standalone modules (empty __init__.py!) related to PyAna.
+
+primary author: thomas.kittelmann@ess.eu

{simple_build_dgcode-1.3.2/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna → simple_build_dgcode-1.4.0/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc}/python/_fix_backend_gtk.py

@@ -6,7 +6,8 @@
 #we monkey-patch FigureCanvasGTK.destroy and block stderr while it is invoked.
 #
 #Hopefully in some future version of matplotlib this warning will disappear by itself.
-import sys,os
+import sys
+import os
 try:
     from matplotlib.backends.backend_gtk import FigureCanvasGTK
     if hasattr(FigureCanvasGTK,'destroy'):

{simple_build_dgcode-1.3.2/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna → simple_build_dgcode-1.4.0/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc}/python/dyncmap.py

@@ -1,4 +1,3 @@
-from __future__ import division
 __all__=['dynamic_2d_colormap']
 
 import numpy as np

simple_build_dgcode-1.4.0/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc/python/fpe.py

@@ -0,0 +1,43 @@
+def disableFPEDuringCall(obj,fctname):
+    import Core.misc
+    if not Core.misc.is_debug_build():
+        return
+    orig = getattr(obj,fctname)
+    import Core.FPE
+    nofpectxmgr = Core.FPE.DisableFPEContextManager
+    def safefct(*args,**kwargs):
+        with nofpectxmgr():
+            return orig(*args,**kwargs)
+    setattr(obj,fctname,safefct)
+
+__standardFixesDone = [False]
+def standardMPLFixes():
+    global __standardFixesDone
+    if __standardFixesDone[0]:
+        return
+    __standardFixesDone[0] = True
+    import Core.misc
+    if not Core.misc.is_debug_build():
+        return
+
+    try:
+        import matplotlib.pyplot
+    except ImportError:
+        return#do nothing
+
+    import matplotlib.figure
+    import matplotlib.scale
+    try:
+        import matplotlib.backends.backend_pdf
+    except ImportError:
+        pass
+    disableFPEDuringCall(matplotlib.pyplot,'tight_layout')
+    disableFPEDuringCall(matplotlib.figure.Figure,'tight_layout')
+    disableFPEDuringCall(matplotlib.figure.Figure,'savefig')
+    disableFPEDuringCall(matplotlib.pyplot,'show')
+    disableFPEDuringCall(matplotlib.pyplot,'plot')
+    disableFPEDuringCall(matplotlib.pyplot,'savefig')
+    if hasattr(matplotlib.scale,'LogTransformBase'):
+        disableFPEDuringCall(matplotlib.scale.LogTransformBase,'transform_non_affine')
+    if hasattr(matplotlib.scale,'LogTransform'):
+        disableFPEDuringCall(matplotlib.scale.LogTransform,'transform_non_affine')

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs/SimpleHists/SimpleHists/pkg.info

@@ -1,4 +1,4 @@
-package(USEPKG Utils USEEXT ZLib)
+package(USEPKG Utils PyAnaMisc USEEXT ZLib)
 
 ######################################################################
 

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs/SimpleHists/SimpleHists/python/_backend_test.py

@@ -7,9 +7,9 @@ _backend_ok = (_backend in ('tkagg','gtkagg','agg','macosx'))
 if _backend_ok and _backend=='gtkagg':
     #attempt to silence some useless/confusing warnings
     try:
-        import PyAna._fix_backend_gtk # noqa F401
+        import PyAnaMisc._fix_backend_gtk # noqa F401
     except ImportError:
-        #perhaps PyAna package was not built, no biggie, users might get warnings.
+        #perhaps PyAnaMisc package was not built, no biggie, users might get warnings.
         pass
 
 if _backend_ok and _backend=='tkagg':
@@ -21,11 +21,7 @@ if _backend_ok and _backend=='tkagg':
                                 message=('Treat the new Tool classes introduced in v1.5 as experimental'+
                                          ' for now, the API will likely change in version 2.1'))
 
-try:
-    from PyAna.fpe import standardMPLFixes as _standardMPLFixes # noqa E402
-except ModuleNotFoundError:
-    #fail silently, the PyAna pkg might be disabled
-    _standardMPLFixes = lambda : None
+from PyAnaMisc.fpe import standardMPLFixes as _standardMPLFixes # noqa E402
 _standardMPLFixes()
 
 def _ensure_backend_ok():

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs/SimpleHists/SimpleHists/python/plotutils.py

@@ -978,6 +978,16 @@ def _has_cmap(cm):
         return False
     return True
 
+def _mpl_register_cmap(name, cmap, fail_if_present = True ):
+    if fail_if_present and _has_cmap(name):
+        return
+    if hasattr(matplotlib,'colormaps'):
+        #force to allow overwrite:
+        matplotlib.colormaps.register(name=name,cmap=cmap,force=True)
+    else:
+        #deprecated? at least it stopped working.
+        plt.register_cmap(name=name,cname=cname)
+
 def plot2d_lego(hist,show=True,cmap=None):
     _ensure_backend_ok()
     if not cmap:
@@ -1036,15 +1046,15 @@ def plot2d(hist,show=True,cmap=None,statbox=False,statbox_exactcorner=False,figu
         cmap = cmaps[0]
 
     try:
-        from PyAna.dyncmap import dynamic_2d_colormap
+        from PyAnaMisc.dyncmap import dynamic_2d_colormap
         _,_,dynamic_cmap=dynamic_2d_colormap(tmp['X'])
-        plt.register_cmap(name=dynamic_cmap.name, cmap=dynamic_cmap)
+        _mpl_register_cmap(name=dynamic_cmap.name, cmap=dynamic_cmap)
         #to not break other functionality, make a fake copy for the "reverse" of
         #this custom map as well:
         import copy
         dynamic_cmap_r = copy.deepcopy(dynamic_cmap)
         dynamic_cmap_r.name = dynamic_cmap.name+'_r'
-        plt.register_cmap(name=dynamic_cmap_r.name, cmap=dynamic_cmap_r)#register a fake inverse
+        _mpl_register_cmap(name=dynamic_cmap_r.name, cmap=dynamic_cmap_r)#register a fake inverse
         cmaps+=[dynamic_cmap.name]
     except ImportError:
         pass

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs/Utils/Mesh3D/python/viewer.py

@@ -1,6 +1,6 @@
 from PyAna import plt, np
 from Mesh3D import Mesh3D
-import PyAna.dyncmap
+import PyAna.dyncmap#FIXME: PyAna.misc ?
 import matplotlib.widgets as mplwidgets
 
 class Mesh3DViewer:

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs_val/Examples/G4Examples/scripts/testhooks.log

@@ -1,6 +1,6 @@
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-03 [MT]   (10-November-2023)
+ Geant4 version Name: geant4-11-02-patch-02 [MT]   (21-June-2024)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -95,7 +95,7 @@ Custom Hook Class parameters: [dbl] some_param_dbl = 23.3
 
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-03 [MT]   (10-November-2023)
+ Geant4 version Name: geant4-11-02-patch-02 [MT]   (21-June-2024)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4GeantinoInsrtTests/scripts/test.log

@@ -1,6 +1,6 @@
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-03 [MT]   (10-November-2023)
+ Geant4 version Name: geant4-11-02-patch-02 [MT]   (21-June-2024)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278

{simple_build_dgcode-1.3.2 → simple_build_dgcode-1.4.0}/src/simplebuild_dgcode/data/pkgs_val/UnitTests/G4MCPLTests/scripts/testmcplgen.log

@@ -1,6 +1,6 @@
 
 **************************************************************
- Geant4 version Name: geant4-11-01-patch-03 [MT]   (10-November-2023)
+ Geant4 version Name: geant4-11-02-patch-02 [MT]   (21-June-2024)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278