Changeset 5062bbf in sasview for sansview/perspectives/fitting/model_thread.py

Timestamp:

Jun 7, 2010 10:26:43 AM (14 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:

b94945d

Parents:

79ac6f8

Message:

working on documentation

File:

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

sansview/perspectives/fitting/model_thread.py

@@ +1 @@
+
+
 import time
 from data_util.calcthread import CalcThread
@@ -4 +6 @@
 import numpy,math
 from DataLoader.smearing_2d import Smearer2D
-import fitpage
+
 class Calc2D(CalcThread):
     """
-        Compute 2D model
-        This calculation assumes a 2-fold symmetry of the model
-        where points are computed for one half of the detector
-        and I(qx, qy) = I(-qx, -qy) is assumed.
-    """
-    
+    Compute 2D model
+    This calculation assumes a 2-fold symmetry of the model
+    where points are computed for one half of the detector
+    and I(qx, qy) = I(-qx, -qy) is assumed.
+    """
     def __init__(self, x, y, data,model,smearer,qmin, qmax,qstep,
                  completefn = None,
@@ -37 +38 @@
     def compute(self):
         """
-            Compute the data given a model function
+        Compute the data given a model function
         """
         self.starttime = time.time()
@@ -125 +126 @@
 
 class Calc1D(CalcThread):
-    """Compute 1D data"""
-    
+    """
+    Compute 1D data
+    """
     def __init__(self, x, model,
                  data=None,
@@ -137 +139 @@
                  worktime   = 0.01
                  ):
+        """
+        """
         CalcThread.__init__(self,completefn,
                  updatefn,
@@ -151 +155 @@
     def compute(self):
         """
-            Compute model 1d value given qmin , qmax , x value 
-        """
-        
+        Compute model 1d value given qmin , qmax , x value 
+        """
         self.starttime = time.time()
         output = numpy.zeros((len(self.x)))
@@ -166 +169 @@
             output[index] = self.model.evalDistribution(self.x[index])
          
-        elapsed = time.time()-self.starttime
+        elapsed = time.time() - self.starttime
        
-        self.complete(x= self.x[index], y= output[index], 
-                      elapsed=elapsed,index=index, model= self.model, data=self.data)
-
+        self.complete(x=self.x[index], y=output[index], 
+                      elapsed=elapsed,index=index, model=self.model,
+                                        data=self.data)
         
     def results(self):
         """
-            Send resuts of the computation
+        Send resuts of the computation
         """
         return [self.out, self.index]
-                
-class CalcCommandline:
-    def __init__(self, n=20000):
-        #print thread.get_ident()
-        from sans.models.CylinderModel import CylinderModel
-        
-        model = CylinderModel()
-        
+
+"""
+Example: ::
+                     
+    class CalcCommandline:
+        def __init__(self, n=20000):
+            #print thread.get_ident()
+            from sans.models.CylinderModel import CylinderModel
+            
+            model = CylinderModel()
+            
+             
+            print model.runXY([0.01, 0.02])
+            
+            qmax = 0.01
+            qstep = 0.0001
+            self.done = False
+            
+            x = numpy.arange(-qmax, qmax+qstep*0.01, qstep)
+            y = numpy.arange(-qmax, qmax+qstep*0.01, qstep)
+        
+        
+            calc_thread_2D = Calc2D(x, y, None, model.clone(),None,
+                                    -qmax, qmax,qstep,
+                                            completefn=self.complete,
+                                            updatefn=self.update ,
+                                            yieldtime=0.0)
          
-        print model.runXY([0.01, 0.02])
-        
-        qmax = 0.01
-        qstep = 0.0001
-        self.done = False
-        
-        x = numpy.arange(-qmax, qmax+qstep*0.01, qstep)
-        y = numpy.arange(-qmax, qmax+qstep*0.01, qstep)
+            calc_thread_2D.queue()
+            calc_thread_2D.ready(2.5)
+            
+            while not self.done:
+                time.sleep(1)
     
+        def update(self,output):
+            print "update"
     
-        calc_thread_2D = Calc2D(x, y, None, model.clone(),-qmax, qmax,qstep,
-                                        completefn=self.complete,
-                                        updatefn=self.update ,
-                                        yieldtime=0.0)
-     
-        calc_thread_2D.queue()
-        calc_thread_2D.ready(2.5)
-        
-        while not self.done:
-            time.sleep(1)
-
-    def update(self,output):
-        print "update"
-
-    def complete(self, image, data, model, elapsed, qmin, qmax, qstep ):
-        print "complete"
-        self.done = True
-
-if __name__ == "__main__":
-    CalcCommandline()
-   
+        def complete(self, image, data, model, elapsed, qmin, qmax,index, qstep ):
+            print "complete"
+            self.done = True
+    
+    if __name__ == "__main__":
+        CalcCommandline()
+"""