Changeset 44f9c8b in sasview for fittingview/src/sans

Timestamp:

Sep 7, 2011 6:38:18 PM (13 years ago)

Author:

Jae Cho <jhjcho@…>

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.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

a0106ac

Parents:

55bb249c

Message:

2D weighting working

File:

• fittingview/src/sans/perspectives/fitting/fitpage.py (modified) (3 diffs)

fittingview/src/sans/perspectives/fitting/fitpage.py

@@ -1110 +1110 @@
         self._manager.set_fit_weight(uid=self.uid, 
                                      weight=self.get_weight(),
-                                     is2d = self.is_2D)
+                                     is2d = self._is_2D())
         self._manager.set_fit_range(uid=self.uid,qmin=self.qmin_x, 
                                    qmax=self.qmax_x)
@@ -1126 +1126 @@
                        self.dI_sqrdata,
                        self.dI_idata]
-        if self.is_2D:
+        if self._is_2D():
             dy_data = self.data.err_data 
             data = self.data.data
@@ -1140 +1140 @@
                     dy = dy_data
                 elif button_list.index(item) == 2:
-                    dy = numpy.sqrt(data)
+                    dy = numpy.sqrt(numpy.abs(data))
                 elif button_list.index(item) == 3:
-                    dy = data
+                    dy = numpy.abs(data)
                 break
         return dy