Changeset 027e8f2 in sasview for park_integration/AbstractFitEngine.py

Timestamp:

Dec 8, 2009 4:24:55 PM (15 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:

71e2de7

Parents:

3bb37ef

Message:

Fixed a 2D problem of not properly (calculating chi2 and fitting 2Ddata) with bounded Q range.

File:

• park_integration/AbstractFitEngine.py (modified) (3 diffs)

park_integration/AbstractFitEngine.py

@@ -266 +266 @@
         
         
-    def set_data(self, sans_data2d ):
+    def set_data(self, sans_data2d, qmin=None, qmax=None ):
         """
             Determine the correct x_bin and y_bin to fit
@@ -279 +279 @@
         
         ## fitting range
-        self.qmin = 1e-16
-        self.qmax = math.sqrt(x_max*x_max +y_max*y_max)
+        if qmin == None:
+            self.qmin = 1e-16
+        if qmax == None:
+            self.qmax = math.sqrt(x_max*x_max +y_max*y_max)
         ## new error image for fitting purpose
         if self.err_data== None or self.err_data ==[]:
@@ -300 +302 @@
         if qmax!=None:
             self.qmax= qmax
-      
+            
+        self.radius= numpy.sqrt(self.x_bins_array**2 + self.y_bins_array**2)
+        self.index_model = (self.qmin <= self.radius)&(self.radius<= self.qmax)
         
     def getFitRange(self):