PyMca5 5.9.5rc4__tar.gz → 5.9.6__tar.gz

{pymca5-5.9.5rc4/src/PyMca5.egg-info → pymca5-5.9.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyMca5
-Version: 5.9.5rc4
+Version: 5.9.6
 Summary: Mapping and X-Ray Fluorescence Analysis
 Author: V. Armando Sole
 Author-email: sole@esrf.fr

{pymca5-5.9.5rc4 → pymca5-5.9.6}/changelog.txt

@@ -1,6 +1,19 @@
+Unreleased
+----------
+
+- XRF. Bug fix in batch processing when using fit files.
+
 VERSION 5.9.5
 -------------
 
+- Add the possibility to white NaN values in RGB Correlator.
+
+- IO. Improved sorting of scans in HDF5 files.
+
+- XRF. Add support for standard batch fitting of BCF files.
+
+- XRF. Support three incoming beam filters.
+
 - XRF. Support secondary excitation calculations fitting M subshells.
 
 VERSION 5.9.4

{pymca5-5.9.5rc4 → pymca5-5.9.6}/package/pyinstaller/pyinstaller_github.spec

@@ -49,6 +49,8 @@ hiddenimports += collect_submodules('hdf5plugin')
 hiddenimports += collect_submodules('fisx')
 hiddenimports += collect_submodules('PyMca5.PyMcaGui.PyMcaQt')
 hiddenimports += collect_submodules('PyMca5.PyMcaGui.pymca')
+hiddenimports += collect_submodules('multiprocessing')
+hiddenimports += collect_submodules('multiprocessing.spawn')
 
 my_binaries = []
 

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaCore/PyMcaMatplotlibSave.py

@@ -658,7 +658,7 @@ if __name__ == "__main__":
     import sys
     if len(sys.argv) < 2:
         a=numpy.arange(1200.)
-        a.shape = 20, 60
+        a = a.reshape(20, 60)
         PyMcaMatplotlibSaveImage(a, "filename.png", colormap="rainbow")
         print("Image filename.png saved")
     else:

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaCore/SpecFileDataSource.py

@@ -543,7 +543,7 @@ class SpecFileDataSource(object):
                     output.data[i,:] = mcaData
                 #I have all the MCA data ready for image plot
                 if selectiontype == 'STACK':
-                    output.data.shape = 1, npoints, -1
+                    output.data = output.data.reshape(1, npoints, -1)
                     shape = output.data.shape
                     for i in range(len(shape)):
                         key = 'Dim_%d' % (i+1,)

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaCore/StackBase.py

@@ -302,7 +302,7 @@ class StackBase(object):
                     numpy.add(self._stackImageData[i:i+step,:],
                               numpy.sum(tmpData, 2),
                               self._stackImageData[i:i+step,:])
-                    tmpData.shape = step*shape[1], shape[2]
+                    tmpData = tmpData.reshape(step*shape[1], shape[2])
                     tmpMax = numpy.nanmax(tmpData, axis=0)
                     numpy.add(mcaData0, numpy.sum(tmpData, 0), mcaData0)
                     mcaMax =numpy.max([mcaMax, tmpMax], axis=0)
@@ -317,7 +317,7 @@ class StackBase(object):
                 step = 1
                 for i in range(shape[0]):
                     tmpData = self._stack.data[i:i+step,:,:]
-                    tmpData.shape = tmpData.shape[1:]
+                    tmpData = tmpData.reshape(tmpData.shape[1:])
                     numpy.add(self._stackImageData,
                               tmpData,
                               self._stackImageData)
@@ -748,7 +748,7 @@ class StackBase(object):
                             row_dict[r].append(c)
                         for r in row_list:
                             tmpMcaData = self._stack.data[r:r + 1, row_dict[r], :]
-                            tmpMcaData.shape = -1, mcaData.shape[0]
+                            tmpMcaData = tmpMcaData.reshape(-1, mcaData.shape[0])
                             mcaData += numpy.sum(tmpMcaData, axis=0, dtype=numpy.float64)
                             if mcamax:
                                 mcaMax = numpy.max([mcaMax, numpy.max(tmpMcaData, axis=0)], axis=0)
@@ -793,7 +793,7 @@ class StackBase(object):
                             row_dict[r].append(c)
                         for r in row_list:
                             tmpMcaData = self._stack.data[r:r + 1, row_dict[r], :]
-                            tmpMcaData.shape = -1, mcaData.shape[0]
+                            tmpMcaData = tmpMcaData.reshape(-1, mcaData.shape[0])
                             mcaData += tmpMcaData.sum(axis=0, dtype=numpy.float64)
                             if mcamax:
                                 mcaMax = numpy.max([mcaMax, numpy.max(tmpMcaData, axis=0)], axis=0)
@@ -832,7 +832,7 @@ class StackBase(object):
         if "McaLiveTime" in self._stack.info:
             selectedPixels = actualSelectionMask > 0
             liveTime = self._stack.info["McaLiveTime"][:]
-            liveTime.shape = actualSelectionMask.shape
+            liveTime = liveTime.reshape(actualSelectionMask.shape)
             liveTime = liveTime[selectedPixels].sum()
             if normalize:
                 liveTime = liveTime / float(npixels)
@@ -940,7 +940,7 @@ class StackBase(object):
                         minImage = numpy.zeros(leftImage.shape, numpy.int32)
                         for i in range(i1, i2):
                             tmpData = self._stack.data[i]
-                            tmpData.shape = leftImage.shape
+                            tmpData = tmpData.reshape(leftImage.shape)
                             if i == i1:
                                 minImageData = tmpData * 1.0
                                 maxImageData = tmpData * 1.0
@@ -974,7 +974,7 @@ class StackBase(object):
                     istep = 1
                     for i in range(i1, i2):
                         tmpData = self._stack.data[i:i + istep]
-                        tmpData.shape = roiImage.shape
+                        tmpData = tmpData.reshape(roiImage.shape)
                         if i == i1:
                             minImageData = tmpData * 1.0
                             maxImageData = tmpData * 1.0

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/Colormap.py

@@ -130,7 +130,7 @@ def applyColormap(data, colormap='gray', norm='linear', bounds=None):
 
 if __name__ == "__main__":
     data = np.arange(1024 * 1024.)
-    data.shape = 1024, -1
+    data = data.reshape(1024, -1)
 
     for colormap in COLORMAPS:
         pixmap, _ = applyColormap(data, colormap)

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/backends/GLSupport/GLPlotCurve.py

@@ -1163,7 +1163,7 @@ class GLPlotCurve2D(object):
 
             if self.fill is not None:
                 xData = self.xData[:]
-                xData.shape = xData.size, 1
+                xData = xData.reshape(xData.size, 1)
                 zero = np.array((1e-32,), dtype=self.yData.dtype)
 
                 # Add one point before data: (x0, 0.)

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/backends/GLSupport/PlotEvents.py

@@ -50,7 +50,7 @@ def prepareDrawingSignal(event, type_, points, parameters=None):
     eventDict['event'] = event
     eventDict['type'] = type_
     points = np.array(points, dtype=np.float32)
-    points.shape = -1, 2
+    points = points.reshape(-1, 2)
     eventDict['points'] = points
     eventDict['xdata'] = points[:, 0]
     eventDict['ydata'] = points[:, 1]

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/backends/GLUTOpenGLBackend.py

@@ -113,7 +113,7 @@ if __name__ == "__main__":
     w = Plot(None, backend=GLUTOpenGLBackend)
     size = 4096
     data = np.arange(float(size)*size, dtype=np.dtype(np.float32))
-    data.shape = size, size
+    data = data.reshape(size, size)
 
     colormap = {'name': 'gray', 'normalization': 'linear',
                 'autoscale': True, 'vmin': 0.0, 'vmax': 1.0,

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/backends/MatplotlibBackend.py

@@ -1217,7 +1217,7 @@ class MatplotlibGraph(FigureCanvas):
         #print(dir(self._drawingPatch))
         a = self._drawingPatch.get_xy()
         ddict['points'] = numpy.array(a)
-        ddict['points'].shape = -1, 2
+        ddict['points'] = ddict['points'].reshape(-1, 2)
         ddict['xdata'] = ddict['points'][:, 0]
         ddict['ydata'] = ddict['points'][:, 1]
         #print(numpyvstack(a))
@@ -1751,8 +1751,8 @@ class MatplotlibBackend(PlotBackend.PlotBackend):
             if fill:
                 item.set_hatch('.')
         elif shape in ['polygon']:
-            xView.shape = 1, -1
-            yView.shape = 1, -1
+            xView = xView.reshape(1, -1)
+            yView = yView.reshape(1, -1)
             item = Polygon(numpyvstack((xView, yView)).T,
                             closed=True,
                             fill=False,
@@ -2858,7 +2858,7 @@ if __name__ == "__main__":
     w.replot()
     #w.invertYAxis(True)
     data = numpy.arange(1000.*1000)
-    data.shape = 10000,100
+    data = data.reshape(10000, 100)
     #plot.replot()
     #w.invertYAxis(True)
     #w.replot()

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/backends/OSMesaGLBackend.py

@@ -251,7 +251,7 @@ if __name__ == "__main__":
 
     size = 1024
     data = np.arange(float(size)*size, dtype=np.uint16)
-    data.shape = size, size
+    data = data.reshape(size, size)
 
     colormap = {'name': 'gray', 'normalization': 'linear',
                 'autoscale': True, 'vmin': 0.0, 'vmax': 1.0,

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/backends/OpenGLBackend.py

@@ -152,7 +152,7 @@ if __name__ == "__main__":
 
     size = 4096
     data = np.arange(float(size)*size, dtype=np.dtype(np.float32))
-    data.shape = size, size
+    data = data.reshape(size, size)
 
     colormap = {'name': 'gray', 'normalization': 'linear',
                 'autoscale': True, 'vmin': 0.0, 'vmax': 1.0,

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/ctools/_ctools/cython/Colormap.pyx

@@ -135,7 +135,7 @@ def dataToRGBAColormap(data,
                            c_nanColorPtr,
                            &c_pixmap[0, 0])
 
-    pixmap.shape = data.shape + (4,)
+    pixmap = pixmap.reshape(data.shape + (4,))
     return pixmap, (c_start, c_end)
 
 def fastLog10(double value):

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGraph/ctools/_ctools/test/testColormap.py

@@ -128,7 +128,7 @@ class _TestColormap(unittest.TestCase):
                                  dtype=np.uint32)
 
         pixmap = np.take(colormap, indices, axis=0)
-        pixmap.shape = data.shape + (4,)
+        pixmap = pixmap.reshape(data.shape + (4,))
         return np.ascontiguousarray(pixmap)
 
     @staticmethod
@@ -158,7 +158,7 @@ class _TestColormap(unittest.TestCase):
                                                 (start, end),
                                                 (0, 255),
                                                 1)
-        pixmap.shape = data.shape[0], data.shape[1], 4
+        pixmap = pixmap.reshape(data.shape[0], data.shape[1], 4)
 
         return pixmap
 
@@ -188,8 +188,8 @@ class _TestColormap(unittest.TestCase):
                 # Only works with red colormap and even size
                 # as it needs 2D data
                 if len(data.shape) == 1:
-                    data.shape = data.size // 2, -1
-                    pixmap.shape = data.shape + (4,)
+                    data = data.reshape(data.size // 2, -1)
+                    pixmap = pixmap.reshape(data.shape + (4,))
                 control = self.buildSPSLUTRedPixmap(data, start, end, isLog10)
                 controlType = 'SPS LUT'
 
@@ -243,7 +243,7 @@ class TestColormap(_TestColormap):
             for isLog10 in (False, True):
                 data = np.array((), dtype=dtype)
                 result = np.array((), dtype=np.uint8)
-                result.shape = 0, 4
+                result = result.reshape(0, 4)
                 duration = self._testColormap(data, self.COLORMAPS['red 256'],
                                               None, None, result, isLog10)
                 self._log('No data', 'red 256', dtype, len(data), (None, None),
@@ -359,7 +359,7 @@ class TestLinearColormap(_TestColormap):
                         # Increasing values
                         data = np.arange(size * size, dtype=dtype)
                         data = np.nan_to_num(data)
-                        data.shape = size, size
+                        data = data.reshape(size, size)
                         duration = self._testColormap(data, colormap,
                                                       start, end)
 
@@ -493,7 +493,7 @@ class TestLog10Colormap(_TestColormap):
                         # Increasing values
                         data = np.arange(size * size, dtype=dtype) + 1
                         data = np.nan_to_num(data)
-                        data.shape = size, size
+                        data = data.reshape(size, size)
                         duration = self._testColormap(data, colormap,
                                                       start, end,
                                                       isLog10=True)

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/io/QEdfFileWidget.py

@@ -987,7 +987,7 @@ class QEdfFileWidget(qt.QWidget):
                                 (colormap[2],colormap[3]),
                                 (0,255), 1)
 
-        pixmap.shape = [data.shape[0], data.shape[1], 4]
+        pixmap = pixmap.reshape(data.shape[0], data.shape[1], 4)
         if not goodData:
             pixmap[finiteData < 1] = 255
         return pixmap

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/io/hdf5/HDF5Widget.py

@@ -1,5 +1,5 @@
 #/*##########################################################################
-# Copyright (C) 2004-2025 V.A. Sole, ESRF - D. Dale CHESS
+# Copyright (C) 2004-2026 V.A. Sole, ESRF - D. Dale CHESS
 #
 # This file is part of the PyMca X-ray Fluorescence Toolkit developed at
 # the ESRF.
@@ -195,9 +195,20 @@ class H5NodeProxy(object):
                             finalListIsTrue = True
                         if hasattr(dataset, "shape"):
                             if not len(dataset.shape):
-                                # it can still be a string
+                                # it can still be a string or a scalar
                                 if hasattr(dataset, "dtype"):
-                                    if safe_str(dataset.dtype).startswith("|S"):
+                                    dataset_dtype_print = safe_str(dataset.dtype)
+                                    if dataset_dtype_print.startswith("|S"):
+                                        pass
+                                    elif dataset_dtype_print.startswith("float"):
+                                        pass
+                                    elif dataset_dtype_print.startswith("int"):
+                                        pass
+                                    elif dataset_dtype_print.startswith("uint"):
+                                        pass
+                                    elif dataset_dtype_print.startswith("bool"):
+                                        pass
+                                    elif dataset_dtype_print.startswith("complex"):
                                         pass
                                     elif safe_str(dataset.dtype) == "object":
                                         # issue 1059
@@ -991,7 +1002,7 @@ def _getFilenameDialog(parent=None):
     """Open a dialog to select a file in a filesystem tree view.
     Return the selected filename."""
     from PyMca5.PyMcaGui.io import PyMcaFileDialogs
-    fileTypeList = ['HDF5 Files (*.h5 *.nxs *.hdf)',
+    fileTypeList = ['HDF5 Files (*.h5 *.nxs *.hdf *.hdf5)',
                     'HDF5 Files (*)']
     message = "Open HDF5 file"
     filenamelist, ffilter = PyMcaFileDialogs.getFileList(parent=parent,

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/math/FFTAlignmentWindow.py

@@ -295,7 +295,7 @@ class FFTAlignmentDialog(qt.QDialog):
 
     def setDummyStack(self):
         dummyStack = numpy.arange(2 * 128 *256)
-        dummyStack.shape = 2, 128, 256
+        dummyStack = dummyStack.reshape(2, 128, 256)
         self.setStack(dummyStack, index=0)
 
     def getParameters(self):

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/math/NNMADialog.py

@@ -123,14 +123,14 @@ class NNMADialog(qt.QDialog):
                     images, eigenvalues, eigenvectors = threadResult
                 except Exception:
                     if isinstance(data, numpy.ndarray):
-                        self._data.shape = old_shape
+                        self._data = self._data.reshape(*old_shape)
                     msg = qt.QMessageBox(self)
                     msg.setIcon(qt.QMessageBox.Critical)
                     msg.setText("%s" % sys.exc_info()[1])
                     msg.exec()
                     return
             if isinstance(self._data, numpy.ndarray):
-                self._data.shape = old_shape
+                self._data = self._data.reshape(*old_shape)
             _logger.debug("NNMA Elapsed = %s", time.time() - t0)
             self.nnmaWindow.setPCAData(images,
                                        eigenvalues,

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/math/NNMAWindow.py

@@ -272,15 +272,15 @@ class NNMAParametersDialog(qt.QDialog):
         binning = int(self.binningCombo.currentText())
         x = self._x * 1.0
         y = self._y * 1.0
-        x.shape = 1, -1
-        y.shape = 1, -1
+        x = x.reshape(1, -1)
+        y = y.reshape(1, -1)
         r, c = x.shape
-        x.shape = r, int(c / binning), binning
-        y.shape = r, int(c / binning), binning
+        x = x.reshape(r, int(c / binning), binning)
+        y = y.reshape(r, int(c / binning), binning)
         x = x.sum(axis=-1, dtype=numpy.float32) / binning
         y = y.sum(axis=-1, dtype=numpy.float32)
-        x.shape = -1
-        y.shape = -1
+        x = numpy.ravel(x)
+        y = numpy.ravel(y)
         self._binnedX = x
         self._binnedY = y
         if self.graph:
@@ -411,7 +411,7 @@ def test():
     app.lastWindowClosed.connect(app.quit)
     container = NNMAWindow()
     data = numpy.arange(20000)
-    data.shape = 2, 100, 100
+    data = data.reshape(2, 100, 100)
     data[1, 0:100, 0:50] = 100
     container.setPCAData(
         data,

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/math/PCADialog.py

@@ -145,14 +145,14 @@ class PCADialog(qt.QDialog):
                     images, eigenvalues, eigenvectors = threadResult
                 except Exception:
                     if isinstance(data, numpy.ndarray):
-                        self._data.shape = old_shape
+                        self._data = self._data.reshape(*old_shape)
                     msg = qt.QMessageBox(self)
                     msg.setIcon(qt.QMessageBox.Critical)
                     msg.setText("%s" % sys.exc_info()[1])
                     msg.exec()
                     return
             if isinstance(self._data, numpy.ndarray):
-                self._data.shape = old_shape
+                self._data = self._data.reshape(old_shape)
             _logger.debug("PCA Elapsed = %s", time.time() - t0)
             methodlabel = pcaParameters.get('methodlabel', "")
             imagenames = None

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/math/PCAWindow.py

@@ -263,15 +263,15 @@ class PCAParametersDialog(qt.QDialog):
         binning = int(self.binningCombo.currentText())
         x = self._x * 1.0
         y = self._y * 1.0
-        x.shape = 1, -1
-        y.shape = 1, -1
+        x = x.reshape(1, -1)
+        y = y.reshape(1, -1)
         r, c = x.shape
-        x.shape = r, int(c / binning), binning
-        y.shape = r, int(c / binning), binning
+        x = x.reshape(r, int(c / binning), binning)
+        y = y.reshape(r, int(c / binning), binning)
         x = x.sum(axis=-1, dtype=numpy.float32) / binning
         y = y.sum(axis=-1, dtype=numpy.float32)
-        x.shape = -1
-        y.shape = -1
+        x = numpy.ravel(x)
+        y = numpy.ravel(y)
         self._binnedX = x
         self._binnedY = y
         self.graph.addCurve(x, y, legend=self._legend, replace=True)
@@ -712,7 +712,7 @@ def test():
     app.lastWindowClosed.connect(app.quit)
     container = PCAWindow()
     data = numpy.arange(20000)
-    data.shape = 2, 100, 100
+    data = data.reshape(2, 100, 100)
     data[1, 0:100, 0:50] = 100
     container.setPCAData(
         data,

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/math/SIFTAlignmentWindow.py

@@ -291,7 +291,7 @@ class SIFTAlignmentDialog(qt.QDialog):
 
     def setDummyStack(self):
         dummyStack = numpy.arange(2 * 128 *256)
-        dummyStack.shape = 2, 128, 256
+        dummyStack = dummyStack.reshape(2, 128, 256)
         self.setStack(dummyStack, index=0)
 
     def getParameters(self):

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/math/fitting/SimpleFitBatchGui.py

@@ -100,10 +100,11 @@ class SimpleFitBatchParameters(qt.QWidget):
             self._inputDir = PyMcaDirs.inputDir
         elif os.path.exists(self._inputDir):
             PyMcaDirs.inputDir = self._inputDir
-        filetypes  = ["Mca Files (*.mca)",
-                      "Edf Files (*.edf)"]
+        filetypes = []
         if HDF5SUPPORT:
-            filetypes.append("HDF5 Files(*.nxs *.h5 *.hdf)")
+            filetypes.append("HDF5 Files(*.nxs *.h5 *.hdf *.hdf5)")
+        filetypes  += ["Mca Files (*.mca)",
+                      "Edf Files (*.edf)"]
         filetypes.append("SPEC Files (*.spec)")
         filetypes.append("SPEC Files (*.dat)")
         filetypes.append("All files (*)")

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/physics/xrf/AttenuatorsTable.py

@@ -2,7 +2,7 @@
 #
 # The PyMca X-Ray Fluorescence Toolkit
 #
-# Copyright (c) 2004-2023 European Synchrotron Radiation Facility
+# Copyright (c) 2004-2025 European Synchrotron Radiation Facility
 #
 # This file is part of the PyMca X-ray Fluorescence Toolkit developed at
 # the ESRF.
@@ -94,11 +94,11 @@ class AttenuatorsTab(qt.QWidget):
                 if rheight > 40:
                     self.table.setMinimumHeight(10*rheight)
                 else:
-                    self.table.setMinimumHeight(13*rheight)
+                    self.table.setMinimumHeight(14*rheight)
             else:
                 self.editor = MaterialEditor.MaterialEditor(graph=graph)
-                self.table.setMinimumHeight(13*rheight)
-            self.table.setMaximumHeight(13*rheight)
+                self.table.setMinimumHeight(14*rheight)
+            self.table.setMaximumHeight(14*rheight)
         self.userAttenuators = TransmissionTableGui.TransmissionTableGui()
         self.mainTab.addTab(self.editor, "Material Editor")
         self.mainTab.addTab(self.userAttenuators, "User Attenuators")
@@ -322,9 +322,12 @@ class AttenuatorsTableWidget(QTable):
     def __init__(self, parent=None, name="Attenuators Table",
                  attenuators=None, matrixmode=None, compoundmode=None,
                  layerindex=0, funnyfilters=False):
+
+        beamFilters0 = ["BeamFilter1", "BeamFilter2", "BeamFilter3"] # this needs to be synchronized with FitParam.py
         attenuators0 = ["Atmosphere", "Air", "Window", "Contact", "DeadLayer",
-                       "Filter5", "Filter6", "Filter7", "BeamFilter1",
-                       "BeamFilter2", "Detector", "Matrix"]
+                       "Filter5", "Filter6", "Filter7"] + beamFilters0 +  ["Detector", "Matrix"]
+        self.__attenuators0 = attenuators0
+        self.__beamFilters0 = beamFilters0
 
         QTable.__init__(self, parent)
         self.setWindowTitle(name)
@@ -385,12 +388,12 @@ class AttenuatorsTableWidget(QTable):
 
         self.sigValueChanged[int,int].connect(self.mySlot)
 
-    def __build(self, nfilters=12):
+    def __build(self, nfilters=13):
         n = 0
         if (not self.matrixMode) and (not self.compoundMode):
-            n = 4
+            n = len(self.__beamFilters0) + 2
             #self.setNumRows(nfilters+n)
-            self.setRowCount(12)
+            self.setRowCount(len(self.__attenuators0))
         else:
             self.setRowCount(nfilters)
         rheight = self.horizontalHeader().sizeHint().height()
@@ -457,10 +460,11 @@ class AttenuatorsTableWidget(QTable):
             #self.setItem(idx,2,combo)
             combo.sigMaterialComboBoxSignal.connect(self._comboSlot)
 
-        for i in range(2):
+        nBeamFilters = len(self.__beamFilters0)
+        for i in range(nBeamFilters):
             #BeamFilter(i)
             item = qt.QCheckBox(self)
-            idx = self.rowCount() - (4 - i)
+            idx = self.rowCount() - (n - i)
             self.setCellWidget(idx, 0, item)
             text = "BeamFilter%d" % i
             item.setText(text)

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/physics/xrf/ElementsInfo.py

@@ -2,7 +2,7 @@
 #
 # The PyMca X-Ray Fluorescence Toolkit
 #
-# Copyright (c) 2004-2023 European Synchrotron Radiation Facility
+# Copyright (c) 2004-2026 European Synchrotron Radiation Facility
 #
 # This file is part of the PyMca X-ray Fluorescence Toolkit developed at
 # the ESRF.
@@ -30,6 +30,7 @@ __author__ = "V. Armando Sole - ESRF"
 __contact__ = "sole@esrf.fr"
 __license__ = "MIT"
 __copyright__ = "European Synchrotron Radiation Facility, Grenoble, France"
+import sys
 import logging
 from PyMca5.PyMcaGui import PyMcaQt as qt
 from PyMca5.PyMcaPhysics.xrf import ElementHtml

{pymca5-5.9.5rc4 → pymca5-5.9.6}/src/PyMca5/PyMcaGui/physics/xrf/FitParam.py

@@ -2,7 +2,7 @@
 #
 # The PyMca X-Ray Fluorescence Toolkit
 #
-# Copyright (c) 2004-2023 European Synchrotron Radiation Facility
+# Copyright (c) 2004-2025 European Synchrotron Radiation Facility
 #
 # This file is part of the PyMca X-ray Fluorescence Toolkit developed at
 # the ESRF.
@@ -69,7 +69,7 @@ FitParamHeaders= ["FIT", "DETECTOR","BEAM","PEAKS", "PEAK SHAPE", "ATTENUATORS",
 
 class FitParamWidget(FitParamForm):
     attenuators= ["Filter 0", "Filter 1", "Filter 2", "Filter 3", "Filter 4", "Filter 5",
-                   "Filter 6","Filter 7","BeamFilter0", "BeamFilter1","Detector", "Matrix"]
+                   "Filter 6","Filter 7","BeamFilter0", "BeamFilter1", "BeamFilter2","Detector", "Matrix"]
     def __init__(self, parent=None):
         FitParamForm.__init__(self, parent)
         self._channels = None
@@ -616,12 +616,9 @@ class FitParamWidget(FitParamForm):
                 else:
                     current['AlphaScatteringFlag'] = 0
                 self.matrixGeometry.setParameters(current)
-            elif att.upper() == "BEAMFILTER0":
+            elif att.upper().startswith("BEAMFILTER"):
                 attpar= self.__get("attenuators", att, [0, "-", 0., 0.], None)
-                row = self.attTable.rowCount() - 4
-            elif att.upper() == "BEAMFILTER1":
-                attpar= self.__get("attenuators", att, [0, "-", 0., 0.], None)
-                row = self.attTable.rowCount() - 3
+                row = self.attTable.rowCount() - 2 - (3 - int(att[-1])) # maximum 3 BeamFilter
             elif att.upper() == "DETECTOR":
                 attpar= self.__get("attenuators", att, [0, "-", 0., 0.], None)
                 row = self.attTable.rowCount() - 2
@@ -645,7 +642,7 @@ class FitParamWidget(FitParamForm):
                 attpar.append(1.0)
             self.attTable.setText(row, 3, str(attpar[2]))
             self.attTable.setText(row, 4, str(attpar[3]))
-            if att.upper() not in ["MATRIX", "DETECTOR", "BEAMFILTER1", "BEAMFILTER2"]:
+            if not (att.upper() in ["MATRIX", "DETECTOR"] or att.upper().startswith("BEAMFILTER")):
                 self.attTable.setText(row, 5, str(attpar[4]))
             else:
                 self.attTable.setText(row, 5, "1.0")