Changeset b1f20d1 in sasview

Timestamp:

Sep 14, 2017 10:38:14 AM (7 years ago)

Author:

krzywon

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c54c965

Parents:

cd57c7d4

Message:

Make invariant calculator numpy 1.12+ compatible. refs #888

File:

• src/sas/sascalc/invariant/invariant.py (modified) (4 diffs)

src/sas/sascalc/invariant/invariant.py

@@ -610 +610 @@
         # Data boundaries for fitting
         qmin = self._data.x[0]
-        qmax = self._data.x[self._low_extrapolation_npts - 1]
+        qmax = self._data.x[int(self._low_extrapolation_npts - 1)]
 
         # Extrapolate the low-Q data
@@ -649 +649 @@
         # Data boundaries for fitting
         x_len = len(self._data.x) - 1
-        qmin = self._data.x[x_len - (self._high_extrapolation_npts - 1)]
-        qmax = self._data.x[x_len]
+        qmin = self._data.x[int(x_len - (self._high_extrapolation_npts - 1))]
+        qmax = self._data.x[int(x_len)]
 
         # fit the data with a model to get the appropriate parameters
@@ -688 +688 @@
         if npts_in is None:
             npts_in = self._low_extrapolation_npts
-        q_end = self._data.x[max(0, npts_in - 1)]
+        q_end = self._data.x[max(0, int(npts_in - 1))]
 
         if q_start >= q_end:
@@ -714 +714 @@
         # Get extrapolation range
         if npts_in is None:
-            npts_in = self._high_extrapolation_npts
+            npts_in = int(self._high_extrapolation_npts)
         _npts = len(self._data.x)
-        q_start = self._data.x[min(_npts, _npts - npts_in)]
+        q_start = self._data.x[min(_npts, int(_npts - npts_in))]
 
         if q_start >= q_end: