Changeset 904713c in sasview

Timestamp:

Mar 28, 2009 10:52:48 AM (16 years ago)

Author:

Mathieu Doucet <doucetm@…>

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:

ead38a7

Parents:

ff54ce7

Message:

Cleaned up obvious flaws: still needs work

File:

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

sansview/perspectives/fitting/model_thread.py

@@ -2 +2 @@
 from calcthread import CalcThread
 import sys
+import numpy
 
 class Calc2D_all(CalcThread):
@@ -27 +28 @@
         self.starttime = 0
         
-    def isquit(self):
-        try:
-            CalcThread.isquit(self)
-        except KeyboardInterrupt:
-            wx.PostEvent(self.parent, StatusEvent(status=\
-                       "Calc %s interrupted" % self.model.name))
-            raise KeyboardInterrupt
-        
     def compute(self):
-        import numpy
         x = self.x
         y = self.y
@@ -108 +100 @@
         ## the model on to calculate
         self.model = model
-        self.starttime = 0
-      
-      
-    def isquit(self):
-        try:
-            CalcThread.isquit(self)
-        except KeyboardInterrupt:
-            wx.PostEvent(self.parent, StatusEvent(status=\
-                       "Calc %s interrupted" % self.model.name))
-           
-            raise KeyboardInterrupt
-        
+        self.starttime = 0  
         
     def compute(self):
@@ -125 +106 @@
             Compute the data given a model function
         """
-        import numpy
         x = self.x
         y = self.y
@@ -133 +113 @@
             self.qmin = 0
         if self.qmax== None:
-            if data ==None:
+            if self.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)
+            newx= math.pow(max(math.fabs(self.data.xmax),math.fabs(self.data.xmin)),2)
+            newy= math.pow(max(math.fabs(self.data.ymax),math.fabs(self.data.ymin)),2)
             self.qmax=math.sqrt( newx + newy )
         
@@ -189 +169 @@
         self.starttime = 0
         
-    def isquit(self):
-        try:
-            CalcThread.isquit(self)
-        except KeyboardInterrupt:
-            #printEVT("Calc %s interrupted" % self.model.name)
-            wx.PostEvent(self.parent, StatusEvent(status=\
-                       "Calc %s interrupted" % self.model.name))
-           
-            raise KeyboardInterrupt
-        
     def compute(self):
-        import numpy
         x = self.x
         y = self.y
@@ -284 +253 @@
             Compute model 1d value given qmin , qmax , x value 
         """
-        import numpy
-        
         output = numpy.zeros(len(self.x))
        
@@ -312 +279 @@
         #print thread.get_ident()
         from sans.models.CylinderModel import CylinderModel
-        from sans.models.DisperseModel import DisperseModel
-        import pylab
-        
-        submodel = CylinderModel()
-        
-        model = DisperseModel(submodel, ['cyl_phi', 'cyl_theta', 'length'],
-                                        [0.2, 0.2, 10.0])
-        model.setParam('n_pts', 10)
+        
+        model = CylinderModel()
+        
          
         print model.runXY([0.01, 0.02])
@@ -327 +289 @@
         self.done = False
         
-        x = pylab.arange(-qmax, qmax+qstep*0.01, qstep)
-        y = pylab.arange(-qmax, qmax+qstep*0.01, qstep)
-    
-        calc_thread_2D = Calc2D(x, y, model.clone(),-qmax, qmax,qstep,
+        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(),-qmax, qmax,qstep,
                                         completefn=self.complete,
                                         updatefn=self.update ,
@@ -344 +307 @@
         print "update"
 
-    def complete(self, output, model, elapsed, qmin, qmax, qstep ):
+    def complete(self, image, data, model, elapsed, qmin, qmax, qstep ):
         print "complete"
         self.done = True