Changeset 5917637 in sasview for sanscalculator

Timestamp:

Jan 13, 2013 11:22:55 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:

32aba6a

Parents:

3657667

Message:

minor corrections

Location:

sanscalculator

Files:

• src/sans/calculator/sans_gen.py (modified) (4 diffs)
• test/utest_sans_gen.py (modified) (1 diff)

sanscalculator/src/sans/calculator/sans_gen.py

@@ -295 +295 @@
             raise ValueError, msg
         
-    def remove_null_points(self, remove=False):
+    def remove_null_points(self, remove=False, recenter=False):
         """
         Removes any mx, my, and mz = 0 points
@@ -310 +310 @@
                 self.my = self.my[is_nonzero]
                 self.mz = self.mz[is_nonzero]
-        self.pos_x -= (min(self.pos_x) + max(self.pos_x)) / 2.0
-        self.pos_y -= (min(self.pos_y) + max(self.pos_y)) / 2.0
-        self.pos_z -= (min(self.pos_z) + max(self.pos_z)) / 2.0
+        if recenter:
+            self.pos_x -= (min(self.pos_x) + max(self.pos_x)) / 2.0
+            self.pos_y -= (min(self.pos_y) + max(self.pos_y)) / 2.0
+            self.pos_z -= (min(self.pos_z) + max(self.pos_z)) / 2.0
  
     def get_magsld(self):
@@ -542 +543 @@
                 except:
                     pass
-            #print pix_symbol, pos_x
-            pos_x -= (min(pos_x) + max(pos_x)) / 2.0
-            pos_y -= (min(pos_y) + max(pos_y)) / 2.0
-            pos_z -= (min(pos_z) + max(pos_z)) / 2.0
+            #re-centering
+            #pos_x -= (min(pos_x) + max(pos_x)) / 2.0
+            #pos_y -= (min(pos_y) + max(pos_y)) / 2.0
+            #pos_z -= (min(pos_z) + max(pos_z)) / 2.0
 
             output = MagSLD(pos_x, pos_y, pos_z, sld_n, sld_mx, sld_my, sld_mz)
@@ -645 +646 @@
                         # Skip non-data lines
                         pass
-                 
-            pos_x -= (min(pos_x) + max(pos_x)) / 2.0
-            pos_y -= (min(pos_y) + max(pos_y)) / 2.0
-            pos_z -= (min(pos_z) + max(pos_z)) / 2.0
+            
+            # re-center     
+            #pos_x -= (min(pos_x) + max(pos_x)) / 2.0
+            #pos_y -= (min(pos_y) + max(pos_y)) / 2.0
+            #pos_z -= (min(pos_z) + max(pos_z)) / 2.0
 
             output = MagSLD(pos_x, pos_y, pos_z, sld_n, 

sanscalculator/test/utest_sans_gen.py

@@ -49 +49 @@
         self.assertEqual(f.my[0], 0)
         self.assertEqual(f.mz[0], 0)
-        self.assertEqual(output.pos_x[0], -390.0)
-        self.assertEqual(output.pos_y[0], -390.0)
-        self.assertEqual(output.pos_z[0], -90.0)
+        self.assertEqual(output.pos_x[0], 0.0)
+        self.assertEqual(output.pos_y[0], 0.0)
+        self.assertEqual(output.pos_z[0], 0.0)
 
 """