Changeset 5c2932a in sasview for sanscalculator/src

Timestamp:

Jan 14, 2013 8:47:24 AM (12 years ago)

Author:

Jae Cho <jhjcho@…>

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:

cd89c6f

Parents:

32aba6a

Message:

fixes for making the default ellipsoid

File:

• sanscalculator/src/sans/calculator/sans_gen.py (modified) (1 diff)

sanscalculator/src/sans/calculator/sans_gen.py

@@ -241 +241 @@
         
         self._check_data_length(length)
-        self.remove_null_points()
+        self.remove_null_points(False, False)
         mask = numpy.ones(len(self.sld_n), dtype=bool)
-        if shape == 'ellipsoid':
+        if shape.lower() == 'ellipsoid':
             try:
                 # Pixel (step) size included
-                x_r = (max(self.pos_x) - min(self.pos_x) + \
-                       omfdata.xstepsize) / 2.0
-                y_r = (max(self.pos_y) - min(self.pos_y) + \
-                       omfdata.ystepsize) / 2.0
-                z_r = (max(self.pos_z) - min(self.pos_z) + \
-                       omfdata.zstepsize) / 2.0
-                x_dir2 = (self.pos_x / x_r) * (self.pos_x / x_r)
-                y_dir2 = (self.pos_y / y_r) * (self.pos_y / y_r)
-                z_dir2 = (self.pos_z / z_r) * (self.pos_z / z_r)
-                mask = (x_dir2 + y_dir2 + z_dir2) <= 1
+                x_c = max(self.pos_x) + min(self.pos_x)
+                y_c = max(self.pos_y) + min(self.pos_y)
+                z_c = max(self.pos_z) + min(self.pos_z)
+                x_d = max(self.pos_x) - min(self.pos_x)
+                y_d = max(self.pos_y) - min(self.pos_y)
+                z_d = max(self.pos_z) - min(self.pos_z)
+                x_r = (x_d + omfdata.xstepsize) / 2.0
+                y_r = (y_d + omfdata.ystepsize) / 2.0
+                z_r = (z_d + omfdata.zstepsize) / 2.0
+                x_dir2 = ((self.pos_x - x_c / 2.0) / x_r)
+                x_dir2 *= x_dir2
+                y_dir2 = ((self.pos_y - y_c / 2.0) / y_r)
+                y_dir2 *= y_dir2
+                z_dir2 = ((self.pos_z - z_c / 2.0) / z_r)
+                z_dir2 *= z_dir2
+                mask = (x_dir2 + y_dir2 + z_dir2) <= 1.0
             except:
                 pass