Changeset 0ac6e11 in sasview


Ignore:
Timestamp:
Apr 5, 2017 1:03:41 PM (8 months ago)
Author:
Adam Washington <adam.washington@…>
Branches:
master, ESS_GUI, ESS_GUI_CategroyManager, ESS_GUI_Pr, ESS_GUI_cns, ESS_GUI_corf, ESS_GUI_py2_OLD, SVCC-1, SasView-664, costrafo411, docs, ticket-873, ticket-976, ticket-993, unittest-saveload
Children:
747334d
Parents:
610af69
Message:

Start fixing sesans smearing for time of flight

Location:
src/sas/sascalc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/data_util/qsmearing.py

    r610af69 r0ac6e11  
    6767    if _found_sesans == True: 
    6868        #Pre-compute the Hankel matrix (H) 
    69         qmax, qunits = data.sample.zacceptance 
    7069        SElength = Converter(data._xunit)(data.x, "A") 
    71         zaccept = Converter(qunits)(qmax, "radians"), 
     70 
     71        theta_max = Converter("radians")(data.sample.zacceptance)[0] 
     72        q_max = 2 * np.pi / np.max(data.source.wavelength) * np.sin(theta_max) 
     73        zaccept = Converter("1/A")(q_max, "1/" + data.source.wavelength_unit), 
     74 
    7275        Rmax = 10000000 
    7376        hankel = SesansTransform(data.x, SElength, zaccept, Rmax) 
  • src/sas/sascalc/dataloader/readers/sesans_reader.py

    r2b310602 r0ac6e11  
    66    Jurrian Bakker 
    77""" 
     8import logging 
    89import numpy as np 
    910import os 
     
    9192            output.y_unit = y_unit 
    9293            output.x_unit = x_unit 
     94            output.source.wavelength_unit = lam_unit 
     95            output.source.wavelength = lam 
    9396            self.filename = output.filename = basename 
    9497            output.xaxis(r"\rm{z}", x_unit) 
Note: See TracChangeset for help on using the changeset viewer.