Changeset 0ac6e11 in sasview for src/sas/sascalc

Timestamp:

Apr 5, 2017 1:03:41 PM (8 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:

747334d

Parents:

610af69

Message:

Start fixing sesans smearing for time of flight

Location:

src/sas/sascalc

Files:

• data_util/qsmearing.py (modified) (1 diff)
• dataloader/readers/sesans_reader.py (modified) (2 diffs)

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, "radians"),
+
+        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)

src/sas/sascalc/dataloader/readers/sesans_reader.py

@@ -6 +6 @@
     Jurrian Bakker
 """
+import logging
 import numpy as np
 import os
@@ -91 +92 @@
             output.y_unit = y_unit
             output.x_unit = x_unit
+            output.source.wavelength_unit = lam_unit
+            output.source.wavelength = lam
             self.filename = output.filename = basename
             output.xaxis(r"\rm{z}", x_unit)