[sasmodels] 01/09: Merge tag 'upstream/0.97_git20171104'
Stuart Prescott
stuart at debian.org
Mon Nov 6 11:23:35 UTC 2017
This is an automated email from the git hooks/post-receive script.
stuart pushed a commit to branch master
in repository sasmodels.
commit 24704c0c9d93f94c06bbc494396e94f3f4ceb69d
Merge: d97b543 a71e9df
Author: Stuart Prescott <stuart at debian.org>
Date: Sat Nov 4 13:29:19 2017 +1100
Merge tag 'upstream/0.97_git20171104'
Upstream version 0.97~git20171104
# gpg: Signature made Sat 04 Nov 2017 13:29:14 AEDT
# gpg: using RSA key 90E2D2C1AD146A1B7EBB891DBBC17EBB1396F2F7
# gpg: Good signature from "Stuart Prescott <stuart at nanonanonano.net>" [ultimate]
# gpg: aka "Stuart Prescott <stuart+debian at nanonanonano.net>" [ultimate]
# gpg: aka "Stuart Prescott <stuart at debian.org>" [ultimate]
.gitattributes | 5 +
.gitignore | 4 +-
.travis.yml | 67 +-
.travis/travis_rsa.enc | Bin 0 -> 1680 bytes
LICENSE.txt | 15 +-
appveyor.yml | 78 ++
deploy.sh | 8 +
doc/conf.py | 5 +
doc/developer/calculator.rst | 8 +-
doc/developer/index.rst | 1 +
doc/developer/overview.rst | 252 +++++
doc/genapi.py | 24 +-
doc/genmodel.py | 2 +
doc/gentoc.py | 41 +-
doc/guide/gpu_setup.rst | 156 +++
doc/guide/index.rst | 57 +-
doc/guide/install.rst | 54 +
doc/guide/intro.rst | 59 ++
doc/guide/magnetism/mag_img/M_angles_pic.png | Bin 0 -> 116924 bytes
doc/guide/magnetism/mag_img/mag_vector.png | Bin 0 -> 39047 bytes
doc/{ref => guide}/magnetism/magnetism.rst | 33 +-
doc/guide/pd/pd_gaussian.jpg | Bin 0 -> 16860 bytes
doc/guide/pd/pd_lognormal.jpg | Bin 0 -> 13357 bytes
doc/guide/pd/pd_rectangular.jpg | Bin 0 -> 16313 bytes
doc/guide/pd/pd_schulz.jpg | Bin 0 -> 12845 bytes
doc/guide/pd/polydispersity.rst | 224 +++++
doc/guide/plugin.rst | 1039 ++++++++++++++++++++
doc/{ref => guide}/refs.rst | 0
doc/guide/resolution.rst | 294 ++++++
doc/guide/resolution_2d_rotation.png | Bin 0 -> 16767 bytes
doc/guide/scripting.rst | 116 +++
doc/{ref => guide}/sesans/SESANSinSASVIEW.pdf | Bin
doc/guide/sesans/sans_to_sesans.rst | 32 +
doc/{ref => guide}/sesans/sesans_fitting.rst | 289 +++---
.../sesans/sesans_img/HardSphereLineFitSasView.png | Bin
.../sesans/sesans_img/SphereLineFitSasView.png | Bin
doc/index.rst | 27 +-
doc/ref/gpu/gpu_computations.rst | 66 --
doc/ref/gpu/opencl_installation.rst | 59 --
doc/ref/index.rst | 16 -
doc/ref/intro.rst | 47 -
doc/ref/magnetism/mag_img/M_angles_pic.bmp | Bin 870118 -> 0 bytes
doc/ref/magnetism/mag_img/mag_vector.bmp | Bin 1097766 -> 0 bytes
doc/ref/sesans/sans_to_sesans.rst | 26 -
doc/rst_prolog | 49 -
example/093191_201.dat | 136 +++
example/093192_202.dat | 136 +++
example/093193_203.dat | 136 +++
example/093194_204.dat | 136 +++
example/093195_205.dat | 136 +++
example/batch_fit.py | 140 +++
example/cylinder_eval.py | 18 +
example/model.py | 10 +-
example/model_ellipsoid_hayter_msa.py | 41 +
example/oriented_usans.py | 10 +-
example/sesans_sphere_2micron.py | 94 +-
example/simul_fit.py | 61 ++
explore/J1.py | 106 --
explore/J1c.py | 103 --
explore/angular_pd.py | 4 +-
explore/cyl.py | 150 ---
explore/jitter.py | 243 +++++
explore/lgamma.py | 106 --
explore/log_gamma.py | 101 --
explore/precision.py | 601 +++++++++++
explore/sinc.py | 84 --
explore/sph_j1c.py | 145 ---
sasmodels/__init__.py | 2 +-
sasmodels/alignment.py | 1 -
sasmodels/bumps_model.py | 477 ++++-----
sasmodels/compare.py | 699 ++++++++-----
sasmodels/conversion_table.py | 23 +-
sasmodels/core.py | 95 +-
sasmodels/custom/__init__.py | 4 +-
sasmodels/data.py | 56 +-
sasmodels/direct_model.py | 15 +-
sasmodels/generate.py | 35 +-
sasmodels/kernel_header.c | 36 +-
sasmodels/kernelcl.py | 5 +-
sasmodels/kerneldll.py | 28 +-
sasmodels/kernelpy.py | 12 +-
sasmodels/list_pars.py | 130 +--
sasmodels/mixture.py | 141 ++-
sasmodels/model_test.py | 926 ++++++++---------
sasmodels/modelinfo.py | 41 +-
sasmodels/models/adsorbed_layer.py | 13 +
sasmodels/models/barbell.py | 37 +-
sasmodels/models/bcc_paracrystal.c | 10 +-
sasmodels/models/bcc_paracrystal.py | 51 +-
sasmodels/models/be_polyelectrolyte.py | 411 ++++----
sasmodels/models/binary_hard_sphere.py | 24 +-
sasmodels/models/broad_peak.py | 16 +
sasmodels/models/capped_cylinder.py | 40 +-
sasmodels/models/core_multi_shell.py | 19 +-
sasmodels/models/core_shell_bicelle.c | 45 +-
sasmodels/models/core_shell_bicelle.py | 53 +-
sasmodels/models/core_shell_bicelle_elliptical.c | 125 +--
sasmodels/models/core_shell_bicelle_elliptical.py | 116 ++-
sasmodels/models/core_shell_cylinder.py | 34 +-
sasmodels/models/core_shell_ellipsoid.py | 50 +-
sasmodels/models/core_shell_parallelepiped.c | 87 +-
sasmodels/models/core_shell_parallelepiped.py | 71 +-
sasmodels/models/core_shell_sphere.py | 30 +-
sasmodels/models/cylinder.py | 348 ++++---
sasmodels/models/dab.py | 12 +-
sasmodels/models/ellipsoid.c | 45 +-
sasmodels/models/ellipsoid.py | 84 +-
sasmodels/models/elliptical_cylinder.c | 8 +-
sasmodels/models/elliptical_cylinder.py | 58 +-
sasmodels/models/fcc_paracrystal.c | 10 +-
sasmodels/models/fcc_paracrystal.py | 45 +-
sasmodels/models/flexible_cylinder.py | 63 +-
sasmodels/models/flexible_cylinder_elliptical.py | 20 +-
sasmodels/models/fractal.py | 24 +-
sasmodels/models/fractal_core_shell.py | 28 +-
sasmodels/models/fuzzy_sphere.py | 10 +
sasmodels/models/gauss_lorentz_gel.py | 19 +-
sasmodels/models/gaussian_peak.py | 13 +-
sasmodels/models/gel_fit.c | 4 +-
sasmodels/models/gel_fit.py | 18 +
sasmodels/models/guinier.py | 126 +--
sasmodels/models/guinier_porod.py | 17 +-
sasmodels/models/hardsphere.py | 19 +-
sasmodels/models/hayter_msa.py | 26 +-
sasmodels/models/hollow_cylinder.py | 38 +-
sasmodels/models/hollow_rectangular_prism.py | 22 +-
.../models/hollow_rectangular_prism_thin_walls.py | 11 +
sasmodels/models/img/bcc_angle_definition.png | Bin 40057 -> 0 bytes
sasmodels/models/img/cylinder_angle_definition.jpg | Bin 21668 -> 0 bytes
sasmodels/models/img/cylinder_angle_definition.png | Bin 0 -> 71546 bytes
sasmodels/models/img/cylinder_angle_projection.jpg | Bin 33955 -> 0 bytes
sasmodels/models/img/cylinder_angle_projection.png | Bin 0 -> 100678 bytes
.../img/elliptical_cylinder_angle_definition.jpg | Bin 31983 -> 0 bytes
.../img/elliptical_cylinder_angle_definition.png | Bin 0 -> 82278 bytes
.../img/elliptical_cylinder_angle_projection.png | Bin 0 -> 91783 bytes
.../models/img/parallelepiped_angle_definition.jpg | Bin 32836 -> 0 bytes
.../models/img/parallelepiped_angle_definition.png | Bin 0 -> 82272 bytes
.../models/img/parallelepiped_angle_projection.jpg | Bin 33793 -> 0 bytes
.../models/img/parallelepiped_angle_projection.png | Bin 0 -> 90805 bytes
.../models/img/sc_crystal_angle_definition.jpg | Bin 33504 -> 0 bytes
.../img/triaxial_ellipsoid_angle_projection.jpg | Bin 42102 -> 0 bytes
.../img/triaxial_ellipsoid_angle_projection.png | Bin 0 -> 182306 bytes
sasmodels/models/lamellar.py | 8 +
sasmodels/models/lamellar_hg.py | 11 +
sasmodels/models/lamellar_hg_stack_caille.py | 18 +
sasmodels/models/lamellar_stack_caille.py | 15 +
sasmodels/models/lamellar_stack_paracrystal.py | 18 +-
sasmodels/models/lib/sas_3j1x_x.c | 3 +-
sasmodels/models/lib/sas_J0.c | 7 +-
sasmodels/models/lib/sas_J1.c | 89 +-
sasmodels/models/lib/sas_erf.c | 14 +-
sasmodels/models/lib/wrc_cyl.c | 495 +++-------
sasmodels/models/line.py | 172 ++--
sasmodels/models/linear_pearls.py | 17 +-
sasmodels/models/lorentz.py | 21 +-
sasmodels/models/mass_fractal.py | 26 +-
sasmodels/models/mass_surface_fractal.py | 32 +-
sasmodels/models/mono_gauss_coil.py | 196 ++--
sasmodels/models/multilayer_vesicle.py | 44 +-
sasmodels/models/onion.py | 17 +-
sasmodels/models/parallelepiped.c | 10 +-
sasmodels/models/parallelepiped.py | 507 +++++-----
sasmodels/models/peak_lorentz.py | 12 +
sasmodels/models/pearl_necklace.py | 14 +
sasmodels/models/poly_gauss_coil.py | 253 ++---
sasmodels/models/polymer_excl_volume.py | 17 +-
sasmodels/models/polymer_micelle.py | 68 +-
sasmodels/models/porod.py | 11 +
sasmodels/models/power_law.py | 9 +
sasmodels/models/pringle.py | 20 +-
sasmodels/models/raspberry.py | 20 +
sasmodels/models/rectangular_prism.py | 13 +-
sasmodels/models/rpa.py | 23 +-
sasmodels/models/sc_paracrystal.c | 10 +-
sasmodels/models/sc_paracrystal.py | 318 +++---
sasmodels/models/sphere.py | 11 +-
sasmodels/models/spherical_sld.c | 204 ++--
sasmodels/models/spherical_sld.py | 580 ++++++-----
sasmodels/models/spinodal.py | 34 +-
sasmodels/models/squarewell.py | 298 +++---
sasmodels/models/stacked_disks.py | 83 +-
sasmodels/models/star_polymer.py | 62 +-
sasmodels/models/stickyhardsphere.py | 11 +
sasmodels/models/surface_fractal.py | 20 +-
sasmodels/models/teubner_strey.py | 19 +-
sasmodels/models/triaxial_ellipsoid.c | 47 +-
sasmodels/models/triaxial_ellipsoid.py | 331 ++++---
sasmodels/models/two_lorentzian.py | 18 +
sasmodels/models/two_power_law.py | 19 +-
sasmodels/models/unified_power_Rg.py | 37 +-
sasmodels/models/vesicle.py | 14 +
sasmodels/product.py | 54 +-
sasmodels/resolution.py | 7 +-
sasmodels/rst2html.py | 124 ++-
sasmodels/sasview_model.py | 200 ++--
sasmodels/sesans.py | 11 +-
196 files changed, 10173 insertions(+), 5395 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sasmodels.git
More information about the debian-science-commits
mailing list