Changeset 0766d6d in sasview for park_integration/src/sans/fit

Timestamp:

Oct 19, 2011 1:12:25 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:

3b70cc7

Parents:

91a3860

Message:

fixed 2d qrange set

File:

• park_integration/src/sans/fit/AbstractFitEngine.py (modified) (5 diffs)

park_integration/src/sans/fit/AbstractFitEngine.py

@@ -251 +251 @@
         self.idx_unsmeared = (self.x >= self._qmin_unsmeared) \
                             & (self.x <= self._qmax_unsmeared)
-  
+
     def get_fit_range(self):
         """
@@ -345 +345 @@
         self.idx = (self.idx) & (self.mask)
         self.idx = (self.idx) & (numpy.isfinite(self.data))
-        
+
     def set_smearer(self, smearer):  
         """
@@ -365 +365 @@
             self.qmax = qmax        
         self.radius = numpy.sqrt(self.qx_data**2 + self.qy_data**2)
-        self.index_model = ((self.qmin <= self.radius)&\
+        self.idx = ((self.qmin <= self.radius)&\
                             (self.radius <= self.qmax))
         self.idx = (self.idx) &(self.mask)
         self.idx = (self.idx) & (numpy.isfinite(self.data))
         self.idx = (self.idx) & (self.res_err_data != 0)
-        
+
     def get_fit_range(self):
         """
@@ -392 +392 @@
         # use only the data point within ROI range
         res = (self.data[self.idx] - gn)/self.res_err_data[self.idx]
+
         return res, gn 
         
@@ -460 +461 @@
         #import thread
         self.model.set_params(self.paramlist, params)
+        #print "params", params
         self.true_res, theory = self.data.residuals(self.model.eval)
         self.theory = copy.deepcopy(theory)