Changeset 2cdc35b in sasmodels for sasmodels/direct_model.py

Timestamp:

Apr 11, 2017 11:44:18 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

costrafo411

Children:

2f9f1ec

Parents:

7c1cce3

Message:

provide working oriented/unoriented sesans examples

File:

• sasmodels/direct_model.py (modified) (7 diffs)

sasmodels/direct_model.py

@@ -202 +202 @@
 
         if self.data_type == 'sesans':
-            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
+            from sas.sascalc.data_util.nxsunit import Converter
+            qmax, qunits = data.sample.zacceptance
+            SElength = Converter(data._xunit)(data.x, "A")
+            zaccept = Converter(qunits)(qmax, "1/A"),
+            Rmax = 10000000
+            index = slice(None, None)  # equivalent to index [:]
+            Iq = data.y[index]
+            dIq = data.dy[index]
+            oriented = getattr(data, 'oriented', False)
+            if oriented:
+                res = sesans.OrientedSesansTransform(data.x[index], SElength, zaccept, Rmax)
+                # Oriented sesans transform produces q_calc = [qx, qy]
+                q_vectors = res.q_calc
             else:
-                Iq, dIq = None, None
-            #self._theory = np.zeros_like(q)
-            q_vectors = [q]
-            q_mono = sesans.make_all_q(data)
+                res = sesans.SesansTransform(data.x[index], SElength, zaccept, Rmax)
+                # Unoriented sesans transform produces q_calc = q
+                q_vectors = [res.q_calc]
         elif self.data_type == 'Iqxy':
             #if not model.info.parameters.has_2d:
@@ -230 +237 @@
             #self._theory = np.zeros_like(self.Iq)
             q_vectors = res.q_calc
-            q_mono = []
         elif self.data_type == 'Iq':
             index = (data.x >= data.qmin) & (data.x <= data.qmax)
@@ -255 +261 @@
             #self._theory = np.zeros_like(self.Iq)
             q_vectors = [res.q_calc]
-            q_mono = []
         elif self.data_type == 'Iq-oriented':
             index = (data.x >= data.qmin) & (data.x <= data.qmax)
@@ -272 +277 @@
                                       qy_width=data.dxl[index])
             q_vectors = res.q_calc
-            q_mono = []
         else:
             raise ValueError("Unknown data type") # never gets here
@@ -279 +283 @@
         # so we can save/restore state
         self._kernel_inputs = q_vectors
-        self._kernel_mono_inputs = q_mono
         self._kernel = None
         self.Iq, self.dIq, self.index = Iq, dIq, index
@@ -306 +309 @@
         if self._kernel is None:
             self._kernel = self._model.make_kernel(self._kernel_inputs)
-            self._kernel_mono = (
-                self._model.make_kernel(self._kernel_mono_inputs)
-                if self._kernel_mono_inputs else None)
 
         Iq_calc = call_kernel(self._kernel, pars, cutoff=cutoff)
@@ -316 +316 @@
         # TODO: refactor so we don't store the result in the model
         self.Iq_calc = None
-        if self.data_type == 'sesans':
-            Iq_mono = (call_kernel(self._kernel_mono, pars, mono=True)
-                       if self._kernel_mono_inputs else None)
-            result = sesans.transform(self._data,
-                                      self._kernel_inputs[0], Iq_calc,
-                                      self._kernel_mono_inputs, Iq_mono)
-        else:
-            result = self.resolution.apply(Iq_calc)
-            if hasattr(self.resolution, 'nx'):
-                self.Iq_calc = (
-                    self.resolution.qx_calc, self.resolution.qy_calc,
-                    np.reshape(Iq_calc, (self.resolution.ny, self.resolution.nx))
-                )
+        result = self.resolution.apply(Iq_calc)
+        if hasattr(self.resolution, 'nx'):
+            self.Iq_calc = (
+                self.resolution.qx_calc, self.resolution.qy_calc,
+                np.reshape(Iq_calc, (self.resolution.ny, self.resolution.nx))
+            )
         return result