Upgrade pyFAI

README.md

@@ -30,7 +30,7 @@ Example usage:
 
     pg = pygix.Transform()
     pg.load('detector_calibration.poni')
-    pg.indcident_angle = 0.2
+    pg.incident_angle = 0.2
 
     # transform image into reciprocal space:
     i, qxy, qz = pg.transform_reciprocal(data)

bootstrap.py

@@ -10,8 +10,7 @@
 __authors__ = ["Frédéric-Emmanuel Picca", "Jérôme Kieffer"]
 __contact__ = "jerome.kieffer@esrf.eu"
 __license__ = "MIT"
-__date__ = "15/09/2016"
-
+__date__ = "25/05/2023"
 
 import sys
 import os
@@ -25,10 +24,11 @@ def _distutils_dir_name(dname="lib"):
     """
     Returns the name of a distutils build directory
     """
-    platform = distutils.util.get_platform()
-    architecture = "%s.%s-%i.%i" % (dname, platform,
-                                    sys.version_info[0], sys.version_info[1])
-    return architecture
+    return dname
+    # platform = distutils.util.get_platform()
+    # architecture = "%s.%s-%i.%i" % (dname, platform,
+    #                                 sys.version_info[0], sys.version_info[1])
+    # return architecture
 
 
 def _distutils_scripts_name():
@@ -48,6 +48,7 @@ def _get_available_scripts(path):
 
 
 if sys.version_info[0] >= 3:  # Python3
+
     def execfile(fullpath):
         "Python3 implementation for execfile"
         with open(fullpath) as f:
@@ -66,6 +67,7 @@ def runfile(fname):
         run = subprocess.Popen(sys.argv, shell=False, env=env)
         run.wait()
 
+
 home = os.path.dirname(os.path.abspath(__file__))
 SCRIPTSPATH = os.path.join(home, 'build', _distutils_scripts_name())
 LIBPATH = os.path.join(home, 'build', _distutils_dir_name('lib'))

pygix/io.py

@@ -105,7 +105,7 @@ def make_header_string(self, header_dict=None, hdr_key='#',
 
         hdr_list = []
         for k, v in header_dict.items():
-            if (v.__class__ is str) and (len(v) is 0):
+            if v == "":
                 hdr_list.append(k)
             else:
                 hdr_list.append('{}: {}'.format(k, v))

pygix/plotting.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+import os
 import numpy as np
 import matplotlib as mpl
 import matplotlib.pyplot as plt
@@ -43,7 +44,7 @@
             r'\usepackage{helvet}',
             r'\usepackage[EULERGREEK]{sansmath}',
             r'\sansmath']
-mpl.rcParams['text.latex.preamble'] = latexpre
+mpl.rcParams['text.latex.preamble'] = os.linesep.join(latexpre)
 
 DEFAULT_UNIT = 'nm^-1'
 LABELS_DICT = {
@@ -89,7 +90,7 @@ def get_axis_label(label=None):
     Returns:
 
     """
-    if (label is None) or (len(label) is 0):
+    if (label is None) or (len(label) == 0):
         return ''
     if '(' in label:
         quantity, unit = label.split('(')
@@ -264,7 +265,6 @@ def plot(x, y,
     if show:
         plt.show()
 
-
 # def rsmplot(data, x=None, y=None, xlim=None, ylim=None,
 #             xlabel=None, ylabel=None, cmap=None, colorbar=False, clim='auto',
 #             newfig=True, show=True, figsize=(7, 7), tight_layout=True,
@@ -386,7 +386,7 @@ def implot(data, x=None, y=None, mode=None,
         cax = divider.append_axes("right", size="5%", pad=0.05)
         plt.colorbar(im, cax=cax)
 
-    ax.set_axis_bgcolor(colormap(0))
+    ax.set_facecolor(colormap(0))
 
     if tight_layout:
         plt.tight_layout()