Changeset 44c0746 in sasview

Timestamp:

Oct 5, 2016 7:05:24 PM (8 years ago)

Author:

ajj

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:

87b9447

Parents:

b9c94fa

Message:

interim commit to deal with git annoyance

File:

• src/sas/sascalc/data_util/qsmearing.py (modified) (3 diffs)

src/sas/sascalc/data_util/qsmearing.py

@@ -5 +5 @@
 #This software was developed by the University of Tennessee as part of the
 #Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#project funded by the US National Science Foundation. 
+#project funded by the US National Science Foundation.
 #See the license text in license.txt
 #copyright 2008, University of Tennessee
@@ -16 +16 @@
 from sasmodels.resolution import Slit1D, Pinhole1D
 from sasmodels.resolution2d import Pinhole2D
+from sasmodels import sesans
 
 def smear_selection(data, model = None):
@@ -82 +83 @@
     if _found_slit == True:
         return slit_smear(data, model)
+
+    # Look for sesans
+    _found_sesans = False
+    if data.hasattr(lam):
+        _found_sesans = True
+        logging.info("Found SESANS data!!")
+
+    # If we found sesans data, do the necessary jiggery pokery
+    if _found_sesans == True:
+        return sesans_smear(data, model)
+
     return None
+
+def sesans_smear(data, model=None):
+    q = sesans.make_q(data.sample.zacceptance, data.Rmax)
+    index = slice(None, None)
+    res = None
+    if data.y is not None:
+        Iq, dIq = data.y, data.dy
+    else:
+        Iq, dIq = None, None
+    #self._theory = np.zeros_like(q)
+    q_vectors = [q]
+    q_mono = sesans.make_all_q(data)
+    Iq = model.evalDistribution(q_mono)
+
+    return sesans.transform(data, q, Iq, 0, 0)