Changeset 2a2b43a in sasview


Ignore:
Timestamp:
Feb 2, 2017 8:17:46 AM (6 years ago)
Author:
jhbakker
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:
ad4632c
Parents:
18501795
Message:

hankel simplified, set_transform is now init,sesans test data is in
sasview/test

Files:
1 added
1 deleted
1 edited

Legend:

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

    ra9f579c r2a2b43a  
    6868        #Pre-compute the Hankel matrix (H) 
    6969        qmax, qunits = data.sample.zacceptance 
    70         hankel = sesans.SesansTransform() 
    71         sesans.SesansTransform.set_transform(hankel, 
    72         SE = Converter(data._xunit)(data.x, "A"), 
    73         zaccept = Converter(qunits)(qmax, "1/A"), 
    74         Rmax = 10000000) 
     70        hankel = sesans.SesansTransform(SE=Converter(data._xunit)(data.x, "A"), 
     71                                        zaccept=Converter(qunits)(qmax, "1/A"), 
     72                                        Rmax=10000000) 
    7573        # Then return the actual transform, as if it were a smearing function 
    76         return PySmear(SESANS1D(data, hankel._H0, hankel._H, hankel.q), model) 
     74        return PySmear(SESANS1D(data, hankel.H0, hankel.H, hankel.q), model) 
    7775 
    7876    _found_resolution = False 
     
    122120 
    123121        if hasattr(self.resolution, 'data'): 
    124             if self.resolution.data.meta_data['loader'] == 'SESANS':  # Always True if file extension is '.ses'! 
     122            #if self.resolution.data.meta_data['loader'] == 'SESANS':  # Always True if file extension is '.ses'! 
     123            if self.resolution.data.isSesans: 
    125124                self.offset = 0 
    126125            # This is default behaviour, for future resolution/transform functions this needs to be revisited. 
Note: See TracChangeset for help on using the changeset viewer.