Changes in / [0656250:0a33675] in sasmodels

Files:

• example/sesansfit.py (modified) (2 diffs)
• example/testsasview1.ses (deleted)
• sasmodels/bumps_model.py (modified) (1 diff)

example/sesansfit.py

@@ -12 +12 @@
     from sas.dataloader.loader import Loader
     loader=Loader()
-<<<<<<< HEAD
-    data=loader.load('se008724_01.ses')
-#    data=loader.load('testsasview1.ses')
- 
-=======
     filename = 'testsasview1.ses'
     data=loader.load(filename)
     if data is None: raise IOError("Could not load file %r"%(filename,))
     print dir(data), type(data)
->>>>>>> 0a33675f5dfe63dcfc7345913a0bb44858641acc
     data.x /=10
-#    print data
+    
 #    data = load_sesans('mydatfile.pz')
 #    sans_data = load_sans('mysansfile.xml')
@@ -53 +47 @@
 model = bumps_model.BumpsModel(data, kernel,
     scale=phi*(1-phi), sld=7.0, solvent_sld=1.0, radius=radius)
-phi.range(0.001,0.5)
+phi.range(0.001,0.90)
 #model.radius.pmp(40)
-model.radius.range(1,10000)
-#model.sld.pm(5)
+model.radius.range(100,10000)
+#model.sld.pmp(5)
 #model.background
 #model.radius_pd=0

sasmodels/bumps_model.py

@@ -218 +218 @@
     plt.errorbar(data.x, data.y, yerr=data.dy)
     plt.plot(data.x, theory, '-', hold=True)
-    plt.xlabel('spin echo length (nm)')
-    plt.ylabel('polarization (P/P0)')
+    plt.xlabel('spin echo length (A)')
+    plt.ylabel('polarization')
     plt.subplot(122)
     plt.plot(data.x, resid, 'x')
-    plt.xlabel('spin echo length (nm)')
-    plt.ylabel('residuals (P/P0)')
+    plt.xlabel('spin echo length (A)')
+    plt.ylabel('residuals')
 
 def _plot_result2D(data, theory, view):