Changes in / [886a89d:325e89a] in sasmodels

File:

• doc/genmodel.py (modified) (5 diffs)

doc/genmodel.py

@@ -2 +2 @@
 import numpy as np
 import matplotlib.pyplot as plt
-import pylab
 sys.path.insert(0, os.path.abspath('..'))
 from sasmodels import generate, core
@@ -29 +28 @@
     'q_max'     : 1.0,
     'nq'        : 1000,
-    'nq2d'      : 100,
+    'nq2d'      : 400,
     'vmin'      : 1e-3,  # floor for the 2D data results
     'qx_max'    : 0.5,
@@ -60 +59 @@
     if opts['zscale'] == 'log':
         Iq2D = np.log(np.clip(Iq2D, opts['vmin'], np.inf))
-    ax.imshow(Iq2D, interpolation='nearest', aspect=1, origin='lower',
-        extent=[-qx_max, qx_max, -qx_max, qx_max], cmap=pylab.cm.jet)   
+    h = ax.imshow(Iq2D, interpolation='nearest', aspect=1, origin='upper',
+           extent=[-qx_max, qx_max, -qx_max, qx_max], cmap=ice_cm())
+    # , vmin=vmin, vmax=vmax)
     ax.set_xlabel(r'$Q_x \/(\AA^{-1})$')
     ax.set_ylabel(r'$Q_y \/(\AA^{-1})$')
-
-#            im = self.subplot.imshow(output, interpolation='nearest',
-#                                     origin='lower',
-#                                     vmin=zmin_temp, vmax=self.zmax_2D,
-#                                     cmap=self.cmap,
-#                                     extent=(self.xmin_2D, self.xmax_2D,
-#                                             self.ymin_2D, self.ymax_2D))
 
 def ice_cm():
@@ -104 +97 @@
     plot_2d(model, opts, ax2d)
     ax1d = fig.add_axes([ax_left, ax_bottom, ax_width, ax_height])
-    plot_1d(model, opts, ax1d)
     #ax.set_aspect('square')
 else:
@@ -129 +121 @@
 captionstr += '.. figure:: img/' + model_info['id'] + '_autogenfig.png\n'
 captionstr += '\n'
-if model_info['has_2d']:
-    captionstr += '    1D and 2D plots corresponding to the default parameters of the model.\n'
-else:
-    captionstr += '    1D plot corresponding to the default parameters of the model.\n'
+captionstr += '    1D plot corresponding to the default parameters of the model.\n'
 captionstr += '\n'