Changeset 4373d62 in sasmodels for doc


Ignore:
Timestamp:
Mar 17, 2016 9:07:37 AM (8 years ago)
Author:
gonzalezm
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:
15bd6e7, 84db7a5, 528bd8c, 715bb83
Parents:
aa2edb2 (diff), d6850fa (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of https://github.com/SasView/sasmodels

File:
1 edited

Legend:

Unmodified
Added
Removed
  • doc/genmodel.py

    r70bbb74 raa2edb2  
    2525        'xscale'    : 'log', 
    2626        'yscale'    : 'log' if not info['structure_factor'] else 'linear', 
    27         'qmin'      : 0.005, 
     27        'qmin'      : 0.001, 
    2828        'qmax'      : 1.0, 
    2929        'nq'        : 1000, 
     
    6868fig = plt.figure() 
    6969ax = fig.add_subplot(1,1,1) 
    70 ax.plot(q, Iq1D, color='blue', lw=2, label=model_name) 
     70ax.plot(q, Iq1D, color='blue', lw=2, label=info['name']) 
    7171ax.set_xlabel(r'$Q \/(\AA^{-1})$') 
    7272ax.set_xscale(opts['xscale'])    
     
    101101    docstr = docstr1 + captionstr + docstr2 
    102102else: 
     103    print '------------------------------------------------------------------' 
    103104    print 'References NOT FOUND for model: ', model_name 
     105    print '------------------------------------------------------------------' 
    104106    docstr = docstr + captionstr 
    105107 
Note: See TracChangeset for help on using the changeset viewer.