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

Timestamp:

Mar 20, 2009 8:26:01 PM (15 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:

20d30e9

Parents:

f2776f6

Message:

new interface design —→ proposition

File:

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

sansview/perspectives/fitting/model_thread.py

@@ -90 +90 @@
     """
     
-    def __init__(self, x, y, model,qmin, qmax,qstep,
+    def __init__(self, x, y, data,model,qmin, qmax,qstep,
                  completefn = None,
                  updatefn   = None,
@@ -101 +101 @@
                  worktime)
         self.qmin= qmin
-        self.qmax=qmax
+        self.qmax= qmax
         self.qstep= qstep
         self.x = x
         self.y = y
+        self.data= data
         ## the model on to calculate
         self.model = model
@@ -128 +129 @@
         y = self.y
         output = numpy.zeros((len(x),len(y)))
-      
-        center_x=0
-        center_y=0
+        
+        if self.qmin==None:
+            self.qmin = 0
+        if self.qmax== None:
+            if data ==None:
+                return
+            newx= math.pow(max(math.fabs(data.xmax),math.fabs(data.xmin)),2)
+            newy= math.pow(max(math.fabs(data.ymax),math.fabs(data.ymin)),2)
+            self.qmax=math.sqrt( newx + newy )
         
         self.starttime = time.time()
         
-        
         lx = len(self.x)
-       
         for i_x in range(len(self.x)):
             # Check whether we need to bail out
@@ -143 +148 @@
        
             for i_y in range(int(len(self.y))):
-           
-                if (self.x[i_x]*self.x[i_x]+self.y[i_y]*self.y[i_y]) \
-                    < self.qmin * self.qmin:
-                    
-                    output[i_x] [i_y]=0   
+                radius = self.x[i_x]*self.x[i_x]+self.y[i_y]*self.y[i_y]
+                
+                if  self.qmin <= radius or radius<= self.qmax:
+                    value = self.model.runXY( [self.x[i_x], self.y[i_y]] )
+                    output[i_x] [i_y]=value   
                 else:
-                    value = self.model.runXY([self.x[i_x]-center_x, self.y[i_y]-center_y])
-                    output[i_x] [i_y]=value   
+                     output[i_x] [i_y]=0   
             
         elapsed = time.time()-self.starttime
-        self.complete(
-                      output=output, elapsed=elapsed,model= self.model,
-                      qmin= self.qmin,
-                      qmax=self.qmax,
-                      qstep=self.qstep)
+        self.complete( image = output,
+                       data = self.data , 
+                       model = self.model,
+                       elapsed = elapsed,
+                       qmin = self.qmin,
+                       qmax =self.qmax,
+                       qstep = self.qstep )
 
 
@@ -256 +262 @@
                  qmin=None,
                  qmax=None,
-                 name=None,
                  smearer=None,
                  completefn = None,
@@ -272 +277 @@
         self.qmax= qmax
         self.model = model
-        self.name= name
         self.smearer= smearer
         self.starttime = 0
         
     def compute(self):
+        """
+            Compute model 1d value given qmin , qmax , x value 
+        """
         import numpy
         
         output = numpy.zeros(len(self.x))
-        if self.qmin==None:
-            self.qmin= min(self.x)
-        if self.qmax==None:
-            self.qmax= max(self.x) 
-               
+       
         self.starttime = time.time()
         
@@ -294 +297 @@
                 value = self.model.run(self.x[i_x])
                 output[i_x] = value
+                
         if self.smearer!=None:
             output = self.smearer(output)
-                    
+            
+                      
         elapsed = time.time()-self.starttime
-        self.complete(x= self.x, output=output, 
-                      elapsed=elapsed, name=self.name, data=self.data)
+        self.complete(x= self.x, y= output, 
+                      elapsed=elapsed, model= self.model, data=self.data)