Skip to content

Change the numpy prod to math prod to fix typing #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
MattRoyle wants to merge 1 commit into from
Closed

Change the numpy prod to math prod to fix typing #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nion/eels_analysis/BackgroundModel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import copy
import functools
import gettext
import math
import numpy
import scipy
import scipy.integrate
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion nion/eels_analysis/PeakModel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# imports
import copy
import gettext
import math
import numpy
import typing

Expand Down Expand Up @@ -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)
Expand Down
Loading