Changeset e081946 in sasview


Ignore:
Timestamp:
Sep 15, 2017 11:40:46 AM (2 years ago)
Author:
smk78
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
ca383a0
Parents:
c56d9d74
Message:

Minor rst formatting fixes

Location:
src/sas/sasgui/perspectives/fitting/media
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

    r203669a re081946  
    214214                     ['radius_effective', '', 1, [-numpy.inf, numpy.inf], 'volume', ''], 
    215215                     ['volfraction', '', 1, [-numpy.inf, numpy.inf], '', ''], 
     216                     [...], 
    216217 
    217218and to the declarations of the functions Iq and Iqxy::: 
     
    242243them. Finally, click the *Apply* button to generate and test the model and then click *Close*. 
    243244 
    244 Any changes to a plugin model generated in this way only become effective *after* it is re-selected from the plugin models drop-down menu on the FitPage. If the model is not listed you can force a  
     245Any changes to a plugin model generated in this way only become effective *after* it is re-selected  
     246from the plugin models drop-down menu on the FitPage. If the model is not listed you can force a  
    245247recompilation of the plugins by selecting *Fitting* > *Plugin Model Operations* > *Load Plugin Models*. 
    246248 
     
    253255      
    254256     model_info = load_model_info('sphere+power_law') 
    255      model_info.name = 'My Plugin Model' 
     257     model_info.name = 'MyPluginModel' 
    256258     model_info.description = 'sphere + power_law' 
    257259     Model = make_model_from_info(model_info) 
     
    261263and description too!!! 
    262264 
    263 The model specification string can handle multiple models and combinations of operators (+ - * /) which  
     265The model specification string can handle multiple models and combinations of operators (+ - * \\) which  
    264266are processed according to normal conventions. Thus 'model1+model2*model3' would be valid and would  
    265267multiply model2 by model3 before adding model1. In this example, parameters in the *FitPage* would be  
    266 prefixed A_\ (for model2), B_\ (for model3) and C_\ (for model1). Whilst this might appear a little  
    267 confusing, unless you were creating a plugin model from multiple instances of the same model the parameter assignments ought to be obvious when you load the plugin. 
    268  
     268prefixed A (for model2), B (for model3) and C (for model1). Whilst this might appear a little  
     269confusing, unless you were creating a plugin model from multiple instances of the same model the parameter  
     270assignments ought to be obvious when you load the plugin. 
     271 
     272If you need to include another plugin model in the model specification string, just prefix the name of  
     273that model with *custom*. For instance:: 
     274 
     275     sphere+custom.MyPluginModel 
     276 
     277To create a P(Q)*\S(Q) model use the @ symbol instead of * like this:: 
     278 
     279     sphere@hardsphere 
     280      
    269281This streamlined approach to building complex plugin models from existing library models, or models  
    270282available on the *Model Marketplace*, also permits the creation of P(Q)*\S(Q) plugin models, something  
  • src/sas/sasgui/perspectives/fitting/media/plugin.rst

    rc56d9d74 re081946  
    2020 
    2121**What follows below is quite technical. If you just want a helping hand to get  
    22 started creating your own models see :ref:`Adding_your_own_models`.** 
     22started creating your own models see** :ref:`Adding_your_own_models`. 
    2323 
    2424Overview 
Note: See TracChangeset for help on using the changeset viewer.