Changeset b9c432ac in sasview


Ignore:
Timestamp:
Mar 30, 2019 2:31:38 AM (7 weeks ago)
Author:
wojciech
Branches:
master
Children:
4ecf91a
Parents:
104613f (diff), 332c10d (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/sasview into ticket-1267

Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • INSTALL.txt

    r26c9b85 re40390ee  
    4747More information can be found here: 
    4848 
    49 http://www.sasview.org/help.html 
    50 http://www.sasview.org/faq.html 
     49http://www.sasview.org/help/ 
     50http://www.sasview.org/faq/ 
    5151http://www.sasview.org/trac/wiki/DevNotes 
  • docs/sphinx-docs/source/user/RELEASE.rst

    r8514f89 r2c355a2  
    156156* Fixes # 784: Add 3D integral to Correlation Function analysis 
    157157* Fixes # 786: core_shell_parallelepiped 1-D model is incorrect 
    158 * Fixes # 818: “report button” followed by “save” makes an empty pdf file??? 
     158* Fixes # 818: "report button" followed by "save" makes an empty pdf file??? 
    159159* Fixes # 830: Check compliance of loader against NXcanSAS-1.0 release 
    160160* Fixes # 838: Fix model download from marketplace 
     
    770770          that any previous versions of SasView are uninstalled prior to  
    771771          installing the new version UNLESS you are installing SasView to  
    772           versioned folders. 
     772          versioned folders. **We recommend you avoid using folder paths  
     773          that contain spaces or characters that cannot be found on a  
     774          standard keyboard (eg, characters with accents, umlauts, etc).** 
    773775 
    774776.. note:: The easiest approach to setting up the proper environment to 
     
    965967Frequently Asked Questions 
    966968========================== 
    967 http://www.sasview.org/faq.html 
     969http://www.sasview.org/faq/ 
    968970 
    969971 
  • src/sas/sasgui/perspectives/fitting/media/fitting.rst

    rc926a97 r332c10d  
    1717   Smearing Functions <resolution> 
    1818 
     19   Fitting Models with Structure Factors <fitting_sq> 
     20 
     21   Writing a Plugin Model <plugin> 
     22 
    1923   Polarisation/Magnetic Scattering <magnetism/magnetism> 
    20     
     24 
    2125   Oriented Particles <orientation/orientation> 
    2226 
     
    2731   Fitting SESANS Data <sesans/sesans_fitting> 
    2832 
    29    Writing a Plugin Model <plugin> 
    30  
    3133   Computations with a GPU <gpu_setup> 
    3234 
  • src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

    r9258c43c rb7ce5ad  
    338338These optimisers form the *Bumps* package written by P Kienzle. For more information 
    339339on each optimiser, see the :ref:`Fitting_Documentation`. 
     340 
     341.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
     342 
     343Fitting Integer Parameters 
     344-------------------------- 
     345 
     346Most of the parameters in SasView models will naturally take floating point (decimal)  
     347values, but there are some parameters which can only have integer values. Examples  
     348include, but are not limited to, the number of shells in a multilayer vesicle, the  
     349number of beads in a pearl necklace, the number of arms of a star polymer, and so on. 
     350Wherever possible/recognised, the integer nature of a parameter is specified in the  
     351respective model documentation and/or parameter table, so read the documentation  
     352carefully! 
     353 
     354Integer parameters must be fitted with care. 
     355 
     356Start with your best possible guess for the value of the parameter. And using  
     357*a priori* knowledge, fix as many of the other parameters as possible. 
     358  
     359The SasView optimizers treat integer parameters internally as floating point  
     360numbers, but the values presented to the user are truncated or rounded, as  
     361appropriate. 
     362 
     363In most instances integer parameters will probably be greater than zero. A good  
     364policy in such cases is to use a constraint to enforce this. 
     365 
     366Because an integer parameter should, by definition, only move in integer steps,  
     367problems may be encountered if the optimizer step size is too small. Similarly,  
     368be **very careful** about applying polydispersity to integer parameters. 
     369 
     370The Levenberg-Marquardt and Quasi-Newton BFGS (and other derivative-based)  
     371optimizers are probably best avoided for fitting models with integer parameters. 
    340372 
    341373.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
  • src/sas/sasgui/perspectives/fitting/gpu_options.py

    r895703d r104613f  
    257257        #The same block of code as for OK but it is needed if we want to have 
    258258        #active response to Test button 
     259        import numpy as np 
    259260        no_opencl_msg = False 
    260261        if self.sas_opencl: 
     
    269270        try: 
    270271            env = sasmodels.kernelcl.environment() 
    271             clinfo = [(ctx.devices[0].platform.vendor, 
    272                        ctx.devices[0].platform.version, 
    273                        ctx.devices[0].vendor, 
    274                        ctx.devices[0].name, 
    275                        ctx.devices[0].version) 
    276                       for ctx in env.context] 
     272            dtype64 = np.dtype('float64') 
     273            dtype32 = np.dtype('float32') 
     274            if dtype64 in env.context: 
     275                ctx = env.context[dtype64].devices[0] 
     276            else: 
     277                ctx = env.context[dtype32].devices[0] 
     278            clinfo = (ctx.platform.vendor, 
     279                        ctx.platform.version, 
     280                        ctx.vendor, 
     281                        ctx.name, 
     282                        ctx.version) 
    277283        except Exception: 
    278284            clinfo = None 
Note: See TracChangeset for help on using the changeset viewer.