Changeset 5134b2c in sasmodels

Timestamp:

Feb 24, 2015 2:04:29 PM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

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:

8b81801

Parents:

02dfcab

Message:

fix compare plots so they show both positive and negative error

Files:

• compare.py (modified) (1 diff)
• compare.sh (modified) (1 diff, 1 prop)
• compare_all.sh (modified) (1 diff)
• sasmodels/bumps_model.py (modified) (1 diff)

compare.py

@@ -234 +234 @@
         plt.subplot(133)
         if '-abs' in opts:
-            err,errstr = resid, "abs err"
+            err,errstr,scale = resid, "abs err", "linear"
         else:
-            err,errstr = relerr, "rel err"
+            err,errstr,scale = abs(relerr), "rel err", "log"
         #err,errstr = ocl/cpu,"ratio"
-        plot_data(data, err, scale='log') #'linear')
+        plot_data(data, err, scale=scale)
         plt.title("max %s = %.3g"%(errstr, max(abs(err[index]))))
-        cbar_title = "log "+errstr
+        cbar_title = errstr if scale=="linear" else "log "+errstr
     if is2D:
         h = plt.colorbar()

compare.sh

@@ -5 +5 @@
 #PYOPENCL_CTX=${CTX:-1}
 PYTHONPATH=../bumps:../periodictable:$SASVIEW
-export PYOPENCL_CTX PYTHONPATH
+export PYTHONPATH
 
-echo PYTHONPATH=$PYTHONPATH
 set -x
 

compare_all.sh

@@ -2 +2 @@
 
 SASVIEW=$(ls -d ../sasview/build/lib.*)
-PYOPENCL_CTX=1
 PYTHONPATH=../bumps:../periodictable:$SASVIEW
-export PYOPENCL_CTX PYTHONPATH
+export PYTHONPATH
 
 echo PYTHONPATH=$PYTHONPATH

sasmodels/bumps_model.py

@@ -175 +175 @@
         xmin, xmax = min(data.qx_data), max(data.qx_data)
         ymin, ymax = min(data.qy_data), max(data.qy_data)
-        if vmin is None: vmin = iq[valid&~data.mask].min()
-        if vmax is None: vmax = iq[valid&~data.mask].max()
+        try:
+            if vmin is None: vmin = iq[valid&~data.mask].min()
+            if vmax is None: vmax = iq[valid&~data.mask].max()
+        except:
+            vmin, vmax = 0, 1
         plt.imshow(plottable.reshape(128,128),
                    interpolation='nearest', aspect=1, origin='upper',