Changeset 87b9447 in sasview for src/sas/sascalc/data_util

Timestamp:

Oct 5, 2016 7:21:51 PM (8 years ago)

Author:

ajj

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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

24f6f4a

Parents:

44c0746

Message:

first attempt at using hankel transform as resolution function (not working)

File:

• src/sas/sascalc/data_util/qsmearing.py (modified) (2 diffs)

src/sas/sascalc/data_util/qsmearing.py

@@ -48 +48 @@
         return None
 
+    # Look for sesans
+    _found_sesans = False
+    if hasattr(data,'lam') :
+        _found_sesans = True
+        logging.info("Found SESANS data!!")
+
+    # If we found sesans data, do the necessary jiggery pokery
+    if _found_sesans == True:
+        return sesans_smear(data, model)
+
     # Look for resolution smearing data
     _found_resolution = False
@@ -83 +93 @@
     if _found_slit == True:
         return slit_smear(data, model)
-
-    # Look for sesans
-    _found_sesans = False
-    if data.hasattr(lam):
-        _found_sesans = True
-        logging.info("Found SESANS data!!")
-
-    # If we found sesans data, do the necessary jiggery pokery
-    if _found_sesans == True:
-        return sesans_smear(data, model)
 
     return None