Changeset 0ac3db5 in sasmodels for example/sesansfit.py

Timestamp:

Feb 18, 2015 3:01:46 PM (9 years ago)

Author:

jhbakker

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

a006b63

Parents:

e806077

Message:

SESANSfit now uses sesans_reader dataloader

File:

• example/sesansfit.py (modified) (2 diffs)

example/sesansfit.py

@@ -6 +6 @@
 
 
-radius = 1000
-if False: # fix when data loader exists
-    from sasmodels.dataloader import load_sesans, load_sans
-    data = load_sesans('mydatfile.pz')
-    sans_data = load_sans('mysansfile.xml')
+if True: # fix when data loader exists
+#    from sas.dataloader.readers\
+    from sas.dataloader.loader import Loader
+    loader=Loader()
+    data=loader.load('testsasview1.ses')
+    
+#    data = load_sesans('mydatfile.pz')
+#    sans_data = load_sans('mysansfile.xml')
+
 else:
     SElength = np.linspace(0, 2400, 61) # [A]
@@ -16 +20 @@
     err_data = np.ones_like(SElength)*0.03
 
-    class SesansData:
+    class SESANSData1D:
         #q_zmax = 0.23 # [A^-1]
-        q_zmax = 0.1 # [A^-1]
-        SElength = np.linspace(0, 2400, 61) # [A]
-        Rmax = 3*radius # [A]
-        wavelength = 2e-10 # [m]
+        zacceptance = 0.1 # [A^-1]
+        lam = 2e-10 # [m]
         thickness = 0.2 # [cm]
-        SElength = SElength
-        data = data
-        err_data = err_data
+        x = SElength
+        y = data
+        dy = err_data
     data = SesansData()
+print dir(data)
+
+radius = 1000
+data.Rmax = 3*radius # [A]
 
 phi = Parameter(0.1, name="phi")