Changeset 21d2eb0 in sasview

Timestamp:

Mar 10, 2009 2:46:08 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:

bc3dd65d

Parents:

0ec0405

Message:

FIxed the conditional selection of q smearer that was not properly working

File:

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

DataLoader/qsmearing.py

@@ -33 +33 @@
     # Sanity check. If we are not dealing with a SANS Data1D
     # object, just return None
-    if data1D.__class__.__name__ != 'Data1D' \
-        or not hasattr(data1D, "dxl") or not hasattr(data1D, "dxw"):
+    if  data1D.__class__.__name__ != 'Data1D':
+        return None
+    
+    if  not hasattr(data1D, "dx") and not hasattr(data1D, "dxl") and not hasattr(data1D, "dxw"):
         return None
     
@@ -44 +46 @@
         if data1D.dx[0]>0.0:
             _found_resolution = True
-        
+            print "_found_resolution",_found_resolution
     # If we found resolution smearing data, return a QSmearer
     if _found_resolution == True: