diff --git a/nion/eels_analysis/BackgroundModel.py b/nion/eels_analysis/BackgroundModel.py index f02b949..38ac8a8 100644 --- a/nion/eels_analysis/BackgroundModel.py +++ b/nion/eels_analysis/BackgroundModel.py @@ -4,6 +4,7 @@ import copy import functools import gettext +import math import numpy import scipy import scipy.integrate @@ -121,7 +122,7 @@ def __fit_background(self, fs = numpy.linspace(interval_start, interval_end, n, dtype=numpy.float32) if spectrum_xdata.is_navigable: calibrations = list(copy.deepcopy(spectrum_xdata.navigation_dimensional_calibrations)) + [calibration] - yss = numpy.reshape(ys, (numpy.prod(ys.shape[:-1]),) + (ys.shape[-1],)) + yss = numpy.reshape(ys, (math.prod(ys.shape[:-1]),) + (ys.shape[-1],)) fit_data = self._perform_fits(xs, yss, fs, es) data_descriptor = DataAndMetadata.DataDescriptor(False, spectrum_xdata.navigation_dimension_count, spectrum_xdata.datum_dimension_count) diff --git a/nion/eels_analysis/PeakModel.py b/nion/eels_analysis/PeakModel.py index 35a3011..cea9410 100644 --- a/nion/eels_analysis/PeakModel.py +++ b/nion/eels_analysis/PeakModel.py @@ -3,6 +3,7 @@ # imports import copy import gettext +import math import numpy import typing @@ -33,7 +34,7 @@ def __fit_zero_loss_peak(self, spectrum_xdata: DataAndMetadata.DataAndMetadata) ys = spectrum_xdata.data if spectrum_xdata.is_navigable: calibrations = list(copy.deepcopy(spectrum_xdata.navigation_dimensional_calibrations)) + [calibration] - yss = numpy.reshape(ys, (numpy.prod(ys.shape[:-1]),) + (ys.shape[-1],)) + yss = numpy.reshape(ys, (math.prod(ys.shape[:-1]),) + (ys.shape[-1],)) fit_data = self._perform_fits(yss, z) data_descriptor = DataAndMetadata.DataDescriptor(False, spectrum_xdata.navigation_dimension_count, spectrum_xdata.datum_dimension_count)