Changeset 0444c02 in sasmodels

Timestamp:

Oct 8, 2016 2:36:11 PM (8 years ago)

Author:

jhbakker

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

0ae0f9a

Parents:

b3f2a24

Message:

Changes for SESANS integration, next is merge with ajj_sesans

Location:

sasmodels

Files:

• direct_model.py (modified) (2 diffs)
• resolution.py (modified) (1 diff)
• sesans.py (modified) (2 diffs)

sasmodels/direct_model.py

@@ -31 +31 @@
 from . import resolution2d
 from .details import make_kernel_args, dispersion_mesh
+from sas.sasgui.perspectives.fitting.fitpage import FitPage
 
 try:
@@ -193 +194 @@
         # interpret data
         if hasattr(data, 'lam'):
+        #if not FitPage.no_transform.GetValue(): #if the no_transform radio button is not active DOES NOT WORK! not active before fitting
             self.data_type = 'sesans'
         elif hasattr(data, 'qx_data'):

sasmodels/resolution.py

@@ -42 +42 @@
         """
         raise NotImplementedError("Subclass does not define the apply function")
-
 
 class Perfect1D(Resolution):

sasmodels/sesans.py

@@ -15 +15 @@
 from numpy import pi, exp  # type: ignore
 from scipy.special import jv as besselj
+from sas.sasgui.perspectives.fitting.fitpage import FitPage
 #import direct_model.DataMixin as model
         
@@ -61 +62 @@
     """
     nqmono = len(qmono)
-    if nqmono == 0:
+    #if nqmono == 0 # if radiobutton hankel is active
+    if FitPage.hankel.GetValue():
         result = call_hankel(data, q_calc, Iq_calc)
     elif nqmono == 1:
         q = qmono[0]
         result = call_HankelAccept(data, q_calc, Iq_calc, q, Iq_mono)
-    else:
+    else: #if radiobutton Cosine is active
         Qx, Qy = [qmono[0], qmono[1]]
         Qx = np.reshape(Qx, nqx, nqy)