Changeset 8d36420 in sasview for DataLoader

Timestamp:

Feb 27, 2009 3:22:37 PM (16 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:

adde6e3

Parents:

7d680c7

Message:

removed error on center_x and center_y

File:

• DataLoader/manipulations.py (modified) (2 diffs)

DataLoader/manipulations.py

@@ -878 +878 @@
                         if((phi_value>tmp_max and phi_value<tmp_min+math.pi)or (phi_value>tmp_max-math.pi and phi_value<tmp_min)):
                             continue
-                #In case of one ROI (major only)(i.e.,for 'q' and 'phi')
-                else: 
+                #In case of one ROI (major only)(i.e.,for 'q')and do nothing for 'phi'.
+                elif run.lower()=='q': 
                     if (self.phi_max>=self.phi_min):
                         if (phi_value<self.phi_min  or phi_value>self.phi_max):
@@ -903 +903 @@
         else:
             qmax=temp
-                 
+        #Beam center is already corrected, but the calculation below assumed it was not.
+        # Thus Beam center shifted back to uncorrected value. ToDo: cleanup this codes.
+        center_x=center_x+0.5 
+        center_y=center_y+0.5         
         for i in range(numpy.size(data,1)):
             dx = pixel_width_x*(i+0.5 - center_x)