Changeset ba69383 in sasmodels

Timestamp:

Oct 31, 2014 4:44:17 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:

31819c5

Parents:

ef2861b

Message:

add relerr histogram to compare

Files:

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

compare.py

@@ -89 +89 @@
 
 def compare(name, pars, Ncpu, Ngpu, opts, set_pars):
-
     # Sort out data
     qmax = 1.0 if '-highq' in opts else (0.2 if '-midq' in opts else 0.05)
@@ -180 +179 @@
         resid[index] = (gpu - cpu)[index]
         relerr[index] = resid[index]/cpu[index]
+        #bad = (relerr>1e-4)
+        #print relerr[bad],cpu[bad],gpu[bad],data.qx_data[bad],data.qy_data[bad]
         print "max(|ocl-%s|)"%comp, max(abs(resid[index]))
-        print "max(|(ocl-%s)/ocl|)"%comp, max(abs(relerr[index]))
+        print "max(|(ocl-%s)/%s|)"%(comp,comp), max(abs(relerr[index]))
+        p98 = int(len(relerr[index])*0.98)
+        print "98%% (|(ocl-%s)/%s|) <"%(comp,comp), np.sort(abs(relerr[index]))[p98]
+
 
     # Plot if requested
@@ -201 +205 @@
         plot_data(data, err, scale='linear')
         plt.title("max %s = %.3g"%(errstr, max(abs(err[index]))))
-        if is2D: plt.colorbar()
+    if is2D: plt.colorbar()
+
+    if Ncpu > 0 and Ngpu > 0 and '-hist' in opts:
+        plt.figure()
+        v = relerr[index]
+        v[v==0] = 0.5*np.min(np.abs(v[v!=0]))
+        plt.hist(np.log10(np.abs(v)), normed=1, bins=50);
+        plt.xlabel('log10(err), err = | F(q) single - F(q) double| / | F(q) double |');
+        plt.ylabel('P(err)')
+        plt.title('Comparison of single and double precision models for %s'%name)
+
     plt.show()
 
@@ -228 +242 @@
     -pars/-nopars* prints the parameter set or not
     -abs/-rel* plot relative or absolute error
+    -hist/-nohist* plot histogram of relative error
 
 Key=value pairs allow you to set specific values to any of the model
@@ -247 +262 @@
     'nopars','pars',
     'rel','abs',
+    'hist','nohist',
     ]
 
@@ -272 +288 @@
     name, pars = MODELS[args[0]]()
     Nopencl = int(args[1]) if len(args) > 1 else 5
-    Nsasview = int(args[2]) if len(args) > 3 else 1
+    Nsasview = int(args[2]) if len(args) > 2 else 1
 
     # Fill in default polydispersity parameters

sasmodels/bumps_model.py

@@ -167 +167 @@
         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()
         plt.imshow(plottable.reshape(128,128),
                    interpolation='nearest', aspect=1, origin='upper',