Changeset 0e9048f in sasmodels


Ignore:
Timestamp:
Nov 23, 2015 5:02:27 PM (7 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:
cd3dba0, 34375ea
Parents:
23259b9
Message:

fix some of the doc build errors

Location:
sasmodels
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/bumps_model.py

    r7cf2cfd r0e9048f  
    1717import numpy as np 
    1818 
    19 from bumps.names import Parameter 
    20  
    2119from . import sesans 
    2220from . import weights 
     
    3634class Model(object): 
    3735    def __init__(self, model, **kw): 
     36        # lazy import; this allows the doc builder and nosetests to run even 
     37        # when bumps is not on the path. 
     38        from bumps.names import Parameter 
     39 
    3840        self._sasmodel = model 
    3941        partype = model.info['partype'] 
  • sasmodels/models/gaussian_peak.py

    r677ccf1 r0e9048f  
    2222 
    2323 
    24 .. image:: img/gaussian_peak_1d.jpg 
     24.. figure:: img/gaussian_peak_1d.jpg 
    2525 
    2626    1D plot using the default values (w/500 data points). 
  • sasmodels/models/teubner_strey.py

    rbe18d1f r0e9048f  
    3636 
    3737 
    38 .. image:: img/teubner_strey_1d.jpg 
     38.. figure:: img/teubner_strey_1d.jpg 
    3939 
    4040    1D plot using the default values (w/200 data point). 
Note: See TracChangeset for help on using the changeset viewer.