simple-build-dgcode 1.7.2__tar.gz → 1.8.0__tar.gz

{simple_build_dgcode-1.7.2/src/simple_build_dgcode.egg-info → simple_build_dgcode-1.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-build-dgcode
-Version: 1.7.2
+Version: 1.8.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
@@ -215,10 +215,10 @@ Project-URL: Bug Tracker, https://github.com/mctools/simplebuild-dgcode/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: Unix
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: simple-build-system>=1.7.1
+Requires-Dist: simple-build-system>=1.8.0
 Provides-Extra: recommended
 Requires-Dist: numpy; extra == "recommended"
 Requires-Dist: ncrystal>=4.2.10; extra == "recommended"

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/pyproject.toml

@@ -13,7 +13,7 @@ authors = [
 ]
 description = "The Geant4-based coding framework originating in the ESS Detector Group, provided as a simplebuild bundle of packages."
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 license = {file = "LICENSE"}
 classifiers = [
     "Programming Language :: Python :: 3",
@@ -21,7 +21,7 @@ classifiers = [
     "Operating System :: Unix",
 ]
 dependencies = [
-    'simple-build-system >= 1.7.1'
+    'simple-build-system >= 1.8.0'
 ]
 
 [project.optional-dependencies]

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0/src/simple_build_dgcode.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: simple-build-dgcode
-Version: 1.7.2
+Version: 1.8.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
@@ -215,10 +215,10 @@ Project-URL: Bug Tracker, https://github.com/mctools/simplebuild-dgcode/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: Unix
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: simple-build-system>=1.7.1
+Requires-Dist: simple-build-system>=1.8.0
 Provides-Extra: recommended
 Requires-Dist: numpy; extra == "recommended"
 Requires-Dist: ncrystal>=4.2.10; extra == "recommended"

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simple_build_dgcode.egg-info/SOURCES.txt

@@ -637,6 +637,8 @@ src/simplebuild_dgcode/data/pkgs_val/Examples/G4Examples/scripts/simhookclass
 src/simplebuild_dgcode/data/pkgs_val/Examples/G4Examples/scripts/simwithgrifffilter
 src/simplebuild_dgcode/data/pkgs_val/Examples/G4Examples/scripts/testhooks
 src/simplebuild_dgcode/data/pkgs_val/Examples/G4Examples/scripts/testhooks.log
+src/simplebuild_dgcode/data/pkgs_val/Examples/G4Examples/scripts/testvisexample
+src/simplebuild_dgcode/data/pkgs_val/Examples/G4Examples/scripts/testvisexample.log
 src/simplebuild_dgcode/data/pkgs_val/Examples/G4Examples/scripts/visexample
 src/simplebuild_dgcode/data/pkgs_val/Examples/GeneratorExamples/pkg.info
 src/simplebuild_dgcode/data/pkgs_val/Examples/GeneratorExamples/scripts/custompygen_inline

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simple_build_dgcode.egg-info/requires.txt

@@ -1,4 +1,4 @@
-simple-build-system>=1.7.1
+simple-build-system>=1.8.0
 
 [all]
 numpy

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/__init__.py

@@ -1,7 +1,7 @@
 import sys
-if not ( (3,8) <= sys.version_info[0:2] ):
+if not ( (3,10) <= sys.version_info[0:2] ):
     from . import error
-    error.error('Python not found in required version (3.8+ required).')
+    error.error('Python not found in required version (3.10+ required).')
 
 def version():
     from ._determine_version import determine_version

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/DevTools/scripts/valfiles

@@ -4,7 +4,7 @@
 
 import pathlib
 import os
-import simplebuild.cfg as cfg
+from simplebuild import cfg
 pkgs = cfg.pkgs
 
 topdirs = cfg.dirs.pkgsearchpath
@@ -19,9 +19,7 @@ ignore_dirs = [ cfg.dirs.blddir,
 
 
 def is_valid_pkg_subdir(name):
-    return ( name in ('libinc','libsrc','python','scripts','data')
-             or name.startswith('app_')
-             or name.startswith('pycpp_') )
+    return ( name in ('libinc', 'libsrc', 'python', 'scripts', 'data') or name.startswith(('app_', 'pycpp_')) )
 def file_should_be_ignored(f):
     return ( f in ignore_dirs
              or any(fp in ignore_dirs for fp in f.parents) )

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/Components/G4CustomPyGen/python/__init__.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 __all__=['GenBase']
 import sys,os
 
@@ -7,7 +6,7 @@ class GenBase(_GenBaseCpp):
     def __init__(self):
 
         #Calling _GenBaseCpp __init__, so pybind11 exports the C++ class correctly:
-        super(GenBase,self).__init__()
+        super().__init__()
 
         #Make sure we generate a proper name based on class name and file where it is implemented:
         self.setName(self.__construct_name())

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/Components/G4GravityHelper/python/NeutronGravity.py

@@ -1,6 +1,6 @@
 __all__ = ['enableNeutronGravity']
 
-import G4GravityHelper.hooks as hooks
+from G4GravityHelper import hooks
 import G4StepLimitHelper.helper as slh
 import Units
 

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Launcher/libsrc/Launcher.cc

@@ -22,6 +22,10 @@
 #include "MultiProcessingMgr.hh"
 #include "G4Utils/Flush.hh"
 #include "G4RunManager.hh"
+#include "G4Version.hh"
+#if G4VERSION_NUMBER >= 1100
+#  include "G4ThreadLocalSingleton.hh"
+#endif
 #include "G4UImanager.hh"
 #include "G4ParticleGun.hh"
 #include "G4VUserPrimaryGeneratorAction.hh"
@@ -78,7 +82,23 @@ struct G4Launcher::Launcher::Imp {
     if (std::string(FrameworkGlobals::printPrefix()).empty())
       FrameworkGlobals::setPrintPrefix("G4Launcher:: ");
   }
-  ~Imp(){ closeGriff(); delete m_physicsListProvider; delete m_vis; delete m_rm; }
+  ~Imp()
+  {
+    closeGriff();
+    delete m_physicsListProvider;
+    delete m_vis;
+    delete m_rm;
+#if G4VERSION_NUMBER >= 1100
+    //A sequential G4RunManager (unlike G4TaskRunManager) does not clear the
+    //G4ThreadLocalSingleton instances (e.g. the G4HadronicInteractionRegistry
+    //owning the hadronic models). They would then only be deleted during
+    //static destruction, after the mutexes used in ~G4Cache have already been
+    //destroyed. Since Geant4 11.2 this produces thousands of "Non-critical
+    //error: mutex lock failure in ~G4Cache<...>" messages from the ParticleHP
+    //models (see https://github.com/mctools/simplebuild-dgcode/issues/44).
+    G4ThreadLocalSingleton<void>::Clear();
+#endif
+  }
   void ensureCreateRM() {
     if (!m_rm) {
       //this->print("Creating G4RunManager");

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Launcher/python/_launcher.py

@@ -126,7 +126,7 @@ def _configure_mcplwriter(launcher,cfgstr,parseerror):
         _display_mcpl_help()
     from G4MCPLPlugins.MCPLWriter import MCPLWriter
     if not hasattr(launcher,'_mcpl_outputs'):
-        setattr(launcher,'_mcpl_outputs',set())
+        launcher._mcpl_outputs = set()
     mcpl_fltr,mcpl_fn,flagexpr = None,None,None
     cfgstr=' %s '%cfgstr#catch ' where ' and ' to ' also in malformed strings starting with 'where ...'
     if ' to ' in cfgstr:
@@ -183,7 +183,7 @@ def _configure_mcplwriter(launcher,cfgstr,parseerror):
         elif cfg=='opt_pol': opt_pol = True
         elif cfg=='opt_userflags': opt_userflags = True
         elif cfg=='all_vols': mw.addVolume('*')
-        elif cfg=='where' or cfg=='to' or cfg.startswith('kill_') or cfg.startswith('on_vol_') or cfg.startswith('opt_') or cfg=='withflags':
+        elif cfg == 'where' or cfg == 'to' or cfg.startswith(('kill_', 'on_vol_', 'opt_')) or cfg == 'withflags':
             parseerror('Suspicious volume name "%s" indicates malformed option for --mcpl'%cfg)
         else:
             mw.addVolume(cfg)
@@ -206,7 +206,7 @@ def _configure_heatmap(launcher,cfgstr,parseerror):
         _display_heatmap_help()
     from G4HeatMap import HeatMapWriter
     if not hasattr(launcher,'_heatmap_outputs'):
-        setattr(launcher,'_heatmap_outputs',set())
+        launcher._heatmap_outputs = set()
     quantity,condition,filename = None,None,None
     cfgstr=' %s '%cfgstr#catch ' where ' and ' to ' also in malformed strings starting with 'where ...'
     binning = [200,200,200]
@@ -219,7 +219,7 @@ def _configure_heatmap(launcher,cfgstr,parseerror):
             import re
             filename,binning = filename.split(':',1)
             m = re.match(r'\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)\s*', binning)
-            if not m or not len(m.groups(1))==3:
+            if not m or len(m.groups(1)) != 3:
                 parseerror('Malformed option for --heatmap: invalid binning')
             binning = [min(1000000000,max(1,int(e))) for e in m.groups(1)]
 

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Launcher/scripts/example

@@ -18,7 +18,7 @@ geo.world_extra_margin_cm = 100
 gen = genmodule.create()
 gen.particleName = 'neutron'
 gen.neutron_wavelength_aangstrom = 4.4
-gen.fixed_z_meters = -1.9
+gen.fixed_z_meters = -1.0
 launcher = G4Launcher(geo,gen)
 launcher.setOutput('example','REDUCED')#Griff output
 launcher.go()

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/G4OSG/libsrc/EventHandler.cc

@@ -10,6 +10,7 @@
 #include <osg/ShapeDrawable>
 #include <osg/Version>
 #include "G4OSG/BestUnit.hh"
+#include <cmath>
 
 G4OSG::EventHandler::EventHandler(Viewer*viewer)
   : osgGA::GUIEventHandler(),
@@ -358,7 +359,7 @@ bool G4OSG::EventHandler::handle(const osgGA::GUIEventAdapter& ea,
 
     case(osgGA::GUIEventAdapter::RELEASE):
       {
-        if (std::abs<double>(ea.getX()-m_push_x)>1.0e-5||std::abs<double>(ea.getY()-m_push_y)>1.0e-5)
+        if (std::abs(ea.getX()-m_push_x)>1.0e-5||std::abs(ea.getY()-m_push_y)>1.0e-5)
           return false;
         m_push_x=m_push_y=-1e99;
 

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/G4OSG/libsrc/MeasurementPoints.cc

@@ -6,6 +6,7 @@
 #include <osg/AutoTransform>
 #include "CLHEP/Units/SystemOfUnits.h"
 #include "G4OSG/BestUnit.hh"
+#include <cmath>
 
 G4OSG::MeasurementPoints::MeasurementPoints(G4OSG::Viewer*v,osg::Group* sceneHook)
   : m_isAttached(false),
@@ -209,9 +210,9 @@ void G4OSG::MeasurementPoints::updateInfo()
           //or distance info:
           double dotp = pt1.normal * pt2.normal;
           double costh = dotp / (pt1.normal.length()*pt2.normal.length());
-          if (std::abs<double>(costh) < 1.0-1.0e-5) {
+          if (std::abs(costh) < 1.0-1.0e-5) {
             //non-parallel surfaces
-            printf("### %s-%s surface angle: %.10g deg\n",col1,col2,acos(std::abs<double>(costh))*180/M_PI);
+            printf("### %s-%s surface angle: %.10g deg\n",col1,col2,acos(std::abs(costh))*180/M_PI);
           } else {
             //parallel surfaces
             printf("### %s-%s surfaces are parallel!\n",col1,col2);
@@ -219,7 +220,7 @@ void G4OSG::MeasurementPoints::updateInfo()
             //p1+n1*d intersects the (p2,n2) plane:
             double d = (v2-v1) * pt2.normal/ dotp;
             //The distance is then:
-            double dist = std::abs<double>(d * pt1.normal.length());
+            double dist = std::abs(d * pt1.normal.length());
             if (pt1.volHandle!=pt2.volHandle||dist>1.0e-3) {
               std::string diststr = G4OSG::BestUnit(dist, "Length");
               printf("### %s-%s dist between surface planes: %s\n",col1,col2,diststr.c_str());

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Utils/libsrc/PolygonUtils.cc

@@ -1,5 +1,6 @@
 #include "G4Utils/PolygonUtils.hh"
 #include <cassert>
+#include <cmath>
 
 double G4Utils::area(const Polygon& p)
 {
@@ -77,7 +78,7 @@ void G4Utils::growPolygon(const Polygon& orig,Polygon& result,const std::vector<
 
     double det = normal_prev.x()*normal.y()-normal_prev.y()*normal.x();
 
-    bool almost_parallel = std::abs<double>(det)<tolerance;
+    bool almost_parallel = std::abs(det)<tolerance;
     if ( almost_parallel || (smooth_corners && det > 0) ) {
       //Must add extra points for more rounded corner:
       if (!almost_parallel)

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Utils/python/chain.py

@@ -33,7 +33,7 @@ def chain(g4sim_exec_name,griffana_exec_name,griff_mode=None):
 
     if '--helpsim' in args:
         ec=system("%s --help"%g4sim_exec_name)
-        sys.exit(127 if ec > 127 else ec)
+        sys.exit(min(ec, 127))
 
     chainmult=1
     for a in args:
@@ -48,7 +48,7 @@ def chain(g4sim_exec_name,griffana_exec_name,griff_mode=None):
     for a in ['-d','--dump','-p','-g','--viewer','--showphysicslists','--extrapars','--extra','-f']:
         if a in args:
             ec=system("%s %s --output=none"%(g4sim_exec_name,a))
-            sys.exit(127 if ec > 127 else ec)
+            sys.exit(min(ec, 127))
 
     do_cleanup=False
     if '--cleanup' in args:
@@ -98,13 +98,13 @@ def chain(g4sim_exec_name,griffana_exec_name,griff_mode=None):
         ec=system(". %s/run.sh"%shlex.quote(os.path.join(rundir,step)))
         if ec!=0:
             print("ERROR: Failure at %s step"%step)
-            sys.exit(ec if ec<127 else 127)
+            sys.exit(min(127, ec))
     def cleanup_sim(dirname):
         if do_cleanup:
             ec=system("rm -f %s/sim*.griff"%shlex.quote(os.path.join(rundir,dirname)))
             if ec!=0:
                 print("ERROR: Failure during cleanup")
-                sys.exit(ec if ec<127 else 127)
+                sys.exit(min(127, ec))
     run('runsample')
     if chainmult==1:
         run('runsim')

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/G4Utils/scripts/querygenerator

@@ -33,7 +33,6 @@ def detect_generator_examples():
     return gens
 
 def parse():
-    #
     progname=os.path.basename(sys.argv[0])
     epilog = None
     gens = detect_generator_examples()

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/G4/IdealGasBuilder/libsrc/IdealGasMixture.cc

@@ -9,6 +9,7 @@
 #include <stdexcept>
 #include <sstream>
 #include <map>
+#include <cmath>
 
 IdealGas::Mixture::Mixture(const char * formula)
   : m_by_mass_fractions(false)
@@ -202,7 +203,7 @@ G4Material * IdealGas::Mixture::buildMat(const char * name, double temp, double
   double frac_tot = 0.0;
   for (auto it = element2density.begin();it!=element2density.end();++it)
     frac_tot += (it->second / density) * scale_e2d;
-  assert(std::abs<double>(frac_tot-1.0)<1.0e-10);
+  assert(std::abs(frac_tot-1.0)<1.0e-10);
 
   //Reorder in different map with element names as keys for reproducibility so
   //order of addElement calls won't depend on pointer sorting (at least not when

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/Griff/EvtFile/libinc/DBEntryWriter.hh

@@ -29,7 +29,7 @@ namespace EvtFile {
     DBEntryWriter( DBEntryWriter&& ) = delete;
     DBEntryWriter& operator=( DBEntryWriter&& ) = delete;
 
-    virtual ~DBEntryWriter();
+    ~DBEntryWriter();
 
     virtual std::uint16_t uniqueSubSectionID() const { return m_subSectionID; }
 

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/Griff/GriffAnaUtils/python/Misc.py

@@ -1,4 +1,3 @@
-from __future__ import division
 
 def vector_costheta(mom1,mom2):
     import math
@@ -25,5 +24,4 @@ def prettify_particlenames(s):
 def get_daughters_recursively(trk):
     for d in trk.daughters:
         yield d
-        for d2 in get_daughters_recursively(d):
-            yield d2
+        yield from get_daughters_recursively(d)

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/Griff/GriffAnaUtils/python/__init__.py

@@ -1,5 +1,4 @@
 """utilities for easy and efficient analysis of .griff data files containing results from Geant4 simulations"""
-from __future__ import absolute_import
 __author__='thomas.kittelmann@ess.eu'
 from . _init import *
 

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/Griff/GriffDataRead/libinc/Setup.hh

@@ -6,6 +6,7 @@
 #include "Utils/StringSort.hh"
 #include <string>
 #include <map>
+#include <cstdlib>
 
 class GriffDataReader;
 namespace GriffDataRead

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/Griff/GriffDataRead/python/__init__.py

@@ -1,5 +1,4 @@
 """python module for package GriffDataRead"""
-from __future__ import absolute_import
 from . _init import *
 
 def _Track_daughter_iter(self):

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/Griff/GriffFormat/scripts/dumpfile

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 import os,sys
 import GriffFormat.dumpfile
 

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/Griff/GriffFormat/scripts/info

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-from __future__ import print_function
 import GriffDataRead
 import GriffFormat.dumpfile
 import sys

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/PyQtMPLWidgets.py

@@ -33,7 +33,6 @@ PyAna.fpe.disableFPEDuringCall(_NavigationToolbar,'save_figure')
 _global_ax_count = [0]
 class MplCanvas(FigureCanvas):
     def _add_axis(self):
-        global _global_ax_count
         _global_ax_count[0] += 1
         self.ax = self.fig.add_subplot(111,label=f'MplCanvasSubPlot_{_global_ax_count[0]}')
         PyAna.fpe.disableFPEDuringCall(self.ax,'draw')#avoid annoying FPEs in matplotlib drawing code

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/PyQtUtils.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 
 """Convenience base class for making PyQt5-based GUI apps, supporting
 matplotlib widgets and layouts done with Qt designer

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

@@ -1,5 +1,5 @@
 
-__all__ = ['math','os','sys','pathlib','numpy', 'matplotlib', 'np', 'mpl', 'plt','Units','units','ColourDashesHelper','lighten_colour','darken_colour','rainbow_colour','dgextras']
+__all__ = ['ColourDashesHelper', 'Units', 'darken_colour', 'dgextras', 'lighten_colour', 'math', 'matplotlib', 'mpl', 'np', 'numpy', 'os', 'pathlib', 'plt', 'rainbow_colour', 'sys', 'units']
 
 #1) Fix matplotlib backend:
 import os
@@ -108,7 +108,7 @@ def rainbow_colour(i,n):
     return cmap(i/(n-1.0) if n>1 else 1.0)
 
 class ColourDashesHelper:
-    def __init__(self,ncurves,dashes=[(),(5,2),(2,2)],cmap=None):
+    def __init__(self,ncurves,dashes=((),(5,2),(2,2)),cmap=None):
         num_styles = len(dashes)
         if not cmap:
             from matplotlib.pyplot import get_cmap

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/extras.py

@@ -75,7 +75,6 @@ __ask_pdf=[None]
 def askPDF():
     """Checks for --pdf on commandline. If found, removes it from sys.argv,
     calls useAGG() and returns True. Otherwise returns False."""
-    global __ask_pdf
     import sys
     if '--pdf' in sys.argv[1:]:
         args=sys.argv[1:]

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/python/fpe.py

@@ -12,7 +12,6 @@ def disableFPEDuringCall(obj,fctname):
 
 __standardFixesDone = [False]
 def standardMPLFixes():
-    global __standardFixesDone
     if __standardFixesDone[0]:
         return
     __standardFixesDone[0] = True

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAna/scripts/plotfct

@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 
-from __future__ import print_function
 import os,sys,numpy,math
 
 args=sys.argv[1:]

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaMisc/python/fpe.py

@@ -12,7 +12,6 @@ def disableFPEDuringCall(obj,fctname):
 
 __standardFixesDone = [False]
 def standardMPLFixes():
-    global __standardFixesDone
     if __standardFixesDone[0]:
         return
     __standardFixesDone[0] = True

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaUtils/python/divide.py

@@ -1,5 +1,4 @@
 """module for performing division of sets of values including errors (such as histograms)"""
-from __future__ import division
 
 import numpy
 
@@ -20,7 +19,7 @@ def divide_histograms(h1,h2):
     assert numpy.array_equal(bins,bins2)#not so efficient, but could catch stupid bugs.
     return divide(contents1,errors1,contents2,errors2)
 
-def plot_histogram_division(h1,h2,scale=1.0,axes=None,style=True,kwargs={}):
+def plot_histogram_division(h1,h2,scale=1.0,axes=None,style=True,kwargs=None):
     """In addition to performing histogram division, it also invokes errors.plot_errors on the result"""
     vals,errs = divide_histograms(h1,h2)
     from PyAnaUtils.errors import plot_errors

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/PyAnalysis/PyAnaUtils/python/errors.py

@@ -15,19 +15,19 @@ def errorbar_args(contents,errors, binedges,style=True):
                    'elinewidth':1 })
     return kw
 
-def plot_errors(contents,errors, binedges,axes=None,style=True,kwargs={}):
+def plot_errors(contents,errors, binedges,axes=None,style=True,kwargs=None):
     """do a call to axes.errorbar with the passed data reformated.
     If not passed an axes object, it will also create a figure and do plt.show()"""
     import matplotlib.pyplot as plt
 
     do_quick_plot = bool(axes==None)
     if do_quick_plot:
-        fig,axes = plt.subplots()
+        _fig,axes = plt.subplots()
     from PyAnaUtils.bins import bin_centers_and_widths
-    bin_centers,bin_widths = bin_centers_and_widths(binedges)
+    _bin_centers,_bin_widths = bin_centers_and_widths(binedges)
     args={}
     args.update(errorbar_args(contents,errors, binedges,style=style))
-    args.update(kwargs)
+    args.update(kwargs or {})
     #axes.errorbar(**errorbar_args(contents,errors, binedges))
     axes.errorbar(**args)
     if do_quick_plot:

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/SimpleHists/SimpleHists/python/__init__.py

@@ -1,7 +1,12 @@
-__metaclass__ = type#py2 backwards compatibility
 __doc__='python module for package SimpleHists'
-__all__=['Hist1D','Hist2D','HistBase','HistCollection',
-         'histTypeOfData','deserialise']
+__all__=[
+    'Hist1D',
+    'Hist2D',
+    'HistBase',
+    'HistCollection',
+    'deserialise',
+    'histTypeOfData',
+]
 
 ###############################################################################
 # 1) Include hist classes etc. from the compiled C++ module:
@@ -78,7 +83,7 @@ if 'SIMPLEHISTS_SILENT_PLOTFAIL' in _environ:
     _noninteractive = True
 
 if (not _noninteractive) and matplotlib:
-    import SimpleHists.plotutils as plotutils
+    from SimpleHists import plotutils
     Hist1D.plot = plotutils.plot1d
     Hist1D.overlay = plotutils.plot1d_overlay
     Hist2D.plot = plotutils.plot2d
@@ -151,7 +156,7 @@ class _countgetter:
         return res
     def __getattr__(self,k):
         if k[0]=='_':
-            return super(_countgetter,self).__getattr__(k)
+            return super().__getattr__(k)
         return self._hc.getCounter(k)
 
 HistCounts.c = property(lambda self: _countgetter(self))

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/SimpleHists/SimpleHists/python/_backend_test.py

@@ -7,21 +7,21 @@ _backend_ok = (_backend in ('tkagg','gtkagg','agg','macosx'))
 if _backend_ok and _backend=='gtkagg':
     #attempt to silence some useless/confusing warnings
     try:
-        import PyAnaMisc._fix_backend_gtk # noqa F401
+        import PyAnaMisc._fix_backend_gtk
     except ImportError:
         #perhaps PyAnaMisc package was not built, no biggie, users might get warnings.
         pass
 
-if _backend_ok and _backend=='tkagg':
-    if [float(n) for n in matplotlib.__version__.split('.',2)[:-1]]>=[1,5]:
-        #hide broken (warnings https://github.com/matplotlib/matplotlib/issues/7404/):
-        import warnings
-        warnings.filterwarnings("ignore",
-                                category=UserWarning,
-                                message=('Treat the new Tool classes introduced in v1.5 as experimental'+
-                                         ' for now, the API will likely change in version 2.1'))
+if ( _backend_ok and _backend=='tkagg'
+     and [float(n) for n in matplotlib.__version__.split('.',2)[:-1]]>=[1,5] ):
+    #hide broken (warnings https://github.com/matplotlib/matplotlib/issues/7404/):
+    import warnings
+    warnings.filterwarnings("ignore",
+                            category=UserWarning,
+                            message=('Treat the new Tool classes introduced in v1.5 as experimental'+
+                                     ' for now, the API will likely change in version 2.1'))
 
-from PyAnaMisc.fpe import standardMPLFixes as _standardMPLFixes # noqa E402
+from PyAnaMisc.fpe import standardMPLFixes as _standardMPLFixes
 _standardMPLFixes()
 
 def _ensure_backend_ok():

{simple_build_dgcode-1.7.2 → simple_build_dgcode-1.8.0}/src/simplebuild_dgcode/data/pkgs/SimpleHists/SimpleHists/python/_numpyutils.py

@@ -1,4 +1,3 @@
-from __future__ import division
 __doc__='internal module for adding numpy compatible methods to SimpleHists'
 
 import numpy
@@ -14,7 +13,6 @@ def hcounts_bar_args(self,width=1.0,spacing=0.5):
     #not really needing numpy, but here anyway
     left=[]
     height=[]
-    width=width
     pos=0.0
     for c in self.counters:
         left+=[pos]
@@ -77,7 +75,7 @@ def h1d_errorband(self,ndev=1.0,clip_for_log=False):
     if clip_for_log:
         #epsilon above 0 for log-plots to avoid weird clipping issue
         clower=numpy.maximum(clower,1.0e-199)
-        cupper=numpy.maximum(cupper,clower)#
+        cupper=numpy.maximum(cupper,clower)
     return curvex,clower,cupper
 
 def h1d_curve(self):
@@ -121,7 +119,7 @@ def h2d_bar3d_args(self,cmap=None):
     dx,dy,dz = self.binwidthx * numpy.ones(elements),self.binwidthy * numpy.ones(elements),hist.T.flatten()
     res={'x':xpos, 'y':ypos, 'z':zpos, 'dx':dx, 'dy':dy, 'dz':dz}
     if cmap:
-        import matplotlib.colors as colors
+        from matplotlib import colors
         import matplotlib.pyplot as plt
         absz = abs(dz)
         fracs = absz/(absz.max() or 1.0)