Changeset d9629c53 in sasview for DataLoader

Timestamp:

Jan 20, 2009 11:24:36 AM (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:

f55af70

Parents:

d1241f5

Message:

Make sure that it is updated

File:

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

DataLoader/manipulations.py

@@ -844 +844 @@
                             continue
                 #In case of one ROI (major only)(i.e.,for 'q' and 'phi')
-                elif run.lower()=='phi':
-                    if q_value<qmin or q_value>qmax:
-                        continue                    
                 else: 
                     if (self.phi_max>=self.phi_min):
@@ -854 +851 @@
                         if (phi_value<self.phi_min and phi_value>self.phi_max):
                             continue   
+                if q_value<qmin or q_value>qmax:
+                        continue                    
+                        
                 if run.lower()=='phi':
                     if temp1<phi_value:
                         temp1=phi_value
                     if temp0>phi_value:
-                        temp0=phi_value                                                                   
+                        temp0=phi_value   
+                                                                                         
                 elif temp<q_value:
                     temp=q_value
+                    
         if run.lower()=='phi':
             self.phi_max=temp1
@@ -939 +941 @@
                         if (phi_value<self.phi_min  or phi_value>self.phi_max):
                             continue
+                            
                     else:
                         if (phi_value<self.phi_min and phi_value>self.phi_max):
@@ -1042 +1045 @@
 
     
-    r = SectorQ(r_min=.000001, r_max=.01, phi_min=0.0, phi_max=math.pi/2.0)
+    r = SectorQ(r_min=.000001, r_max=.01, phi_min=0.0, phi_max=2*math.pi)
     o = r(d)
     
-    s = Ring(r_min=.005, r_max=.01) 
+    s = Ring(r_min=.000001, r_max=.01) 
     p = s(d)