Changes in sasmodels/compare.py [65fbf7c:1fbadb2] in sasmodels

File:

• sasmodels/compare.py (modified) (13 diffs)

sasmodels/compare.py

@@ -645 +645 @@
 
 def make_data(opts):
-    # type: (Dict[str, Any], float) -> Tuple[Data, np.ndarray]
+    # type: (Dict[str, Any]) -> Tuple[Data, np.ndarray]
     """
     Generate an empty dataset, used with the model to set Q points
@@ -667 +667 @@
         if opts['zero']:
             q = np.hstack((0, q))
-        # TODO: provide command line control of lambda and Delta lambda/lambda
-        #L, dLoL = 5, 0.14/np.sqrt(6)  # wavelength and 14% triangular FWHM
-        L, dLoL = 0, 0
-        data = empty_data1D(q, resolution=res, L=L, dL=L*dLoL)
+        data = empty_data1D(q, resolution=res)
         index = slice(None, None)
     return data, index
@@ -789 +786 @@
     base_n, comp_n = opts['count']
     base_pars, comp_pars = opts['pars']
-    base_data, comp_data = opts['data']
+    data = opts['data']
 
     comparison = comp is not None
@@ -803 +800 @@
             print("%s t=%.2f ms, intensity=%.0f"
                   % (base.engine, base_time, base_value.sum()))
-        _show_invalid(base_data, base_value)
+        _show_invalid(data, base_value)
     except ImportError:
         traceback.print_exc()
@@ -815 +812 @@
                 print("%s t=%.2f ms, intensity=%.0f"
                       % (comp.engine, comp_time, comp_value.sum()))
-            _show_invalid(base_data, comp_value)
+            _show_invalid(data, comp_value)
         except ImportError:
             traceback.print_exc()
@@ -869 +866 @@
     have_base, have_comp = (base_value is not None), (comp_value is not None)
     base, comp = opts['engines']
-    base_data, comp_data = opts['data']
+    data = opts['data']
     use_data = (opts['datafile'] is not None) and (have_base ^ have_comp)
 
     # Plot if requested
     view = opts['view']
-    #view = 'log'
     if limits is None:
         vmin, vmax = np.inf, -np.inf
@@ -888 +884 @@
         if have_comp:
             plt.subplot(131)
-        plot_theory(base_data, base_value, view=view, use_data=use_data, limits=limits)
+        plot_theory(data, base_value, view=view, use_data=use_data, limits=limits)
         plt.title("%s t=%.2f ms"%(base.engine, base_time))
         #cbar_title = "log I"
@@ -895 +891 @@
             plt.subplot(132)
         if not opts['is2d'] and have_base:
-            plot_theory(comp_data, base_value, view=view, use_data=use_data, limits=limits)
-        plot_theory(comp_data, comp_value, view=view, use_data=use_data, limits=limits)
+            plot_theory(data, base_value, view=view, use_data=use_data, limits=limits)
+        plot_theory(data, comp_value, view=view, use_data=use_data, limits=limits)
         plt.title("%s t=%.2f ms"%(comp.engine, comp_time))
         #cbar_title = "log I"
@@ -912 +908 @@
             err[err > cutoff] = cutoff
         #err,errstr = base/comp,"ratio"
-        # Note: base_data only since base and comp have same q values (though
-        # perhaps different resolution), and we are plotting the difference
-        # at each q
-        plot_theory(base_data, None, resid=err, view=errview, use_data=use_data)
+        plot_theory(data, None, resid=err, view=errview, use_data=use_data)
         plt.xscale('log' if view == 'log' and not opts['is2d'] else 'linear')
         plt.legend(['P%d'%(k+1) for k in range(setnum+1)], loc='best')
@@ -1082 +1075 @@
         'qmax'      : 0.05,
         'nq'        : 128,
-        'res'       : '0.0',
+        'res'       : 0.0,
         'noise'     : 0.0,
         'accuracy'  : 'Low',
@@ -1122 +1115 @@
         elif arg.startswith('-q='):
             opts['qmin'], opts['qmax'] = [float(v) for v in arg[3:].split(':')]
-        elif arg.startswith('-res='):      opts['res'] = arg[5:]
+        elif arg.startswith('-res='):      opts['res'] = float(arg[5:])
         elif arg.startswith('-noise='):    opts['noise'] = float(arg[7:])
         elif arg.startswith('-sets='):     opts['sets'] = int(arg[6:])
@@ -1180 +1173 @@
     if opts['qmin'] is None:
         opts['qmin'] = 0.001*opts['qmax']
+    if opts['datafile'] is not None:
+        data = load_data(os.path.expanduser(opts['datafile']))
+    else:
+        data, _ = make_data(opts)
 
     comparison = any(PAR_SPLIT in v for v in values)
@@ -1219 +1216 @@
         opts['cutoff'] = [float(opts['cutoff'])]*2
 
-    if PAR_SPLIT in opts['res']:
-        opts['res'] = [float(k) for k in opts['res'].split(PAR_SPLIT, 2)]
-        comparison = True
-    else:
-        opts['res'] = [float(opts['res'])]*2
-
-    if opts['datafile'] is not None:
-        data = load_data(os.path.expanduser(opts['datafile']))
-    else:
-        # Hack around the fact that make_data doesn't take a pair of resolutions
-        res = opts['res']
-        opts['res'] = res[0]
-        data0, _ = make_data(opts)
-        if res[0] != res[1]:
-            opts['res'] = res[1]
-            data1, _ = make_data(opts)
-        else:
-            data1 = data0
-        opts['res'] = res
-        data = data0, data1
-
-    base = make_engine(model_info[0], data[0], opts['engine'][0],
+    base = make_engine(model_info[0], data, opts['engine'][0],
                        opts['cutoff'][0], opts['ngauss'][0])
     if comparison:
-        comp = make_engine(model_info[1], data[1], opts['engine'][1],
+        comp = make_engine(model_info[1], data, opts['engine'][1],
                            opts['cutoff'][1], opts['ngauss'][1])
     else: