Changeset 2a2b43a in sasview

Timestamp:

Feb 2, 2017 6:17:46 AM (8 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:

• sasview/test/sesans_data/sphere2micron.ses (added)
• sasview/test/sesans_data/spheres2micron.ses (deleted)
• src/sas/sascalc/data_util/qsmearing.py (modified) (2 diffs)

src/sas/sascalc/data_util/qsmearing.py

@@ -68 +68 @@
         #Pre-compute the Hankel matrix (H)
         qmax, qunits = data.sample.zacceptance
-        hankel = sesans.SesansTransform()
-        sesans.SesansTransform.set_transform(hankel,
-        SE = Converter(data._xunit)(data.x, "A"),
-        zaccept = Converter(qunits)(qmax, "1/A"),
-        Rmax = 10000000)
+        hankel = sesans.SesansTransform(SE=Converter(data._xunit)(data.x, "A"),
+                                        zaccept=Converter(qunits)(qmax, "1/A"),
+                                        Rmax=10000000)
         # Then return the actual transform, as if it were a smearing function
-        return PySmear(SESANS1D(data, hankel._H0, hankel._H, hankel.q), model)
+        return PySmear(SESANS1D(data, hankel.H0, hankel.H, hankel.q), model)
 
     _found_resolution = False
@@ -122 +120 @@
 
         if hasattr(self.resolution, 'data'):
-            if self.resolution.data.meta_data['loader'] == 'SESANS':  # Always True if file extension is '.ses'!
+            #if self.resolution.data.meta_data['loader'] == 'SESANS':  # Always True if file extension is '.ses'!
+            if self.resolution.data.isSesans:
                 self.offset = 0
             # This is default behaviour, for future resolution/transform functions this needs to be revisited.