make sure residuals plot uses same xscale as data; leave more room for the residuals plot

Author: Paul Kienzle

sasmodels/bumps_model.py

@@ -217,6 +217,7 @@ def parameters(self):
         """
         Return a dictionary of parameters
         """
+        # TODO: tie the background and scale to the data rather than the model
         pars = self.model.parameters()
         if self.extra_pars is not None:
             pars.update(self.extra_pars)
@@ -273,12 +274,12 @@ def _plot(self, view=None, backend='matplotlib'):
         fig = plot_theory(data, theory, resid, view, Iq_calc=Iq_calc, label=label, backend=backend)
         return fig
 
-    def plot(self, view=None):
-        return self._plot(view=view, backend='matplotlib')
+    # def plot(self, view=None):
+    #     return self._plot(view=view, backend='matplotlib')
 
-    # # Bumps doesn't yet support 2D plots with plotly.
-    # def plotly(self, view=None):
-    #     return self._plot(view=view, backend='plotly')
+    # Bumps doesn't yet support 2D plots with plotly.
+    def plotly(self, view=None):
+        return self._plot(view=view, backend='plotly')
 
     def simulate_data(self, noise=None):
         # type: (float) -> None

sasmodels/data.py

@@ -49,6 +49,10 @@
     pass
 # pylint: enable=unused-import
 
+RESID_RATIO = 0.25
+"""Portion of the graph area to use for the residuals plot"""
+
+
 def load_data(filename, index=0):
     # type: (str, int) -> Data
     """
@@ -523,7 +527,6 @@ def get_data_label(data):
         run = run[0]
     return run if run else filename if filename else title if title else "data"
 
-RESID_RATIO = 0.15
 def _plot_result1D(
         data, theory, resid, view, use_data,
         limits=None, Iq_calc=None, label='theory',
@@ -640,6 +643,7 @@ def ytransform(x):
             fig.add_hline(y=1, line=dict(color='black', dash='dot'), row=2, col=1)
             fig.add_hline(y=-1, line=dict(color='black', dash='dot'), row=2, col=1)
             fig.update_yaxes(title_text='resid', type='linear', row=2, col=1)
+            fig.update_xaxes(type=xscale, row=2, col=1)
             fig.update_xaxes(title_text=xlabel, row=2, col=1)
         else:
             fig.update_xaxes(title_text=xlabel, row=1, col=1)