Changeset 29f5536 in sasmodels

Timestamp:

Feb 19, 2015 5:25:48 PM (9 years ago)

Author:

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:

1ed9e3f

Parents:

261658d

Message:

show log error in compare

Files:

• compare.py (modified) (4 diffs)
• sasmodels/bumps_model.py (modified) (1 diff)

compare.py

@@ -163 +163 @@
                       if len(split) == 2)
     # Sort out data
-    qmax = 1.0 if '-highq' in opts else (0.2 if '-midq' in opts else 0.05)
+    qmax = 10.0 if '-exq' in opts else 1.0 if '-highq' in opts else 0.2 if '-midq' in opts else 0.05
     Nq = int(opt_values.get('-Nq', '128'))
     is2D = not "-1d" in opts
@@ -225 +225 @@
         plot_data(data, cpu, scale='log')
         plt.title("%s t=%.1f ms"%(comp,cpu_time))
+        cbar_title = "log I"
     if Nocl > 0:
         if Ncpu > 0: plt.subplot(132)
         plot_data(data, ocl, scale='log')
         plt.title("opencl t=%.1f ms"%ocl_time)
+        cbar_title = "log I"
     if Ncpu > 0 and Nocl > 0:
         plt.subplot(133)
-        err = resid if '-abs' in opts else relerr
-        errstr = "abs err" if '-abs' in opts else "rel err"
+        if '-abs' in opts:
+            err,errstr = resid, "abs err"
+        else:
+            err,errstr = relerr, "rel err"
         #err,errstr = ocl/cpu,"ratio"
-        plot_data(data, err, scale='linear')
+        plot_data(data, err, scale='log') #'linear')
         plt.title("max %s = %.3g"%(errstr, max(abs(err[index]))))
-    if is2D: plt.colorbar()
+        cbar_title = "log "+errstr
+    if is2D:
+        h = plt.colorbar()
+        h.ax.set_title(cbar_title)
 
     if Ncpu > 0 and Nocl > 0 and '-hist' in opts:
@@ -265 +272 @@
     -plot*/-noplot plots or suppress the plot of the model
     -single*/-double uses double precision for comparison
-    -lowq*/-midq/-highq use q values up to 0.05, 0.2 or 1.0
+    -lowq*/-midq/-highq/-exq use q values up to 0.05, 0.2, 1.0, 10.0
     -Nq=128 sets the number of Q points in the data set
     -1d/-2d* computes 1d or 2d data
@@ -287 +294 @@
     'plot','noplot',
     'single','double',
-    'lowq','midq','highq',
+    'lowq','midq','highq','exq',
     '2d','1d',
     'preset','random',

sasmodels/bumps_model.py

@@ -165 +165 @@
     import matplotlib.pyplot as plt
     if hasattr(data, 'qx_data'):
-        iq = iq[:]
+        iq = iq+0
         valid = np.isfinite(iq)
         if scale == 'log':