Changeset 324e0bf in sasview

Timestamp:

May 19, 2017 7:41:37 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, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

edc7852

Parents:

8de66b6

Message:

Support numpy v1.12 - integer indices.

Location:

src/sas

Files:

• sascalc/dataloader/manipulations.py (modified) (3 diffs)
• sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py (modified) (1 diff)

src/sas/sascalc/dataloader/manipulations.py

@@ -199 +199 @@
     z_max = max(data2D.q_data)
     z_min = min(data2D.q_data)
-    x_max = data2D.dqx_data[data2D.q_data[z_max]]
-    x_min = data2D.dqx_data[data2D.q_data[z_min]]
-    y_max = data2D.dqy_data[data2D.q_data[z_max]]
-    y_min = data2D.dqy_data[data2D.q_data[z_min]]
+    dqx_at_z_max = data2D.dqx_data[np.argmax(data2D.q_data)]
+    dqx_at_z_min = data2D.dqx_data[np.argmin(data2D.q_data)]
+    dqy_at_z_max = data2D.dqy_data[np.argmax(data2D.q_data)]
+    dqy_at_z_min = data2D.dqy_data[np.argmin(data2D.q_data)]
     # Find qdx at q = 0
-    dq_overlap_x = (x_min * z_max - x_max * z_min) / (z_max - z_min)
+    dq_overlap_x = (dqx_at_z_min * z_max - dqx_at_z_max * z_min) / (z_max - z_min)
     # when extrapolation goes wrong
     if dq_overlap_x > min(data2D.dqx_data):
@@ -210 +210 @@
     dq_overlap_x *= dq_overlap_x
     # Find qdx at q = 0
-    dq_overlap_y = (y_min * z_max - y_max * z_min) / (z_max - z_min)
+    dq_overlap_y = (dqy_at_z_min * z_max - dqy_at_z_max * z_min) / (z_max - z_min)
     # when extrapolation goes wrong
     if dq_overlap_y > min(data2D.dqy_data):
@@ -220 +220 @@
     # Final protection of dq
     if dq_overlap < 0:
-        dq_overlap = y_min
+        dq_overlap = dqy_at_z_min
     dqx_data = data2D.dqx_data[np.isfinite(data2D.data)]
     dqy_data = data2D.dqy_data[np.isfinite(

src/sas/sasgui/guiframe/local_perspectives/plotting/parameters_panel_slicer.py

@@ -136 +136 @@
             ix = 0
             iy += 1
-            txt = "Slicer type:"
+            txt = "Slicer type"
             text = wx.StaticText(self, -1, txt, style=wx.ALIGN_LEFT)
             self.bck.Add(text, (iy, ix), (1, 1),