Changeset 1c5b068 in sasview

Timestamp:

Dec 22, 2008 9:54:11 AM (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:

3426077

Parents:

2e10b70

Message:

model 2d plotted

File:

• sansview/perspectives/fitting/fitting.py (modified) (2 diffs)

sansview/perspectives/fitting/fitting.py

@@ -650 +650 @@
         y = numpy.arange(qmin,qmax,qstep)
         lx = len(x)
+        #print x
         data=numpy.zeros([len(x),len(y)])
         if enable2D:
-            """
-            for i_x in range(int(len(x)/2)):
-                if i_x%2==1:
-                    continue
-            for i_y in range(len(y)):
-                try:
-                    value = model.runXY([x[i_x], y[i_y]])
-                    #output[i_x][i_y] = value
-                    #output[lx-i_x-1][lx-i_y-1] = value
-                    data[i_y][i_x] = value
-                    data[lx-i_y-1][lx-i_x-1] = value
-                except:
-                     wx.PostEvent(self.parent, StatusEvent(status="\
-                        Error computing %s at [%g,%g] :%s" %(model.name,x[i_x],y[i_y], sys.exc_value)))
-                    
-            if lx%2==1:
-                i_x = int(len(x)/2)
+           
+            #for i_x in range(int(len(x)/2)):
+            for i_x in range(int(len(x))):
                 for i_y in range(len(y)):
                     try:
                         value = model.runXY([x[i_x],y[i_y]])
-                        #output[i_x][i_y] = value
                         data[i_y][i_x] = value
                     except:
@@ -678 +664 @@
                         Error computing %s at [%g,%g] :%s" %(model.name,x[i_x],y[i_y], sys.exc_value)))
                        
-            """
-            for i_x in range(int(len(x)/2)):
-                """
-                if not i_x%2==1:
-                    continue
-                """
-                for i_y in range(len(y)):
-                    try:
-                        value = model.runXY([x[i_x],y[i_y]])
-                        #output[i_x][i_y] = value
-                        #output[lx-i_x-1][lx-i_y-1] = value
-                        data[i_y][i_x] = value
-                        data[lx-i_y-1][lx-i_x-1] = value
-                    except:
-                         wx.PostEvent(self.parent, StatusEvent(status="\
-                        Error computing %s at [%g,%g] :%s" %(model.name,x[i_x],y[i_y], sys.exc_value)))
-                       
-          
-                
             theory= Data2D(data)
             theory.name= model.name