Changeset a3f125f0 in sasview for src/sas/perspectives

Timestamp:

Mar 30, 2015 10:51:41 AM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

edfc8ac

Parents:

d5419f7f

Message:

refactor resolution calculation to enable sasmodels resolution calcuator for pinhole smearing, but don't enable it yet

Location:

src/sas/perspectives/fitting

Files:

• fitting.py (modified) (1 diff)
• model_thread.py (modified) (1 diff)

src/sas/perspectives/fitting/fitting.py

@@ -954 +954 @@
                 return True
             except:
+                raise
                 msg = "Fitting error: %s" % str(sys.exc_value)
                 wx.PostEvent(self.parent, StatusEvent(status=msg, info="error",

src/sas/perspectives/fitting/model_thread.py

@@ -169 +169 @@
             first_bin, last_bin = self.smearer.get_bin_range(self.qmin,
                                                              self.qmax)
-            mask = self.data.x[first_bin:last_bin]
-            output[first_bin:last_bin] = self.model.evalDistribution(mask)
+            mask = self.data.x[first_bin:last_bin+1]
+            output[first_bin:last_bin+1] = self.model.evalDistribution(mask)
             output = self.smearer(output, first_bin, last_bin)
         else: