Changeset c1c9929 in sasview

Timestamp:

Mar 1, 2017 11:39:46 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.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fdaf2b1

Parents:

27ba79c

Message:

Set smearer model before entering the smearing calculation. #844

Location:

src/sas

Files:

• sascalc/data_util/qsmearing.py (modified) (1 diff)
• sasgui/perspectives/fitting/model_thread.py (modified) (1 diff)

src/sas/sascalc/data_util/qsmearing.py

@@ -108 +108 @@
         q_calc = self.resolution.q_calc
         iq_calc = numpy.empty_like(q_calc)
-        if start > 0 and self.model is not None:
+        if start > 0:
             iq_calc[:start] = self.model.evalDistribution(q_calc[:start])
-        if end+1 < len(q_calc) and self.model is not None:
+        if end+1 < len(q_calc):
             iq_calc[end+1:] = self.model.evalDistribution(q_calc[end+1:])
         iq_calc[start:end+1] = iq_in[first_bin:last_bin+1]

src/sas/sasgui/perspectives/fitting/model_thread.py

@@ -177 +177 @@
             unsmeared_output = numpy.zeros((len(self.data.x)))
             unsmeared_output[first_bin:last_bin+1] = self.model.evalDistribution(mask)
+            self.smearer.model = self.model
             output = self.smearer(unsmeared_output, first_bin, last_bin)