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

Timestamp:

Jan 13, 2009 5:52:02 PM (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:

e8d1066

Parents:

e4032d64

Message:

model page change on interface

File:

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

sansview/perspectives/fitting/model_thread.py

@@ -125 +125 @@
         y = self.y
         output = numpy.zeros((len(x),len(y)))
+        """
         if self.qmin *self.qmax >=0:
             print "same signe plotting"
@@ -134 +135 @@
                 center_y= (self.qmax -self.qmin)/2
         else:
-            center_x=0
-            center_y=0
+        """
+        center_x=0
+        center_y=0
         #print "center_x , center_y",center_x , center_y
         #print "x ",len(x)
@@ -143 +145 @@
         lx = len(self.x)
        
-        for i_x in range(int(len(self.x)/2)+1):
-           
-            # Check whether we need to bail out
-            self.update(output=output)
-            self.isquit()
-            
-            for i_y in range(int(len(self.y)/2)+1):
+        for i_x in range(len(self.x)):
+           
+            # Check whether we need to bail out
+            self.update(output=output)
+            self.isquit()
+            
+            for i_y in range(int(len(self.y))):
                 try:
-                    value1 = self.model.runXY([self.x[i_x]-center_x, self.y[i_y]-center_y])
-                    value2 = self.model.runXY([self.x[i_x]-center_x, self.y[lx-i_y-1]-center_y])
-                    value3 = self.model.runXY([self.x[lx-i_x-1]-center_x, self.y[i_y]-center_y])
-                    value4 = self.model.runXY([self.x[lx-i_x-1]-center_x, self.y[lx-i_y-1]-center_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
+                         
+                    else:
+                        value1 = self.model.runXY([self.x[i_x]-center_x, self.y[i_y]-center_y])
+                       
+                        
+                        output[i_x] [i_y]=value1 
+                       
                     
-                    output[i_x] [i_y]=value1 
-                    output[lx-i_x-1][lx-i_y-1] =value4 
-                    output[i_x] [lx-i_y-1]= value2 
-                    output[lx-i_x-1][i_y] = value3 
-                    
-                  
                 except:
                      wx.PostEvent(self.parent, StatusEvent(status=\