Changeset d16e396 in sasview

Timestamp:

Mar 30, 2009 2:34:50 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:

87b0d78

Parents:

c9a4377

Message:

cal2d range fixed

File:

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

sansview/perspectives/fitting/model_thread.py

@@ -2 +2 @@
 from calcthread import CalcThread
 import sys
-import numpy
+import numpy,math
 
 class Calc2D_all(CalcThread):
@@ -119 +119 @@
         
         self.starttime = time.time()
-        
         lx = len(self.x)
         for i_x in range(len(self.x)):
@@ -127 +126 @@
        
             for i_y in range(int(len(self.y))):
-                radius = self.x[i_x]*self.x[i_x]+self.y[i_y]*self.y[i_y]
+                radius = math.sqrt(self.x[i_x]*self.x[i_x]+self.y[i_y]*self.y[i_y])
                 
                 if  self.qmin <= radius and radius<= self.qmax: