Changeset a86e249 in sasmodels

Timestamp:

Apr 8, 2017 9:11:29 AM (8 years ago)

Author:

jhbakker

Branches:

costrafo411

Children:

7c1cce3

Parents:

e4e5e29

Message:

isgood

Files:

• example/6pc SD.txt (added)
• example/Beise009798_01.ses (added)
• example/Beise009798_02.ses (added)
• example/Beise009798_03.ses (added)
• example/Gab_5pc_deb2p0.ses (added)
• example/Gab_5pc_deb2p0.txt (added)
• sasmodels/sesans.py (modified) (2 diffs)
• sasmodels/sesanscos.py (added)
• sasmodels/sesanscosine.py (added)

sasmodels/sesans.py

@@ -45 +45 @@
         #import logging; logging.info("creating SESANS transform")
         self.q = z
-        # isoriented flag determines whether data is from an oriented sample or not, should be in the data or selectable in GUI.
-        #if self.isoriented==False
-        self._set_hankel(SElength, zaccept, Rmax)
-        #if self.isoriented==True
-        self._set_cosmat(SElength, zaccept, Rmax)
+        # isoriented flag determines whether data is from an oriented sample or not, should be a selection variable upon entering SESANS data.
+        if self.isoriented==False:
+            self._set_hankel(SElength, zaccept, Rmax)
+        if self.isoriented==True:
+            self._set_cosmat(SElength, zaccept, Rmax)
 
     def apply(self, Iq):
-        if len(Iq.size) == 1: # if isotropic, do Hankel transform
-            # type: (np.ndarray) -> np.ndarray
+        try:
             G0 = np.dot(self._H0, Iq)
             G = np.dot(self._H.T, Iq)
             P = G - G0
-        elif len(Iq.size) == 2:
-            dq=self.q_calc[0]
-            G0 = sum(np.dot(self._cos0, Iq)*dq)
-            G = sum(np.dot(self._cosmat.T, Iq)*dq)
-            P = G - G0
+        except:
+            try:
+                dq = self.q_calc[0]
+                G0 = sum(np.dot(self._cos0, Iq) * dq)
+                G = sum(np.dot(self._cosmat.T, Iq) * dq)
+                P = G - G0
+            except:
+                raise ValueError('Sesanstransform.apply cannot generate either a Hankel transform or a cosine transform of you SESANS data')
         return P
 
@@ -88 +90 @@
         # Force float32 arrays, otherwise run into memory problems on some machines
         SElength = np.asarray(SElength, dtype='float32')
-        #qymax and qzmax depend on detector shape
-        qzmax=
+
         # Rmax = #value in text box somewhere in FitPage?
         q_max = 2 * pi / (SElength[1] - SElength[0])