Changeset b461b6d7 in sasview for park_integration

Timestamp:

Dec 24, 2008 9:43:47 AM (16 years ago)

Author:

Gervaise Alina <gervyh@…>

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:

8ff3ec1

Parents:

be404bc

Message:

smearing changes

Location:

park_integration

Files:

• AbstractFitEngine.py (modified) (5 diffs)
• test/test_fit_line.py (modified) (1 diff)

park_integration/AbstractFitEngine.py

@@ -169 +169 @@
 class FitData1D(object):
     """ Wrapper class  for SANS data """
-    def __init__(self,sans_data1d):
+    def __init__(self,sans_data1d, smearer=None):
         """
             Data can be initital with a data (sans plottable)
@@ -190 +190 @@
             
         """
-        ## Smearing object
-        try:
-            self.smearer = sans_data1d.smearer
-        except:
-            self.smearer= None
-
+        
+        self.smearer = smearer
+      
         # Initialize from Data1D object
         self.data=sans_data1d
@@ -321 +318 @@
         if self.ymax==None:
             self.ymax= self.data.ymax
-            
         for i in range(len(self.y_bins)):
             #if self.y_bins[i]>= self.ymin and self.y_bins[i]<= self.ymax:
             for j in range(len(self.x_bins)):
                 #if self.x_bins[j]>= self.xmin and self.x_bins[j]<= self.xmax:
+                
                 res.append( (self.image[j][i]- fn([self.x_bins[j],self.y_bins[i]]))\
                             /self.err_image[j][i] )
@@ -464 +461 @@
             raise ValueError, "park_integration:missing parameters"
     
-    def set_data(self,data,Uid,qmin=None,qmax=None,ymin=None,ymax=None):
+    def set_data(self,data,Uid,smearer=None,qmin=None,qmax=None,ymin=None,ymax=None):
         """ Receives plottable, creates a list of data to fit,set data
             in a FitArrange object and adds that object in a dictionary 
@@ -474 +471 @@
             fitdata=FitData2D(data)
         else:
-            fitdata=FitData1D(data)
+            fitdata=FitData1D(data, smearer)
        
         fitdata.setFitRange(qmin=qmin,qmax=qmax, ymin=ymin,ymax=ymax)

park_integration/test/test_fit_line.py

@@ -9 +9 @@
 import math
 class testFitModule(unittest.TestCase):
+    def smalltest(self):
+        
+        import numpy
+        x=[1,22,3]
+        y=[5,6,7,8]
+        array= numpy.zeros(len(x), len(y))
+        
     """ test fitting """
     def test1(self):