Changeset f72333f in sasview for sansview/perspectives/fitting/model_thread.py

Timestamp:

May 10, 2010 4:50:05 PM (14 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:

4fbc93e

Parents:

2d409fa

Message:

Plugged in 2D smear: traditional over-sampling method

File:

• sansview/perspectives/fitting/model_thread.py (modified) (7 diffs)

sansview/perspectives/fitting/model_thread.py

@@ -3 +3 @@
 import sys
 import numpy,math
-
+from DataLoader.smearing_2d import Smearer2D
+import fitpage
 class Calc2D(CalcThread):
     """
@@ -12 +13 @@
     """
     
-    def __init__(self, x, y, data,model,qmin, qmax,qstep,
+    def __init__(self, x, y, data,model,smearer,qmin, qmax,qstep,
                  completefn = None,
                  updatefn   = None,
@@ -31 +32 @@
         # the model on to calculate
         self.model = model
+        self.smearer = smearer#(data=self.data,model=self.model)
         self.starttime = 0  
         
@@ -51 +53 @@
             self.qx_data = self.data.qx_data
             self.qy_data = self.data.qy_data
+            self.dqx_data = self.data.dqx_data
+            self.dqy_data = self.data.dqy_data
             self.mask    = self.data.mask
         else:          
@@ -86 +90 @@
             # Only qmin value will be consider for the detector
             index_model = index_data  
-             
-        value = self.model.evalDistribution([self.qx_data[index_model],self.qy_data[index_model]] )
+
+        if self.smearer != None:
+            # Set smearer w/ data, model and index.
+            fn = self.smearer
+            fn.set_model(self.model)
+            fn.set_index(index_model)
+            # Get necessary data from self.data and set the data for smearing
+            fn.get_data()
+            # Calculate smeared Intensity (by Gaussian averaging): DataLoader/smearing2d/Smearer2D()
+            value = fn.get_value()
+
+        else:    
+            # calculation w/o smearing
+            value =  self.model.evalDistribution([self.qx_data[index_model],self.qy_data[index_model]])
 
         output = numpy.zeros(len(self.qx_data))
         
         # output default is None
-        # This method is to distinguish between masked point and data point = 0.
+        # This method is to distinguish between masked point(nan) and data point = 0.
         output = output/output
         # set value for self.mask==True, else still None to Plottools
         output[index_model] = value 
+
         elapsed = time.time()-self.starttime
         self.complete( image = output,
@@ -101 +118 @@
                        model = self.model,
                        elapsed = elapsed,
+                       index = index_model,
                        qmin = self.qmin,
                        qmax = self.qmax,
                        qstep = self.qstep )
         
-   
-    
 
 class Calc1D(CalcThread):
@@ -153 +169 @@
        
         self.complete(x= self.x[index], y= output[index], 
-                      elapsed=elapsed, model= self.model, data=self.data)
-        
- 
+                      elapsed=elapsed,index=index, model= self.model, data=self.data)
+
+        
+    def results(self):
+        """
+            Send resuts of the computation
+        """
+        return [self.out, self.index]
                 
 class CalcCommandline: