Changes in / [0d5dc05:7050455] in sasmodels
- Files:
-
- 79 edited
Legend:
- Unmodified
- Added
- Removed
-
doc/conf.py
rc1e44e5 r30b60d2 36 36 #'only_directives', 37 37 #'matplotlib.sphinxext.mathmpl', 38 #'matplotlib.sphinxext.only_directives',38 'matplotlib.sphinxext.only_directives', 39 39 'matplotlib.sphinxext.plot_directive', 40 40 'dollarmath', -
doc/genmodel.py
rbe0942c rb866abf 7 7 import matplotlib.pyplot as plt 8 8 sys.path.insert(0, os.path.abspath('..')) 9 import sasmodels10 9 from sasmodels import generate, core 11 10 from sasmodels.direct_model import DirectModel, call_profile … … 128 127 #print("figure saved in",path) 129 128 130 def copy_if_newer(src, dst):131 from os.path import dirname, exists, getmtime132 import shutil133 if not exists(dst):134 path = dirname(dst)135 if not exists(path):136 os.makedirs(path)137 shutil.copy2(src, dst)138 elif getmtime(src) > getmtime(dst):139 shutil.copy2(src, dst)140 141 def link_sources(model_info):142 from os.path import basename, dirname, realpath, join as joinpath143 144 # List source files in reverse order of dependency.145 model_file = basename(model_info.filename)146 sources = list(reversed(model_info.source + [model_file]))147 148 # Copy files to src dir under models directory. Need to do this149 # because sphinx can't link to an absolute path.150 root = dirname(dirname(realpath(__file__)))151 src = joinpath(root, "sasmodels", "models")152 dst = joinpath(root, "doc", "model", "src")153 for path in sources:154 copy_if_newer(joinpath(src, path), joinpath(dst, path))155 156 # Link to local copy of the files157 downloads = [":download:`%s <src/%s>`"%(path, path) for path in sources]158 159 # Could do syntax highlighting on the model files by creating a rst file160 # beside each source file named containing source file with161 #162 # src/path.rst:163 #164 # .. {{ path.replace('/','_') }}:165 #166 # .. literalinclude:: {{ src/path }}167 # :language: {{ "python" if path.endswith('.py') else "c" }}168 # :linenos:169 #170 # and link to it using171 #172 # colors = [":ref:`%s`"%(path.replace('/','_')) for path in sources]173 #174 # Probably need to dump all the rst files into an index.rst to build them.175 176 # Link to github repo (either the tagged sasmodels version or master)177 url = "https://github.com/SasView/sasmodels/blob/v%s"%sasmodels.__version__178 #url = "https://github.com/SasView/sasmodels/blob/master"%sasmodels.__version__179 links = ["`%s <%s/sasmodels/models/%s>`_"%(path, url, path) for path in sources]180 181 sep = "\n$\\ \\star\\ $ " # bullet182 body = "\n**Source**\n"183 #body += "\n" + sep.join(links) + "\n\n"184 body += "\n" + sep.join(downloads) + "\n\n"185 return body186 187 129 def gen_docs(model_info): 188 130 # type: (ModelInfo) -> None … … 208 150 match = re.search(pattern, docstr.upper()) 209 151 210 sources = link_sources(model_info)211 212 insertion = captionstr + sources213 214 152 if match: 215 153 docstr1 = docstr[:match.start()] 216 154 docstr2 = docstr[match.start():] 217 docstr = docstr1 + insertion+ docstr2155 docstr = docstr1 + captionstr + docstr2 218 156 else: 219 157 print('------------------------------------------------------------------') 220 158 print('References NOT FOUND for model: ', model_info.id) 221 159 print('------------------------------------------------------------------') 222 docstr += insertion160 docstr += captionstr 223 161 224 open(sys.argv[2], 162 open(sys.argv[2],'w').write(docstr) 225 163 226 164 def process_model(path): -
doc/guide/fitting_sq.rst
r694c6d0 r694c6d0 89 89 later. 90 90 91 *radius_effective_mode*:91 * *radius_effective_mode*: 92 92 93 93 Defines how the effective radius (parameter **radius_effective**) should -
sasmodels/models/_spherepy.py
rc1e44e5 ra34b811 39 39 John Wiley and Sons, New York, (1955) 40 40 41 Source 42 ------ 43 44 `_spherepy.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/_spherepy.py>`_ 45 `sphere.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/sphere.c>`_ 46 41 47 Authorship and Verification 42 48 ---------------------------- … … 45 51 * **Last Modified by:** 46 52 * **Last Reviewed by:** S King and P Parker **Date:** 2013/09/09 and 2014/01/06 53 * **Source added by :** Steve King **Date:** March 25, 2019 47 54 """ 48 55 -
sasmodels/models/adsorbed_layer.py
rc1e44e5 r0507e09 49 49 Layers*, *Macromol. Symp.*, 190 (2002) 33-42. 50 50 51 Source 52 ------ 53 54 `adsorbed_layer.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/adsorbed_layer.py>`_ 55 51 56 Authorship and Verification 52 57 ---------------------------- … … 55 60 * **Last Modified by:** Paul Kienzle **Date:** April 14, 2016 56 61 * **Last Reviewed by:** Steve King **Date:** March 18, 2016 62 * **Source added by :** Steve King **Date:** March 25, 2019 57 63 """ 58 64 -
sasmodels/models/barbell.py
rc1e44e5 ra34b811 81 81 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 82 82 83 Source 84 ------ 85 86 `barbell.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/barbell.py>`_ 87 88 `barbell.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/barbell.c>`_ 89 83 90 Authorship and Verification 84 91 ---------------------------- … … 87 94 * **Last Modified by:** Paul Butler **Date:** March 20, 2016 88 95 * **Last Reviewed by:** Richard Heenan **Date:** January 4, 2017 96 * **Source added by :** Steve King **Date:** March 25, 2019 89 97 """ 90 98 -
sasmodels/models/bcc_paracrystal.py
rc1e44e5 r0507e09 100 100 (Corrections to FCC and BCC lattice structure calculation) 101 101 102 Source 103 ------ 104 105 `bcc_paracrystal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/bcc_paracrystal.py>`_ 106 107 `bcc_paracrystal.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/bcc_paracrystal.c>`_ 108 102 109 Authorship and Verification 103 110 --------------------------- … … 106 113 * **Last Modified by:** Paul Butler **Date:** September 29, 2016 107 114 * **Last Reviewed by:** Richard Heenan **Date:** March 21, 2016 115 * **Source added by :** Steve King **Date:** March 25, 2019 108 116 """ 109 117 -
sasmodels/models/be_polyelectrolyte.py
rc1e44e5 r0507e09 91 91 .. [#] E Raphael, J F Joanny, *Europhysics Letters*, 11 (1990) 179 92 92 93 Source 94 ------ 95 96 `be_polyelectrolyte.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/be_polyelectrolyte.py>`_ 97 93 98 Authorship and Verification 94 99 ---------------------------- … … 97 102 * **Last Modified by:** Paul Butler **Date:** September 25, 2018 98 103 * **Last Reviewed by:** Paul Butler **Date:** September 25, 2018 104 * **Source added by :** Steve King **Date:** March 25, 2019 99 105 """ 100 106 -
sasmodels/models/binary_hard_sphere.py
rc1e44e5 r0507e09 65 65 .. [#] S R Kline, *J Appl. Cryst.*, 39 (2006) 895 66 66 67 Source 68 ------ 69 70 `binary_hard_sphere.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/binary_hard_sphere.py>`_ 71 72 `binary_hard_sphere.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/binary_hard_sphere.c>`_ 73 67 74 Authorship and Verification 68 75 ---------------------------- … … 71 78 * **Last Modified by:** Paul Butler **Date:** March 20, 2016 72 79 * **Last Reviewed by:** Paul Butler **Date:** March 20, 2016 80 * **Source added by :** Steve King **Date:** March 25, 2019 73 81 """ 74 82 -
sasmodels/models/broad_peak.py
rc1e44e5 r0507e09 33 33 None. 34 34 35 Source 36 ------ 37 38 `broad_peak.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/broad_peak.py>`_ 39 35 40 Authorship and Verification 36 41 ---------------------------- … … 39 44 * **Last Modified by:** Paul kienle **Date:** July 24, 2016 40 45 * **Last Reviewed by:** Richard Heenan **Date:** March 21, 2016 46 * **Source added by :** Steve King **Date:** March 25, 2019 41 47 """ 42 48 -
sasmodels/models/capped_cylinder.py
rc1e44e5 ra34b811 84 84 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 85 85 86 Source 87 ------ 88 89 `capped_cylinder.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/capped_cylinder.py>`_ 90 91 `capped_cylinder.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/capped_cylinder.c>`_ 92 86 93 Authorship and Verification 87 94 ---------------------------- … … 90 97 * **Last Modified by:** Paul Butler **Date:** September 30, 2016 91 98 * **Last Reviewed by:** Richard Heenan **Date:** January 4, 2017 99 * **Source added by :** Steve King **Date:** March 25, 2019 92 100 """ 93 101 -
sasmodels/models/core_multi_shell.py
rc1e44e5 ra34b811 39 39 Neutron Scattering*, Plenum Press, New York, 1987. 40 40 41 Source 42 ------ 43 44 `core_multi_shell.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_multi_shell.py>`_ 45 46 `core_multi_shell.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_multi_shell.c>`_ 47 41 48 Authorship and Verification 42 49 ---------------------------- … … 45 52 * **Last Modified by:** Paul Kienzle **Date:** September 12, 2016 46 53 * **Last Reviewed by:** Paul Kienzle **Date:** September 12, 2016 54 * **Source added by :** Steve King **Date:** March 25, 2019 47 55 """ 48 56 from __future__ import division -
sasmodels/models/core_shell_bicelle.py
rc1e44e5 ra34b811 92 92 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 93 93 94 Source 95 ------ 96 97 `core_shell_bicelle.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_bicelle.py>`_ 98 99 `core_shell_bicelle.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_bicelle.c>`_ 100 94 101 Authorship and Verification 95 102 ---------------------------- … … 98 105 * **Last Modified by:** Paul Butler **Date:** September 30, 2016 99 106 * **Last Reviewed by:** Richard Heenan **Date:** January 4, 2017 107 * **Source added by :** Steve King **Date:** March 25, 2019 100 108 """ 101 109 -
sasmodels/models/core_shell_bicelle_elliptical.py
rc1e44e5 ra34b811 101 101 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 102 102 103 Source 104 ------ 105 106 `core_shell_bicelle_elliptical.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_bicelle_elliptical.py>`_ 107 108 `core_shell_bicelle_elliptical.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_bicelle_elliptical.c>`_ 109 103 110 Authorship and Verification 104 111 ---------------------------- … … 107 114 * **Last Modified by:** Richard Heenan **Date:** December 14, 2016 108 115 * **Last Reviewed by:** Paul Kienzle **Date:** Feb 28, 2018 116 * **Source added by :** Steve King **Date:** March 25, 2019 109 117 """ 110 118 -
sasmodels/models/core_shell_bicelle_elliptical_belt_rough.py
rc1e44e5 ra34b811 113 113 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 114 114 115 Source 116 ------ 117 118 `core_shell_bicelle_elliptical_belt_rough.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_bicelle_elliptical_belt_rough.py>`_ 119 120 `core_shell_bicelle_elliptical_belt_rough.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_bicelle_elliptical_belt_rough.c>`_ 121 115 122 Authorship and Verification 116 123 ---------------------------- … … 119 126 * **Last Modified by:** Richard Heenan new 2d orientation **Date:** October 5, 2017 120 127 * **Last Reviewed by:** Richard Heenan 2d calc seems agree with 1d **Date:** Nov 2, 2017 128 * **Source added by :** Steve King **Date:** March 25, 2019 121 129 """ 122 130 -
sasmodels/models/core_shell_cylinder.py
rc1e44e5 rdb1d9d5 72 72 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 73 73 74 Source 75 ------ 76 77 `core_shell_cylinder.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_cylinder.py>`_ 78 79 `core_shell_cylinder.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_cylinder.c>`_ 80 74 81 Authorship and Verification 75 82 ---------------------------- … … 78 85 * **Last Modified by:** Paul Kienzle **Date:** Aug 8, 2016 79 86 * **Last Reviewed by:** Richard Heenan **Date:** March 18, 2016 87 * **Source added by :** Steve King **Date:** March 25, 2019 80 88 """ 81 89 -
sasmodels/models/core_shell_ellipsoid.py
rc1e44e5 rdb1d9d5 97 97 .. [#] Berr, S. *J. Phys. Chem.*, 1987, 91, 4760 98 98 99 Source 100 ------ 101 102 `core_shell_ellipsoid.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_ellipsoid.py>`_ 103 104 `core_shell_ellipsoid.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_ellipsoid.c>`_ 105 99 106 Authorship and Verification 100 107 ---------------------------- … … 103 110 * **Last Modified by:** Richard Heenan (reparametrised model) **Date:** 2015 104 111 * **Last Reviewed by:** Steve King **Date:** March 27, 2019 112 * **Source added by :** Steve King **Date:** March 25, 2019 105 113 """ 106 114 -
sasmodels/models/core_shell_parallelepiped.py
rc1e44e5 ra34b811 175 175 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 176 176 177 Source 178 ------ 179 180 `core_shell_parallelepiped.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_parallelepiped.py>`_ 181 182 `core_shell_parallelepiped.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_parallelepiped.c>`_ 183 177 184 Authorship and Verification 178 185 ---------------------------- … … 183 190 * **Last Reviewed by:** Paul Butler **Date:** May 24, 2018 - documentation 184 191 updated 192 * **Source added by :** Steve King **Date:** March 25, 2019 185 193 """ 186 194 -
sasmodels/models/core_shell_sphere.py
rc1e44e5 ra34b811 50 50 .. [#] A Guinier and G Fournet, *Small-Angle Scattering of X-Rays*, John Wiley and Sons, New York, (1955) 51 51 52 Source 53 ------ 54 55 `core_shell_sphere.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_sphere.py>`_ 56 57 `core_shell_sphere.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/core_shell_sphere.c>`_ 58 52 59 Authorship and Verification 53 60 ---------------------------- … … 56 63 * **Last Modified by:** 57 64 * **Last Reviewed by:** 65 * **Source added by :** Steve King **Date:** March 25, 2019 58 66 """ 59 67 -
sasmodels/models/correlation_length.py
rc1e44e5 r0507e09 32 32 .. [#] B Hammouda, D L Ho and S R Kline, Insight into Clustering in Poly(ethylene oxide) Solutions, Macromolecules, 37 (2004) 6932-6937 33 33 34 Source 35 ------ 36 37 `correlation_length.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/correlation_length.py>`_ 38 34 39 Authorship and Verification 35 40 ---------------------------- 36 41 37 * **Author:** 38 * **Last Modified by:** 39 * **Last Reviewed by:** 42 * **Author:** 43 * **Last Modified by:** 44 * **Last Reviewed by:** 45 * **Source added by :** Steve King **Date:** March 25, 2019 40 46 """ 41 47 -
sasmodels/models/cylinder.py
rc1e44e5 ra34b811 100 100 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 101 101 102 Source 103 ------ 104 105 `cylinder.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/cylinder.py>`_ 106 107 `cylinder.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/cylinder.c>`_ 108 102 109 Authorship and Verification 103 110 ---------------------------- … … 106 113 * **Last Modified by:** 107 114 * **Last Reviewed by:** 115 * **Source added by :** Steve King **Date:** March 25, 2019 108 116 """ 109 117 -
sasmodels/models/ellipsoid.py
rc1e44e5 ra34b811 109 109 .. [#] A. Isihara. *J. Chem. Phys.*, 18 (1950) 1446-1449 110 110 111 Source 112 ------ 113 114 `ellipsoid.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/ellipsoid.py>`_ 115 116 `ellipsoid.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/ellipsoid.c>`_ 117 111 118 Authorship and Verification 112 119 ---------------------------- … … 115 122 * **Converted to sasmodels by:** Helen Park **Date:** July 9, 2014 116 123 * **Last Modified by:** Paul Kienzle **Date:** March 22, 2017 124 * **Source added by :** Steve King **Date:** March 25, 2019 117 125 """ 118 126 from __future__ import division -
sasmodels/models/elliptical_cylinder.py
rc1e44e5 ra34b811 89 89 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 90 90 91 Source 92 ------ 93 94 `elliptical_cylinder.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/elliptical_cylinder.py>`_ 95 96 `elliptical_cylinder.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/elliptical_cylinder.c>`_ 97 91 98 Authorship and Verification 92 99 ---------------------------- … … 95 102 * **Last Modified by:** 96 103 * **Last Reviewed by:** Richard Heenan - corrected equation in docs **Date:** December 21, 2016 104 * **Source added by :** Steve King **Date:** March 25, 2019 97 105 """ 98 106 -
sasmodels/models/fcc_paracrystal.py
rc1e44e5 r0507e09 99 99 (Corrections to FCC and BCC lattice structure calculation) 100 100 101 Source 102 ------ 103 104 `fcc_paracrystal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/fcc_paracrystal.py>`_ 105 106 `fcc_paracrystal.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/fcc_paracrystal.c>`_ 107 101 108 Authorship and Verification 102 109 --------------------------- … … 105 112 * **Last Modified by:** Paul Butler **Date:** September 29, 2016 106 113 * **Last Reviewed by:** Richard Heenan **Date:** March 21, 2016 114 * **Source added by :** Steve King **Date:** March 25, 2019 107 115 """ 108 116 -
sasmodels/models/flexible_cylinder.py
rc1e44e5 rdb1d9d5 95 95 .. [#] W R Chen, P D Butler and L J Magid, *Incorporating Intermicellar Interactions in the Fitting of SANS Data from Cationic Wormlike Micelles.* Langmuir, 22(15) 2006 6539-6548 96 96 97 Source 98 ------ 99 100 `flexible_cylinder.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/flexible_cylinder.py>`_ 101 102 `flexible_cylinder.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/flexible_cylinder.c>`_ 103 104 `wrc_cyl.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lib/wrc_cyl.c>`_ 105 97 106 Authorship and Verification 98 107 ---------------------------- … … 101 110 * **Last Modified by:** 102 111 * **Last Reviewed by:** Steve King **Date:** March 26, 2019 112 * **Source added by :** Steve King **Date:** March 25, 2019 103 113 """ 104 114 -
sasmodels/models/flexible_cylinder_elliptical.py
rc1e44e5 rdb1d9d5 83 83 .. [#] W R Chen, P D Butler and L J Magid, *Incorporating Intermicellar Interactions in the Fitting of SANS Data from Cationic Wormlike Micelles.* Langmuir, 22(15) 2006 6539-6548 84 84 85 Source 86 ------ 87 88 `flexible_cylinder_elliptical.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/flexible_cylinder_elliptical.py>`_ 89 90 `flexible_cylinder_elliptical.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/flexible_cylinder_elliptical.c>`_ 91 92 `wrc_cyl.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lib/wrc_cyl.c>`_ 93 85 94 Authorship and Verification 86 95 ---------------------------- … … 89 98 * **Last Modified by:** Richard Heenan **Date:** December, 2016 90 99 * **Last Reviewed by:** Steve King **Date:** March 26, 2019 100 * **Source added by :** Steve King **Date:** March 25, 2019 91 101 """ 92 102 -
sasmodels/models/fractal.py
rc1e44e5 r0507e09 46 46 .. [#] J Teixeira, *J. Appl. Cryst.*, 21 (1988) 781-785 47 47 48 Source 49 ------ 50 51 `fractal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/fractal.py>`_ 52 53 `fractal.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/fractal.c>`_ 54 48 55 Authorship and Verification 49 56 ---------------------------- … … 53 60 * **Last Modified by:** Paul Butler **Date:** March 12, 2017 54 61 * **Last Reviewed by:** Paul Butler **Date:** March 12, 2017 62 * **Source added by :** Steve King **Date:** March 25, 2019 55 63 """ 56 64 from __future__ import division -
sasmodels/models/fractal_core_shell.py
rc1e44e5 r0507e09 51 51 .. [#Kline] S R Kline, *J Appl. Cryst.*, 39 (2006) 895 52 52 53 Source 54 ------ 55 56 `fractal_core_shell.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/fractal_core_shell.py>`_ 57 58 `fractal_core_shell.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/fractal_core_shell.c>`_ 59 53 60 Authorship and Verification 54 61 ---------------------------- … … 57 64 * **Last Modified by:** Paul Butler and Paul Kienzle **Date:** November 27, 2016 58 65 * **Last Reviewed by:** Paul Butler and Paul Kienzle **Date:** November 27, 2016 66 * **Source added by :** Steve King **Date:** March 25, 2019 59 67 """ 60 68 -
sasmodels/models/fuzzy_sphere.py
rc1e44e5 ra34b811 53 53 .. [#] M Stieger, J. S Pedersen, P Lindner, W Richtering, *Langmuir*, 20 (2004) 7283-7292 54 54 55 Source 56 ------ 57 58 `fuzzy_sphere.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/fuzzy_sphere.py>`_ 59 60 `fuzzy_sphere.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/fuzzy_sphere.c>`_ 61 55 62 Authorship and Verification 56 63 ---------------------------- … … 59 66 * **Last Modified by:** 60 67 * **Last Reviewed by:** 68 * **Source added by :** Steve King **Date:** March 25, 2019 61 69 """ 62 70 -
sasmodels/models/gauss_lorentz_gel.py
rc1e44e5 r0507e09 34 34 .. [#] G Evmenenko, E Theunissen, K Mortensen, H Reynaers, *Polymer*, 42 (2001) 2907-2913 35 35 36 Source 37 ------ 38 39 `gauss_lorentz_gel.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/gauss_lorentz_gel.py>`_ 40 36 41 Authorship and Verification 37 42 ---------------------------- 38 43 39 * **Author:** 40 * **Last Modified by:** 41 * **Last Reviewed by:** 44 * **Author:** 45 * **Last Modified by:** 46 * **Last Reviewed by:** 47 * **Source added by :** Steve King **Date:** March 25, 2019 42 48 """ 43 49 -
sasmodels/models/gaussian_peak.py
rc1e44e5 r0507e09 27 27 None. 28 28 29 Source 30 ------ 31 32 `gaussian_peak.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/gaussian_peak.py>`_ 33 29 34 Authorship and Verification 30 35 ---------------------------- 31 36 32 * **Author:** 33 * **Last Modified by:** 34 * **Last Reviewed by:** 37 * **Author:** 38 * **Last Modified by:** 39 * **Last Reviewed by:** 40 * **Source added by :** Steve King **Date:** March 25, 2019 35 41 """ 36 42 -
sasmodels/models/gel_fit.py
rc1e44e5 r0507e09 41 41 .. [#] Simon Mallam, Ferenc Horkay, Anne-Marie Hecht, Adrian R Rennie, Erik Geissler, *Macromolecules* 1991, 24, 543-548 42 42 43 Source 44 ------ 45 46 `gel_fit.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/gel_fit.py>`_ 47 48 `gel_fit.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/gel_fit.c>`_ 49 43 50 Authorship and Verification 44 51 ---------------------------- 45 52 46 * **Author:** 47 * **Last Modified by:** 48 * **Last Reviewed by:** 53 * **Author:** 54 * **Last Modified by:** 55 * **Last Reviewed by:** 56 * **Source added by :** Steve King **Date:** March 25, 2019 49 57 """ 50 58 -
sasmodels/models/guinier.py
rc1e44e5 r0507e09 48 48 .. [#] A Guinier and G Fournet, *Small-Angle Scattering of X-Rays*, John Wiley & Sons, New York (1955) 49 49 50 Source 51 ------ 52 53 `guinier.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/guinier.py>`_ 54 50 55 Authorship and Verification 51 56 ---------------------------- 52 57 53 * **Author:** 54 * **Last Modified by:** 55 * **Last Reviewed by:** 58 * **Author:** 59 * **Last Modified by:** 60 * **Last Reviewed by:** 61 * **Source added by :** Steve King **Date:** March 25, 2019 56 62 """ 57 63 -
sasmodels/models/guinier_porod.py
rc1e44e5 rdb1d9d5 63 63 .. [#] B Hammouda, *Analysis of the Beaucage model, J. Appl. Cryst.*, (2010), 43, 1474-1478 64 64 65 Source 66 ------ 67 68 `guinier_porod.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/guinier_porod.py>`_ 69 65 70 Authorship and Verification 66 71 ---------------------------- 67 72 68 * **Author:** 69 * **Last Modified by:** 70 * **Last Reviewed by:** 73 * **Author:** 74 * **Last Modified by:** 75 * **Last Reviewed by:** 76 * **Source added by :** Steve King **Date:** March 25, 2019 71 77 """ 72 78 -
sasmodels/models/hardsphere.py
r4d00de6 r4d00de6 54 54 .. [#] J K Percus, J Yevick, *J. Phys. Rev.*, 110, (1958) 1 55 55 56 Source 57 ------ 58 59 `hardsphere.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hardsphere.py>`_ 60 56 61 Authorship and Verification 57 62 ---------------------------- … … 60 65 * **Last Modified by:** 61 66 * **Last Reviewed by:** 67 * **Source added by :** Steve King **Date:** March 25, 2019 62 68 """ 63 69 -
sasmodels/models/hayter_msa.py
r4d00de6 r4d00de6 63 63 .. [#] C G Malmberg and A A Maryott, *J. Res. Nat. Bureau Standards*, 56 (1956) 2641 64 64 65 Source 66 ------ 67 68 `hayter_msa.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hayter_msa.py>`_ 69 70 `hayter_msa.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hayter_msa.c>`_ 71 65 72 Authorship and Verification 66 73 ---------------------------- … … 69 76 * **Last Modified by:** 70 77 * **Last Reviewed by:** Steve King **Date:** March 28, 2019 78 * **Source added by :** Steve King **Date:** March 25, 2019 71 79 """ 72 80 -
sasmodels/models/hollow_cylinder.py
rc1e44e5 ra34b811 62 62 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 63 63 64 Source 65 ------ 66 67 `hollow_cylinder.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hollow_cylinder.py>`_ 68 69 `hollow_cylinder.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hollow_cylinder.c>`_ 70 64 71 Authorship and Verification 65 72 ---------------------------- … … 69 76 (corrected VR calculation) 70 77 * **Last Reviewed by:** Paul Butler **Date:** September 06, 2018 78 * **Source added by :** Steve King **Date:** March 25, 2019 71 79 """ 72 80 from __future__ import division -
sasmodels/models/hollow_rectangular_prism.py
rc1e44e5 ra34b811 100 100 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 101 101 102 Source 103 ------ 104 105 `hollow_rectangular_prism.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hollow_rectangular_prism.py>`_ 106 107 `hollow_rectangular_prism.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hollow_rectangular_prism.c>`_ 108 102 109 Authorship and Verification 103 110 ---------------------------- … … 106 113 * **Last Modified by:** Paul Kienzle **Date:** December 14, 2017 107 114 * **Last Reviewed by:** Paul Butler **Date:** September 06, 2018 115 * **Source added by :** Steve King **Date:** March 25, 2019 108 116 """ 109 117 -
sasmodels/models/hollow_rectangular_prism_thin_walls.py
rc1e44e5 ra34b811 74 74 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 75 75 76 Source 77 ------ 78 79 `hollow_rectangular_prism_thin_walls.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hollow_rectangular_prism_thin_walls.py>`_ 80 81 `hollow_rectangular_prism_thin_walls.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/hollow_rectangular_prism_thin_walls.c>`_ 82 76 83 Authorship and Verification 77 84 ---------------------------- … … 80 87 * **Last Modified by:** Paul Kienzle **Date:** October 15, 2016 81 88 * **Last Reviewed by:** Paul Butler **Date:** September 07, 2018 89 * **Source added by :** Steve King **Date:** March 25, 2019 82 90 """ 83 91 -
sasmodels/models/lamellar.py
rc1e44e5 r0507e09 43 43 .. [#] J Berghausen, J Zipfel, P Lindner, W Richtering, *J. Phys. Chem. B*, 105, (2001) 11081-11088 44 44 45 Source 46 ------ 47 48 `lamellar.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lamellar.py>`_ 49 45 50 Authorship and Verification 46 51 ---------------------------- 47 52 48 * **Author:** 49 * **Last Modified by:** 50 * **Last Reviewed by:** 53 * **Author:** 54 * **Last Modified by:** 55 * **Last Reviewed by:** 56 * **Source added by :** Steve King **Date:** March 25, 2019 51 57 """ 52 58 -
sasmodels/models/lamellar_hg.py
rc1e44e5 r0507e09 45 45 .. [#] J Berghausen, J Zipfel, P Lindner, W Richtering, *J. Phys. Chem. B*, 105, (2001) 11081-11088 46 46 47 Source 48 ------ 49 50 `lamellar_hg.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lamellar_hg.py>`_ 51 47 52 Authorship and Verification 48 53 ---------------------------- 49 54 50 * **Author:** 51 * **Last Modified by:** 55 * **Author:** 56 * **Last Modified by:** 52 57 * **Last Reviewed by:** S King and P Butler **Date** April 17, 2014 58 * **Source added by :** Steve King **Date:** March 25, 2019 53 59 """ 54 60 -
sasmodels/models/lamellar_hg_stack_caille.py
rc1e44e5 r0507e09 72 72 .. [#] J Berghausen, J Zipfel, P Lindner, W Richtering, *J. Phys. Chem. B*, 105, (2001) 11081-11088 73 73 74 Source 75 ------ 76 77 `lamellar_hg_stack_caille.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lamellar_hg_stack_caille.py>`_ 78 79 `lamellar_hg_stack_caille.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lamellar_hg_stack_caille.c>`_ 80 74 81 Authorship and Verification 75 82 ---------------------------- 76 83 77 * **Author:** 78 * **Last Modified by:** 79 * **Last Reviewed by:** 84 * **Author:** 85 * **Last Modified by:** 86 * **Last Reviewed by:** 87 * **Source added by :** Steve King **Date:** March 25, 2019 80 88 """ 81 89 -
sasmodels/models/lamellar_stack_caille.py
rc1e44e5 r0507e09 68 68 .. [#] J Berghausen, J Zipfel, P Lindner, W Richtering, *J. Phys. Chem. B*, 105, (2001) 11081-11088 69 69 70 Source 71 ------ 72 73 `lamellar_stack_caille.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lamellar_stack_caille.py>`_ 74 75 `lamellar_stack_caille.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lamellar_stack_caille.c>`_ 76 70 77 Authorship and Verification 71 78 ---------------------------- 72 79 73 * **Author:** 74 * **Last Modified by:** 75 * **Last Reviewed by:** 80 * **Author:** 81 * **Last Modified by:** 82 * **Last Reviewed by:** 83 * **Source added by :** Steve King **Date:** March 25, 2019 76 84 """ 77 85 -
sasmodels/models/lamellar_stack_paracrystal.py
rc1e44e5 r0507e09 90 90 .. [#] M Bergstrom, J S Pedersen, P Schurtenberger, S U Egelhaaf, *J. Phys. Chem. B*, 103 (1999) 9888-9897 91 91 92 Source 93 ------ 94 95 `lamellar_stack_paracrystal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lamellar_stack_paracrystal.py>`_ 96 97 `lamellar_stack_paracrystal.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lamellar_stack_paracrystal.c>`_ 98 92 99 Authorship and Verification 93 100 ---------------------------- 94 101 95 * **Author:** 96 * **Last Modified by:** 97 * **Last Reviewed by:** 102 * **Author:** 103 * **Last Modified by:** 104 * **Last Reviewed by:** 105 * **Source added by :** Steve King **Date:** March 25, 2019 98 106 """ 99 107 import numpy as np -
sasmodels/models/line.py
rc1e44e5 r0507e09 23 23 None. 24 24 25 Source 26 ------ 27 28 `line.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/line.py>`_ 29 25 30 Authorship and Verification 26 31 ---------------------------- 27 32 28 * **Author:** 29 * **Last Modified by:** 30 * **Last Reviewed by:** 31 """33 * **Author:** 34 * **Last Modified by:** 35 * **Last Reviewed by:** 36 * **Source added by :** Steve King **Date:** March 25, 2019""" 32 37 33 38 import numpy as np -
sasmodels/models/linear_pearls.py
rc1e44e5 r0507e09 31 31 .. [#] A V Dobrynin, M Rubinstein and S P Obukhov, *Macromol.*, 29 (1996) 2974-2979 32 32 33 Source 34 ------ 35 36 `linear_pearls.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/linear_pearls.py>`_ 37 38 `linear_pearls.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/linear_pearls.c>`_ 39 33 40 Authorship and Verification 34 41 ---------------------------- 35 42 36 * **Author:** 37 * **Last Modified by:** 38 * **Last Reviewed by:** 39 """43 * **Author:** 44 * **Last Modified by:** 45 * **Last Reviewed by:** 46 * **Source added by :** Steve King **Date:** March 25, 2019""" 40 47 41 48 import numpy as np -
sasmodels/models/lorentz.py
rc1e44e5 r0507e09 22 22 .. [#] L.S. Qrnstein and F. Zernike, *Proc. Acad. Sci. Amsterdam* 17, 793 (1914), and *Z. Phys.* 19, 134 (1918), and 27, 761 {1926); referred to as QZ. 23 23 24 Source 25 ------ 26 27 `lorentz.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/lorentz.py>`_ 28 24 29 Authorship and Verification 25 30 ---------------------------- 26 31 27 * **Author:** 28 * **Last Modified by:** 29 * **Last Reviewed by:** 30 """32 * **Author:** 33 * **Last Modified by:** 34 * **Last Reviewed by:** 35 * **Source added by :** Steve King **Date:** March 25, 2019""" 31 36 32 37 import numpy as np -
sasmodels/models/mass_fractal.py
rc1e44e5 r0507e09 51 51 .. [#] D Mildner and P Hall, *J. Phys. D: Appl. Phys.*, 19 (1986) 1535-1545 Equation(9) 52 52 53 Source 54 ------ 55 56 `mass_fractal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/mass_fractal.py>`_ 57 58 `mass_fractal.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/mass_fractal.c>`_ 59 53 60 Authorship and Verification 54 61 ---------------------------- 55 62 56 * **Author:** 57 * **Last Modified by:** 58 * **Last Reviewed by:** 59 """63 * **Author:** 64 * **Last Modified by:** 65 * **Last Reviewed by:** 66 * **Source added by :** Steve King **Date:** March 25, 2019""" 60 67 61 68 import numpy as np -
sasmodels/models/mass_surface_fractal.py
rc1e44e5 r0507e09 55 55 35 (1987) 2361-2364 Equation(2) 56 56 57 Source 58 ------ 59 60 `mass_surface_fractal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/mass_surface_fractal.py>`_ 61 62 `mass_surface_fractal.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/mass_surface_fractal.c>`_ 63 57 64 Authorship and Verification 58 65 ---------------------------- 59 66 60 67 * **Author:** Piotr Rozyczko **Date:** Jan 20, 2016 61 * **Last Modified by:** 68 * **Last Modified by:** 62 69 * **Last Reviewed by:** Richard Heenan **Date:** May 30, 2018 70 * **Source added by :** Steve King **Date:** March 25, 2019 63 71 """ 64 72 -
sasmodels/models/mono_gauss_coil.py
rc1e44e5 ra34b811 49 49 .. [#] http://www.ncnr.nist.gov/staff/hammouda/distance_learning/chapter_28.pdf 50 50 51 Source 52 ------ 53 54 `mono_gauss_coil.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/mono_gauss_coil.py>`_ 55 56 `mono_gauss_coil.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/mono_gauss_coil.c>`_ 57 51 58 Authorship and Verification 52 59 ---------------------------- … … 55 62 * **Last Modified by:** 56 63 * **Last Reviewed by:** 57 """64 * **Source added by :** Steve King **Date:** March 25, 2019""" 58 65 59 66 import numpy as np -
sasmodels/models/multilayer_vesicle.py
rc1e44e5 rdb1d9d5 100 100 R Zana and M Dekker, New York, (1987). 101 101 102 Source 103 ------ 104 105 `multilayer_vesicle.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/multilayer_vesicle.py>`_ 106 107 `multilayer_vesicle.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/multilayer_vesicle.c>`_ 108 102 109 Authorship and Verification 103 110 ---------------------------- … … 107 114 * **Last Modified by:** Paul Kienzle **Date:** Feb 7, 2017 108 115 * **Last Reviewed by:** Steve King **Date:** March 28, 2019 116 * **Source added by :** Steve King **Date:** March 25, 2019 109 117 """ 110 118 -
sasmodels/models/onion.py
rc1e44e5 rdb1d9d5 187 187 .. [#] L A Feigin and D I Svergun, *Structure Analysis by Small-Angle X-Ray and Neutron Scattering*, Plenum Press, New York, 1987. 188 188 189 Source 190 ------ 191 192 `onion.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/onion.py>`_ 193 194 `onion.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/onion.c>`_ 195 189 196 Authorship and Verification 190 197 ---------------------------- … … 193 200 * **Last Modified by:** 194 201 * **Last Reviewed by:** Steve King **Date:** March 28, 2019 202 * **Source added by :** Steve King **Date:** March 25, 2019 195 203 """ 196 204 -
sasmodels/models/parallelepiped.py
rc1e44e5 ra34b811 182 182 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 183 183 184 Source 185 ------ 186 187 `parallelepiped.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/parallelepiped.py>`_ 188 189 `parallelepiped.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/parallelepiped.c>`_ 190 184 191 Authorship and Verification 185 192 ---------------------------- … … 189 196 * **Last Reviewed by:** Miguel Gonzales and Paul Butler **Date:** May 24, 190 197 2018 - documentation updated 198 * **Source added by :** Steve King **Date:** March 25, 2019 191 199 """ 192 200 -
sasmodels/models/peak_lorentz.py
rc1e44e5 r0507e09 27 27 None. 28 28 29 Source 30 ------ 31 32 `peak_lorentz.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/peak_lorentz.py>`_ 33 34 `peak_lorentz.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/peak_lorentz.c>`_ 35 29 36 Authorship and Verification 30 37 ---------------------------- 31 38 32 * **Author:** 33 * **Last Modified by:** 34 * **Last Reviewed by:** 39 * **Author:** 40 * **Last Modified by:** 41 * **Last Reviewed by:** 42 * **Source added by :** Steve King **Date:** March 25, 2019 35 43 """ 36 44 -
sasmodels/models/pearl_necklace.py
rc1e44e5 rdb1d9d5 55 55 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 56 56 57 Source 58 ------ 59 60 `pearl_necklace.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/pearl_necklace.py>`_ 61 62 `pearl_necklace.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/pearl_necklace.c>`_ 63 57 64 Authorship and Verification 58 65 ---------------------------- … … 61 68 * **Last Modified by:** Andrew Jackson **Date:** March 28, 2019 62 69 * **Last Reviewed by:** Steve King **Date:** March 28, 2019 70 * **Source added by :** Steve King **Date:** March 25, 2019 63 71 """ 64 72 -
sasmodels/models/poly_gauss_coil.py
rc1e44e5 ra34b811 48 48 .. [#] http://www.ncnr.nist.gov/staff/hammouda/distance_learning/chapter_28.pdf 49 49 50 Source 51 ------ 52 53 `poly_gauss_coil.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/poly_gauss_coil.py>`_ 54 55 `poly_gauss_coil.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/poly_gauss_coil.c>`_ 56 50 57 Authorship and Verification 51 58 ---------------------------- … … 54 61 * **Last Modified by:** 55 62 * **Last Reviewed by:** 63 * **Source added by :** Steve King **Date:** March 25, 2019 56 64 """ 57 65 -
sasmodels/models/polymer_excl_volume.py
rc1e44e5 r0507e09 113 113 .. [#] B Hammouda & M-H Kim, *The empirical core-chain model* 247 (2017) 434-440 114 114 115 Source 116 ------ 117 118 `polymer_excl_volume.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/polymer_excl_volume.py>`_ 119 120 `polymer_excl_volume.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/polymer_excl_volume.c>`_ 121 115 122 Authorship and Verification 116 123 ---------------------------- 117 124 118 * **Author:** 119 * **Last Modified by:** 120 * **Last Reviewed by:** 125 * **Author:** 126 * **Last Modified by:** 127 * **Last Reviewed by:** 128 * **Source added by :** Steve King **Date:** March 25, 2019 121 129 """ 122 130 -
sasmodels/models/polymer_micelle.py
rc1e44e5 r0507e09 70 70 .. [#] J Pedersen, *J. Appl. Cryst.*, 33 (2000) 637-640 71 71 72 Source 73 ------ 74 75 `polymer_micelle.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/polymer_micelle.py>`_ 76 77 `polymer_micelle.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/polymer_micelle.c>`_ 78 72 79 Authorship and Verification 73 80 ---------------------------- … … 76 83 * **Last modified by:** Paul Kienzle **Date:** November 29, 2017 77 84 * **Last reviewed by:** Steve King **Date:** November 30, 2017 85 * **Source added by :** Steve King **Date:** March 25, 2019 78 86 """ 79 87 -
sasmodels/models/porod.py
rc1e44e5 r0507e09 21 21 .. [#] L A Feigin, D I Svergun, G W Taylor. *Structure Analysis by Small-Angle X-ray and Neutron Scattering*. Springer. (1987) 22 22 23 Source 24 ------ 25 26 `porod.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/porod.py>`_ 27 23 28 Authorship and Verification 24 29 ---------------------------- 25 30 26 * **Author:** 27 * **Last Modified by:** 28 * **Last Reviewed by:** 31 * **Author:** 32 * **Last Modified by:** 33 * **Last Reviewed by:** 34 * **Source added by :** Steve King **Date:** March 25, 2019 29 35 """ 30 36 -
sasmodels/models/power_law.py
rc1e44e5 r0507e09 26 26 None. 27 27 28 Source 29 ------ 30 31 `power_law.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/power_law.py>`_ 32 28 33 Authorship and Verification 29 34 ---------------------------- 30 35 31 * **Author:** 32 * **Last Modified by:** 33 * **Last Reviewed by:** 36 * **Author:** 37 * **Last Modified by:** 38 * **Last Reviewed by:** 39 * **Source added by :** Steve King **Date:** March 25, 2019 34 40 """ 35 41 -
sasmodels/models/pringle.py
rc1e44e5 ra34b811 43 43 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 44 44 45 Source 46 ------ 47 48 `pringle.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/pringle.py>`_ 49 50 `pringle.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/pringle.c>`_ 51 45 52 Authorship and Verification 46 53 ---------------------------- … … 49 56 * **Last Modified by:** Wojciech Wpotrzebowski **Date:** March 20, 2016 50 57 * **Last Reviewed by:** Andrew Jackson **Date:** September 26, 2016 58 * **Source added by :** Steve King **Date:** March 25, 2019 51 59 """ 52 60 -
sasmodels/models/raspberry.py
rc1e44e5 ra34b811 100 100 .. [#] K Larson-Smith, A Jackson, and D C Pozzo, *Small angle scattering model for Pickering emulsions and raspberry particles*, *Journal of Colloid and Interface Science*, 343(1) (2010) 36-41 101 101 102 Source 103 ------ 104 105 `raspberry.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/raspberry.py>`_ 106 107 `raspberry.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/raspberry.c>`_ 108 102 109 Authorship and Verification 103 110 ---------------------------- … … 106 113 * **Last Modified by:** Andrew Jackson **Date:** March 20, 2016 107 114 * **Last Reviewed by:** Andrew Jackson **Date:** March 20, 2016 115 * **Source added by :** Steve King **Date:** March 25, 2019 108 116 """ 109 117 -
sasmodels/models/rectangular_prism.py
rc1e44e5 ra34b811 100 100 .. [#] L. Onsager, *Ann. New York Acad. Sci.*, 51 (1949) 627-659 101 101 102 Source 103 ------ 104 105 `rectangular_prism.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/rectangular_prism.py>`_ 106 107 `rectangular_prism.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/rectangular_prism.c>`_ 108 102 109 Authorship and Verification 103 110 ---------------------------- … … 106 113 * **Last Modified by:** 107 114 * **Last Reviewed by:** 115 * **Source added by :** Steve King **Date:** March 25, 2019 108 116 """ 109 117 -
sasmodels/models/rpa.py
rc1e44e5 rdb1d9d5 67 67 .. [#] B. Hammouda, *SANS Toolbox* https://www.ncnr.nist.gov/staff/hammouda/the_sans_toolbox.pdf. 68 68 69 Source 70 ------ 71 72 `rpa.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/rpa.py>`_ 73 74 `rpa.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/rpa.c>`_ 75 69 76 Authorship and Verification 70 77 ---------------------------- … … 74 81 * **Last Modified by:** Paul Butler **Date:** March 12, 2017 75 82 * **Last Reviewed by:** Steve King **Date:** March 27, 2019 83 * **Source added by :** Steve King **Date:** March 25, 2019 76 84 """ 77 85 -
sasmodels/models/sc_paracrystal.py
rc1e44e5 r0507e09 101 101 .. [#CIT1990] Hideki Matsuoka et. al. *Physical Review B*, 41 (1990) 3854 -3856 (Corrections to FCC and BCC lattice structure calculation) 102 102 103 Source 104 ------ 105 106 `sc_paracrystal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/sc_paracrystal.py>`_ 107 108 `sc_paracrystal.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/sc_paracrystal.c>`_ 109 103 110 Authorship and Verification 104 111 --------------------------- … … 107 114 * **Last Modified by:** Steve King **Date:** March 25, 2019 108 115 * **Last Reviewed by:** Richard Heenan **Date:** March 21, 2016 116 * **Source added by :** Steve King **Date:** March 25, 2019 109 117 """ 110 118 -
sasmodels/models/sphere.py
r934a001 r934a001 36 36 References 37 37 ---------- 38 38 39 39 .. [#] A Guinier and G. Fournet, *Small-Angle Scattering of X-Rays*, 40 40 John Wiley and Sons, New York, (1955) 41 42 Source 43 ------ 44 45 `sphere.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/sphere.py>`_ 46 47 `sphere.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/sphere.c>`_ 41 48 42 49 Authorship and Verification … … 46 53 * **Last Modified by:** 47 54 * **Last Reviewed by:** S King and P Parker **Date:** 2013/09/09 and 2014/01/06 55 * **Source added by :** Steve King **Date:** March 25, 2019 48 56 """ 49 57 … … 85 93 #2345678901234567890123456789012345678901234567890123456789012345678901234567890 86 94 tests = [ 87 [{}, 0.2, 0.726362], # each test starts with default parameter values 95 [{}, 0.2, 0.726362], # each test starts with default parameter values 88 96 # inside { }, unless modified. Then Q and expected value of I(Q) 89 # putting None for an expected result will pass the test if there are no 97 # putting None for an expected result will pass the test if there are no 90 98 # errors from the routine, but without any check on the value of the result 91 99 [{"scale": 1., "background": 0., "sld": 6., "sld_solvent": 1., 92 "radius": 120.}, [0.01,0.1,0.2], 100 "radius": 120.}, [0.01,0.1,0.2], 93 101 [1.34836265e+04, 6.20114062e+00, 1.04733914e-01]], 94 102 [{"scale": 1., "background": 0., "sld": 6., "sld_solvent": 1., 95 # careful tests here R=120 Pd=.2, then with S(Q) at default Reff=50 103 # careful tests here R=120 Pd=.2, then with S(Q) at default Reff=50 96 104 # (but this gets changed to 120) phi=0,2 97 105 "radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 98 [0.01,0.1,0.2], [1.74395295e+04, 3.68016987e+00, 2.28843099e-01]], 106 [0.01,0.1,0.2], [1.74395295e+04, 3.68016987e+00, 2.28843099e-01]], 99 107 # a list of Q values and list of expected results is also possible 100 108 [{"scale": 1., "background": 0., "sld": 6., "sld_solvent": 1., 101 109 "radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 102 0.01, 335839.88055473, 1.41045057e+11, 120.0, 8087664.122641933, 1.0], 103 # the longer list here checks F1, F2, R_eff, volume, volume_ratio 110 0.01, 335839.88055473, 1.41045057e+11, 120.0, 8087664.122641933, 1.0], 111 # the longer list here checks F1, F2, R_eff, volume, volume_ratio 104 112 [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 105 0.1, 482.93824329, 29763977.79867414, 120.0, 8087664.122641933, 1.0], 113 0.1, 482.93824329, 29763977.79867414, 120.0, 8087664.122641933, 1.0], 106 114 [{"radius": 120., "radius_pd": 0.2, "radius_pd_n":45}, 107 115 0.2, 1.23330406, 1850806.1197361, 120.0, 8087664.122641933, 1.0], 108 116 # But note P(Q) = F2/volume 109 # F and F^2 are "unscaled", with for n <F F*>S(q) or for beta approx 117 # F and F^2 are "unscaled", with for n <F F*>S(q) or for beta approx 110 118 # I(q) = n [<F F*> + <F><F*> (S(q) - 1)] 111 # for n the number density and <.> the orientation average, and 119 # for n the number density and <.> the orientation average, and 112 120 # F = integral rho(r) exp(i q . r) dr. 113 121 # The number density is volume fraction divided by particle volume. 114 # Effectively, this leaves F = V drho form, where form is the usual 122 # Effectively, this leaves F = V drho form, where form is the usual 115 123 # 3 j1(qr)/(qr) or whatever depending on the shape. 116 124 # @S RESULTS using F1 and F2 from the longer test strng above: … … 120 128 # with by default scale=1.0, background=0.001 121 129 # NOTE currently S(Q) volfraction is also included in scaling 122 # structure_factor_mode 0 = normal decoupling approx, 130 # structure_factor_mode 0 = normal decoupling approx, 123 131 # 1 = beta(Q) approx 124 # radius_effective_mode 0 is for free choice, 132 # radius_effective_mode 0 is for free choice, 125 133 # 1 is use radius from F2(Q) 126 134 # (sphere only has two choices, other models may have more) … … 128 136 "radius": 120., "radius_pd": 0.2, "radius_pd_n":45,"volfraction":0.2, 129 137 #"radius_effective":50.0, # hard sphere structure factor 130 "structure_factor_mode": 1, # mode 0 = normal decoupling approx, 138 "structure_factor_mode": 1, # mode 0 = normal decoupling approx, 131 139 # 1 = beta(Q) approx 132 "radius_effective_mode": 0 # this used default hardsphere Reff=50 140 "radius_effective_mode": 0 # this used default hardsphere Reff=50 133 141 }, [0.01,0.1,0.2], [1.32473756e+03, 7.36633631e-01, 4.67686201e-02] ], 134 142 [{"@S": "hardsphere", … … 137 145 "radius_effective":45.0, # explicit Reff over rides either 50 or 120 138 146 "structure_factor_mode": 1, # beta approx 139 "radius_effective_mode": 0 # 147 "radius_effective_mode": 0 # 140 148 }, 0.01, 1316.2990966463444 ], 141 149 [{"@S": "hardsphere", … … 144 152 "radius_effective":120.0, # over ride Reff 145 153 "structure_factor_mode": 1, # beta approx 146 "radius_effective_mode": 0 # (mode=1 here also uses 120) 154 "radius_effective_mode": 0 # (mode=1 here also uses 120) 147 155 }, [0.01,0.1,0.2], [1.57928589e+03, 7.37067923e-01, 4.67686197e-02 ]], 148 156 [{"@S": "hardsphere", -
sasmodels/models/spherical_sld.py
rc1e44e5 r627b68b 187 187 and Neutron Scattering, Plenum Press, New York, (1987) 188 188 189 Source 190 ------ 191 192 `spherical_sld.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/spherical_sld.py>`_ 193 194 `spherical_sld.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/spherical_sld.c>`_ 195 189 196 Authorship and Verification 190 197 --------------------------- … … 193 200 * **Last Modified by:** Paul Kienzle **Date:** Dec 20, 2016 194 201 * **Last Reviewed by:** Steve King **Date:** March 29, 2019 202 * **Source added by :** Steve King **Date:** March 25, 2019 195 203 """ 196 204 -
sasmodels/models/spinodal.py
rc1e44e5 r0507e09 44 44 .. [#] T. Hashimoto, M. Takenaka & H. Jinnai. Scattering Studies of Self-Assembling Processes of Polymer Blends in Spinodal Decomposition. J. Appl. Cryst. 24, 457-466 (1991). 45 45 46 Source 47 ------ 48 49 `spinodal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/spinodal.py>`_ 50 46 51 Authorship and Verification 47 52 ---------------------------- … … 50 55 * **Last Modified by:** Steve King **Date:** Oct 25, 2018 51 56 * **Last Reviewed by:** Steve King **Date:** Oct 25, 2018 57 * **Source added by :** Steve King **Date:** March 25, 2019 52 58 """ 53 59 -
sasmodels/models/squarewell.py
r4d00de6 r4d00de6 54 54 .. [#] M Kotlarchyk and S-H Chen, *J. Chem. Phys.*, 79 (1983) 2461-2469 55 55 56 Source 57 ------ 58 59 `squarewell.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/squarewell.py>`_ 60 56 61 Authorship and Verification 57 62 ---------------------------- … … 60 65 * **Last Modified by:** 61 66 * **Last Reviewed by:** Steve King **Date:** March 27, 2019 67 * **Source added by :** Steve King **Date:** March 25, 2019 62 68 """ 63 69 -
sasmodels/models/stacked_disks.py
rc1e44e5 r0507e09 102 102 John Wiley and Sons, New York, 1955 103 103 104 Source 105 ------ 106 107 `stacked_disks.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/stacked_disks.py>`_ 108 109 `stacked_disks.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/stacked_disks.c>`_ 110 104 111 Authorship and Verification 105 112 ---------------------------- … … 108 115 * **Last Modified by:** Paul Butler and Paul Kienzle **Date:** November 26, 2016 109 116 * **Last Reviewed by:** Paul Butler and Paul Kienzle **Date:** November 26, 2016 117 * **Source added by :** Steve King **Date:** March 25, 2019 110 118 """ 111 119 -
sasmodels/models/star_polymer.py
rc1e44e5 r0507e09 50 50 B Ewen *Macromolecules*, 22, 468-472 (1989) 51 51 52 Source 53 ------ 54 55 `star_polymer.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/star_polymer.py>`_ 56 57 `star_polymer.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/star_polymer.c>`_ 58 52 59 Authorship and Verification 53 60 ---------------------------- … … 56 63 * **Last Modified by:** Paul Butler **Date:** Auguts 26, 2017 57 64 * **Last Reviewed by:** Ziang Li and Richard Heenan **Date:** May 17, 2017 65 * **Source added by :** Steve King **Date:** March 25, 2019 58 66 """ 59 67 -
sasmodels/models/stickyhardsphere.py
r4d00de6 r4d00de6 78 78 .. [#] M Kotlarchyk and S-H Chen, *J. Chem. Phys.*, 79 (1983) 2461-2469 79 79 80 Source 81 ------ 82 83 `stickyhardsphere.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/stickyhardsphere.py>`_ 84 80 85 Authorship and Verification 81 86 ---------------------------- … … 84 89 * **Last Modified by:** 85 90 * **Last Reviewed by:** Steve King **Date:** March 27, 2019 91 * **Source added by :** Steve King **Date:** March 25, 2019 86 92 """ 87 93 -
sasmodels/models/surface_fractal.py
rc1e44e5 r0507e09 38 38 .. [#] D Mildner and P Hall, *J. Phys. D: Appl. Phys.*, 19 (1986) 1535-1545 39 39 40 Source 41 ------ 42 43 `surface_fractal.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/surface_fractal.py>`_ 44 45 `surface_fractal.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/surface_fractal.c>`_ 46 40 47 Authorship and Verification 41 48 ---------------------------- 42 49 43 * **Author:** 44 * **Last Modified by:** 45 * **Last Reviewed by:** 50 * **Author:** 51 * **Last Modified by:** 52 * **Last Reviewed by:** 53 * **Source added by :** Steve King **Date:** March 25, 2019 46 54 """ 47 55 -
sasmodels/models/teubner_strey.py
rc1e44e5 r0507e09 65 65 .. [#] H Endo, M Mihailescu, M. Monkenbusch, J Allgaier, G Gompper, D Richter, B Jakobs, T Sottmann, R Strey, and I Grillo, *J. Chem. Phys.*, 115 (2001), 580 66 66 67 Source 68 ------ 69 70 `teubner_strey.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/teubner_strey.py>`_ 71 72 `teubner_strey.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/teubner_strey.c>`_ 73 67 74 Authorship and Verification 68 75 ---------------------------- 69 76 70 * **Author:** 71 * **Last Modified by:** 72 * **Last Reviewed by:** 77 * **Author:** 78 * **Last Modified by:** 79 * **Last Reviewed by:** 80 * **Source added by :** Steve King **Date:** March 25, 2019 73 81 """ 74 82 from __future__ import division -
sasmodels/models/triaxial_ellipsoid.py
rc1e44e5 ra34b811 116 116 .. [#] Finnigan, J.A., Jacobs, D.J., 1971. *Light scattering by ellipsoidal particles in solution*, J. Phys. D: Appl. Phys. 4, 72-77. doi:10.1088/0022-3727/4/1/310 117 117 118 Source 119 ------ 120 121 `triaxial_ellipsoid.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/triaxial_ellipsoid.py>`_ 122 123 `triaxial_ellipsoid.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/triaxial_ellipsoid.c>`_ 124 118 125 Authorship and Verification 119 126 ---------------------------- … … 122 129 * **Last Modified by:** Paul Kienzle (improved calculation) **Date:** April 4, 2017 123 130 * **Last Reviewed by:** Paul Kienzle & Richard Heenan **Date:** April 4, 2017 131 * **Source added by :** Steve King **Date:** March 25, 2019 124 132 """ 125 133 -
sasmodels/models/two_lorentzian.py
rc1e44e5 r0507e09 27 27 None. 28 28 29 Source 30 ------ 31 32 `two_lorentzian.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/two_lorentzian.py>`_ 33 29 34 Authorship and Verification 30 35 ---------------------------- … … 33 38 * **Last Modified by:** Piotr rozyczko **Date:** January 29, 2016 34 39 * **Last Reviewed by:** Paul Butler **Date:** March 21, 2016 40 * **Source added by :** Steve King **Date:** March 25, 2019 35 41 """ 36 42 -
sasmodels/models/two_power_law.py
rc1e44e5 r0507e09 37 37 None. 38 38 39 Source 40 ------ 41 42 `two_power_law.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/two_power_law.py>`_ 43 39 44 Authorship and Verification 40 45 ---------------------------- … … 43 48 * **Last Modified by:** Wojciech Wpotrzebowski **Date:** February 18, 2016 44 49 * **Last Reviewed by:** Paul Butler **Date:** March 21, 2016 50 * **Source added by :** Steve King **Date:** March 25, 2019 45 51 """ 46 52 -
sasmodels/models/unified_power_Rg.py
rb606805 rb606805 67 67 .. [#] B Hammouda, *Analysis of the Beaucage model, J. Appl. Cryst.*, (2010), 43, 1474-1478 68 68 69 Source 70 ------ 71 72 `unified_power_Rg.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/unified_power_Rg.py>`_ 73 69 74 Authorship and Verification 70 75 ---------------------------- 71 76 72 * **Author:** 73 * **Last Modified by:** 74 * **Last Reviewed by:** 77 * **Author:** 78 * **Last Modified by:** 79 * **Last Reviewed by:** 80 * **Source added by :** Steve King **Date:** March 25, 2019 75 81 """ 76 82 -
sasmodels/models/vesicle.py
rc1e44e5 ra34b811 60 60 Sons, New York, (1955) 61 61 62 Source 63 ------ 64 65 `vesicle.py <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/vesicle.py>`_ 66 67 `vesicle.c <https://github.com/SasView/sasmodels/blob/master/sasmodels/models/vesicle.c>`_ 68 62 69 Authorship and Verification 63 70 ---------------------------- … … 66 73 * **Last Modified by:** Paul Butler **Date:** March 20, 2016 67 74 * **Last Reviewed by:** Paul Butler **Date:** September 7, 2018 75 * **Source added by :** Steve King **Date:** March 25, 2019 68 76 """ 69 77
Note: See TracChangeset
for help on using the changeset viewer.