Changeset 9b90bf8 in sasview for src/sas/sasgui/perspectives

Timestamp:

Jul 19, 2017 10:04:45 AM (7 years ago)

Author:

lewis

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:

a309667

Parents:

d78b5cb

Message:

Use DCT to calculate IDF

Location:

src/sas/sasgui/perspectives/corfunc

Files:

• corfunc.py (modified) (1 diff)
• corfunc_panel.py (modified) (1 diff)

src/sas/sasgui/perspectives/corfunc/corfunc.py

@@ -192 +192 @@
             new_plot.xaxis("{x}", 'A')
             new_plot.yaxis("{g_1}", '')
-
+            # Linear scale
             new_plot.xtransform = 'x'
             new_plot.ytransform = 'y'
             group_id = GROUP_ID_IDF
+            # Show IDF as a curve instead of points
             new_plot.symbol = GUIFRAME_ID.CURVE_SYMBOL_NUM
         new_plot.id = label

src/sas/sasgui/perspectives/corfunc/corfunc_panel.py

@@ -277 +277 @@
         self._transformed_data = transforms
         (transform1, transform3, idf) = transforms
-        plot_x = transform1.x[np.where(transform1.x <= 200)]
-        plot_y = transform1.y[np.where(transform1.x <= 200)]
+        plot_x = transform1.x[transform1.x <= 200]
+        plot_y = transform1.y[transform1.x <= 200]
         self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL1)
         # No need to shorten gamma3 as it's only calculated up to x=200
         self._manager.show_data(transform3, TRANSFORM_LABEL3)
-        self._manager.show_data(idf, IDF_LABEL)
+
+        plot_x = idf.x[idf.x <= 200]
+        plot_y = idf.y[idf.x <= 200]
+        self._manager.show_data(Data1D(plot_x, plot_y), IDF_LABEL)
 
         # Only enable extract params button if a fourier trans. has been done