Changeset e0ebd56 in sasview

Timestamp:

May 18, 2017 10:07:12 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:

9e2535e

Parents:

8e15dce

git-author:

Jeff Krzywon <krzywon@…> (05/18/17 10:07:12)

git-committer:

krzywon <krzywon@…> (05/18/17 10:07:12)

Message:

Revert changes to manipulations.py to minimize conflicts with log_binning branch.

File:

• src/sas/sascalc/dataloader/manipulations.py (modified) (6 diffs)

src/sas/sascalc/dataloader/manipulations.py

@@ -430 +430 @@
             z_max = max(data2D.q_data)
             z_min = min(data2D.q_data)
-            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)]
+            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]]
             # Find qdx at q = 0
-            dq_overlap_x = ((dqx_at_z_min * z_max - dqx_at_z_max * z_min) /
+            dq_overlap_x = ((x_min * z_max - x_max * z_min) /
                             (z_max - z_min))
             # when extrapolation goes wrong
@@ -442 +442 @@
             dq_overlap_x *= dq_overlap_x
             # Find qdx at q = 0
-            dq_overlap_y = ((dqy_at_z_min * z_max - dqy_at_z_max * z_min) /
+            dq_overlap_y = ((y_min * z_max - y_max * z_min) /
                             (z_max - z_min))
             # when extrapolation goes wrong
@@ -453 +453 @@
             # Final protection of dq
             if dq_overlap < 0:
-                dq_overlap = dqy_at_z_min
+                dq_overlap = y_min
             dqx_data = data2D.dqx_data[np.isfinite(data2D.data)]
             dqy_data = data2D.dqy_data[np.isfinite(data2D.data)] - dq_overlap
@@ -787 +787 @@
             z_max = max(data2D.q_data)
             z_min = min(data2D.q_data)
-            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)]
+            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]]
             # Find qdx at q = 0
-            dq_overlap_x = ((dqx_at_z_min * z_max - dqx_at_z_max * z_min) /
+            dq_overlap_x = ((x_min * z_max - x_max * z_min) /
                             (z_max - z_min))
             # when extrapolation goes wrong
@@ -799 +799 @@
             dq_overlap_x *= dq_overlap_x
             # Find qdx at q = 0
-            dq_overlap_y = ((dqy_at_z_min * z_max - dqy_at_z_max * z_min) /
+            dq_overlap_y = ((y_min * z_max - y_max * z_min) /
                             (z_max - z_min))
             # when extrapolation goes wrong
@@ -809 +809 @@
             dq_overlap = np.sqrt((dq_overlap_x + dq_overlap_y) / 2.0)
             if dq_overlap < 0:
-                dq_overlap = dqy_at_z_min
+                dq_overlap = y_min
             dqx_data = data2D.dqx_data[np.isfinite(data2D.data)]
             dqy_data = data2D.dqy_data[np.isfinite(data2D.data)] - dq_overlap