Changeset 3c903ea in sasview for src/sas/sascalc/data_util

Timestamp:

Apr 6, 2017 4:36:51 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

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

Children:

d01b55c

Parents:

d3bce8c (diff), 5e2f36c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of github.com:SasView/sasview

Location:

src/sas/sascalc/data_util

Files:

• calcthread.py (modified) (3 diffs)
• qsmearing.py (modified) (1 diff)

src/sas/sascalc/data_util/calcthread.py

@@ -8 +8 @@
 import traceback
 import sys
+import logging
 
 if sys.platform.count("darwin") > 0:
@@ -21 +22 @@
     from time import clock
     from time import sleep
+
+logger = logging.getLogger(__name__)
 
 
@@ -243 +246 @@
             except Exception:
                 pass
-        import logging
-        logging.error(traceback.format_exc())
+        logger.error(traceback.format_exc())
         #print 'CalcThread exception',
 

src/sas/sascalc/data_util/qsmearing.py

@@ -67 +67 @@
     if _found_sesans == True:
         #Pre-compute the Hankel matrix (H)
-        qmax, qunits = data.sample.zacceptance
         SElength = Converter(data._xunit)(data.x, "A")
-        zaccept = Converter(qunits)(qmax, "1/A"),
+
+        theta_max = Converter("radians")(data.sample.zacceptance)[0]
+        q_max = 2 * np.pi / np.max(data.source.wavelength) * np.sin(theta_max)
+        zaccept = Converter("1/A")(q_max, "1/" + data.source.wavelength_unit),
+
         Rmax = 10000000
         hankel = SesansTransform(data.x, SElength, zaccept, Rmax)