#
# ChangeLog for sasmodels/sasview_model.py in sasmodels
#
# Generated by Trac 1.0.1
# Apr 26, 2024 11:27:48 PM

Wed, 29 Nov 2017 18:13:23 GMT Paul Kienzle <pkienzle@…> [2d81cfe]
	* extra/pylint.rc (modified)
	* sasmodels/bumps_model.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/compare_many.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/details.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel.py (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/list_pars.py (modified)
	* sasmodels/mixture.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/__init__.py (modified)
	* sasmodels/models/_spherepy.py (modified)
	* sasmodels/models/adsorbed_layer.py (modified)
	* sasmodels/models/barbell.py (modified)
	* sasmodels/models/bcc_paracrystal.py (modified)
	* sasmodels/models/be_polyelectrolyte.py (modified)
	* sasmodels/models/binary_hard_sphere.py (modified)
	* sasmodels/models/broad_peak.py (modified)
	* sasmodels/models/capped_cylinder.py (modified)
	* sasmodels/models/core_multi_shell.py (modified)
	* sasmodels/models/core_shell_bicelle.py (modified)
	* sasmodels/models/core_shell_bicelle_elliptical.py (modified)
	* sasmodels/models/core_shell_cylinder.py (modified)
	* sasmodels/models/core_shell_ellipsoid.py (modified)
	* sasmodels/models/core_shell_parallelepiped.py (modified)
	* sasmodels/models/core_shell_sphere.py (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/models/dab.py (modified)
	* sasmodels/models/ellipsoid.py (modified)
	* sasmodels/models/elliptical_cylinder.py (modified)
	* sasmodels/models/fcc_paracrystal.py (modified)
	* sasmodels/models/flexible_cylinder.py (modified)
	* sasmodels/models/flexible_cylinder_elliptical.py (modified)
	* sasmodels/models/fractal.py (modified)
	* sasmodels/models/fractal_core_shell.py (modified)
	* sasmodels/models/fuzzy_sphere.py (modified)
	* sasmodels/models/gauss_lorentz_gel.py (modified)
	* sasmodels/models/gaussian_peak.py (modified)
	* sasmodels/models/gel_fit.py (modified)
	* sasmodels/models/guinier.py (modified)
	* sasmodels/models/guinier_porod.py (modified)
	* sasmodels/models/hardsphere.py (modified)
	* sasmodels/models/hayter_msa.py (modified)
	* sasmodels/models/hollow_cylinder.py (modified)
	* sasmodels/models/hollow_rectangular_prism.py (modified)
	* sasmodels/models/hollow_rectangular_prism_thin_walls.py (modified)
	* sasmodels/models/lamellar.py (modified)
	* sasmodels/models/lamellar_hg.py (modified)
	* sasmodels/models/lamellar_hg_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_paracrystal.py (modified)
	* sasmodels/models/line.py (modified)
	* sasmodels/models/linear_pearls.py (modified)
	* sasmodels/models/lorentz.py (modified)
	* sasmodels/models/mass_fractal.py (modified)
	* sasmodels/models/mass_surface_fractal.py (modified)
	* sasmodels/models/mono_gauss_coil.py (modified)
	* sasmodels/models/multilayer_vesicle.py (modified)
	* sasmodels/models/onion.py (modified)
	* sasmodels/models/parallelepiped.py (modified)
	* sasmodels/models/peak_lorentz.py (modified)
	* sasmodels/models/pearl_necklace.py (modified)
	* sasmodels/models/poly_gauss_coil.py (modified)
	* sasmodels/models/polymer_excl_volume.py (modified)
	* sasmodels/models/polymer_micelle.py (modified)
	* sasmodels/models/porod.py (modified)
	* sasmodels/models/power_law.py (modified)
	* sasmodels/models/pringle.py (modified)
	* sasmodels/models/raspberry.py (modified)
	* sasmodels/models/rectangular_prism.py (modified)
	* sasmodels/models/rpa.py (modified)
	* sasmodels/models/sc_paracrystal.py (modified)
	* sasmodels/models/sphere.py (modified)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/models/spinodal.py (modified)
	* sasmodels/models/squarewell.py (modified)
	* sasmodels/models/stacked_disks.py (modified)
	* sasmodels/models/star_polymer.py (modified)
	* sasmodels/models/stickyhardsphere.py (modified)
	* sasmodels/models/surface_fractal.py (modified)
	* sasmodels/models/teubner_strey.py (modified)
	* sasmodels/models/triaxial_ellipsoid.py (modified)
	* sasmodels/models/two_lorentzian.py (modified)
	* sasmodels/models/two_power_law.py (modified)
	* sasmodels/models/unified_power_Rg.py (modified)
	* sasmodels/models/vesicle.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/resolution2d.py (modified)
	* sasmodels/rst2html.py (modified)
	* sasmodels/sasview_model.py (modified)
	* sasmodels/weights.py (modified)

	lint


Tue, 28 Nov 2017 23:09:34 GMT Paul Kienzle <pkienzle@…> [e65c3ba]
	* sasmodels/__init__.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/conversion_table.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/rst2html.py (modified)
	* sasmodels/sasview_model.py (modified)
	* sasmodels/special.py (modified)

	lint


Thu, 02 Nov 2017 21:59:45 GMT Paul Kienzle <pkienzle@…> [17db833]
	* sasmodels/sasview_model.py (modified)

	fix structure factor models, so scale=1, background=0 again


Thu, 02 Nov 2017 21:44:10 GMT Paul Kienzle <pkienzle@…> [ce99754]
	* sasmodels/details.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	make sure that nominal values get into the weight vector even when
	there ...


Thu, 02 Nov 2017 19:35:12 GMT Paul Kienzle <pkienzle@…> [a06af5d]
	* sasmodels/sasview_model.py (modified)

	fix models with hidden parameters to work from sasview again


Mon, 30 Oct 2017 19:21:00 GMT Paul Kienzle <pkienzle@…> [904cd9c]
	* sasmodels/models/core_shell_parallelepiped.c (modified)
	* sasmodels/models/core_shell_parallelepiped.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)
	* LICENSE.txt (modified)
	* doc/_extensions/dollarmath.py (modified)
	* doc/developer/calculator.rst (modified)
	* doc/developer/overview.rst (modified)
	* doc/genapi.py (modified)
	* doc/guide/index.rst (modified)
	* doc/guide/magnetism/magnetism.rst (modified)
	* doc/guide/orientation/orient_img/elliptical_cylinder_angle_definition.png (added)
	* doc/guide/orientation/orient_img/elliptical_cylinder_angle_projection.png (added)
	* doc/guide/orientation/orientation.rst (added)
	* doc/guide/pd/polydispersity.rst (modified)
	* doc/guide/resolution.rst (modified)
	* explore/angles.py (added)
	* explore/asymint.py (added)
	* explore/check1d.py (added)
	* explore/jitter.py (modified)
	* explore/precision.py (modified)
	* explore/sc.c (added)
	* explore/sc.py (added)
	* explore/symint.py (added)
	* explore/transform_angles.py (added)
	* sasmodels/compare.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/details.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel_header.c (modified)
	* sasmodels/kernel_iq.c (modified)
	* sasmodels/kernel_iq.cl (deleted)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/_py_parallelepiped.py (added)
	* sasmodels/models/barbell.c (modified)
	* sasmodels/models/bcc_paracrystal.c (modified)
	* sasmodels/models/bcc_paracrystal.py (modified)
	* sasmodels/models/capped_cylinder.c (modified)
	* sasmodels/models/core_shell_bicelle.c (modified)
	* sasmodels/models/core_shell_bicelle_elliptical.c (modified)
	* sasmodels/models/core_shell_cylinder.c (modified)
	* sasmodels/models/core_shell_ellipsoid.c (modified)
	* sasmodels/models/core_shell_ellipsoid.py (modified)
	* sasmodels/models/cylinder.c (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/models/ellipsoid.c (modified)
	* sasmodels/models/ellipsoid.py (modified)
	* sasmodels/models/elliptical_cylinder.c (modified)
	* sasmodels/models/elliptical_cylinder.py (modified)
	* sasmodels/models/fcc_paracrystal.c (modified)
	* sasmodels/models/fcc_paracrystal.py (modified)
	* sasmodels/models/hollow_cylinder.c (modified)
	* sasmodels/models/parallelepiped.c (modified)
	* sasmodels/models/parallelepiped.py (modified)
	* sasmodels/models/sc_paracrystal.c (modified)
	* sasmodels/models/sc_paracrystal.py (modified)
	* sasmodels/models/stacked_disks.c (modified)
	* sasmodels/models/stacked_disks.py (modified)
	* sasmodels/models/triaxial_ellipsoid.c (modified)
	* sasmodels/rst2html.py (modified)
	* sasmodels/special.py (added)
	* sasmodels/weights.py (modified)

	Merge branch 'master' into ticket-776-orientation


Fri, 27 Oct 2017 15:51:44 GMT Paul Kienzle <pkienzle@…> [a9bc435]
	* sasmodels/sasview_model.py (modified)

	fix typo in type checking support


Fri, 27 Oct 2017 15:21:26 GMT Gonzalez, Miguel <gonzalez@…> [1f35235]
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	Fixing the issue using the control attribute in make_product_info


Fri, 27 Oct 2017 11:28:45 GMT Gonzalez, Miguel <gonzalez@…> [89d530c]
	* sasmodels/sasview_model.py (modified)

	Remove unnecessary return in MultiplicationModel


Wed, 25 Oct 2017 12:40:50 GMT Gonzalez, Miguel <gonzalez@…> [eb3fab6]
	* sasmodels/sasview_model.py (modified)

	Fix interface problem appearing when a form factor that has
	multiplicity ...


Wed, 18 Oct 2017 04:08:54 GMT Paul Kienzle <pkienzle@…> [32f87a5]
	* sasmodels/direct_model.py (modified)
	* sasmodels/sasview_model.py (modified)

	update sasview wrapper with new way of handling orientation
	dispersity


Wed, 27 Sep 2017 20:29:31 GMT Paul Kienzle <pkienzle@…> [9f8ade1]
	* sasmodels/sasview_model.py (modified)

	python 3 moves thread to _thread


Tue, 12 Sep 2017 16:28:09 GMT Paul Kienzle <pkienzle@…> [9644b5a]
	* sasmodels/sasview_model.py (modified)

	avoid recalculation of components unless it is a P@S product model


Tue, 12 Sep 2017 16:02:22 GMT Paul Kienzle <pkienzle@…> [946c8d27]
	* sasmodels/sasview_model.py (modified)

	add a TODO to the calc_composition_models code


Tue, 12 Sep 2017 15:29:02 GMT Paul Kienzle <pkienzle@…> [ad79f49]
	* .travis.yml (modified)
	* .travis/travis_rsa.enc (modified)
	* deploy.sh (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/mixture.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	Merge branch 'master' into ticket-741


Fri, 01 Sep 2017 08:56:43 GMT lewis [bcdd6c9]
	* sasmodels/sasview_model.py (modified)

	Make 'make_model_from_info' method public

	It's now used by custom ...


Thu, 10 Aug 2017 19:16:46 GMT Paul Kienzle <pkienzle@…> [44ca3e1]
	* .gitignore (modified)
	* .travis.yml (modified)
	* doc/ref/gpu/gpu_computations.rst (modified)
	* example/093191_201.dat (added)
	* example/093192_202.dat (added)
	* example/093193_203.dat (added)
	* example/093194_204.dat (added)
	* example/093195_205.dat (added)
	* example/batch_fit.py (added)
	* example/model_ellipsoid_hayter_msa.py (added)
	* explore/J1.py (deleted)
	* explore/J1c.py (deleted)
	* explore/angular_pd.py (modified)
	* explore/cyl.py (deleted)
	* explore/jitter.py (added)
	* explore/lgamma.py (deleted)
	* explore/log_gamma.py (deleted)
	* explore/precision.py (added)
	* explore/sinc.py (deleted)
	* explore/sph_j1c.py (deleted)
	* sasmodels/__init__.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel_header.c (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/barbell.py (modified)
	* sasmodels/models/bcc_paracrystal.c (modified)
	* sasmodels/models/bcc_paracrystal.py (modified)
	* sasmodels/models/capped_cylinder.py (modified)
	* sasmodels/models/core_shell_bicelle.c (modified)
	* sasmodels/models/core_shell_bicelle.py (modified)
	* sasmodels/models/core_shell_bicelle_elliptical.c (modified)
	* sasmodels/models/core_shell_bicelle_elliptical.py (modified)
	* sasmodels/models/core_shell_cylinder.py (modified)
	* sasmodels/models/core_shell_ellipsoid.py (modified)
	* sasmodels/models/core_shell_parallelepiped.c (modified)
	* sasmodels/models/core_shell_parallelepiped.py (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/models/ellipsoid.c (modified)
	* sasmodels/models/ellipsoid.py (modified)
	* sasmodels/models/elliptical_cylinder.c (modified)
	* sasmodels/models/elliptical_cylinder.py (modified)
	* sasmodels/models/fcc_paracrystal.c (modified)
	* sasmodels/models/fcc_paracrystal.py (modified)
	* sasmodels/models/hollow_cylinder.py (modified)
	* sasmodels/models/img/bcc_angle_definition.png (deleted)
	* sasmodels/models/img/cylinder_angle_definition.jpg (deleted)
	* sasmodels/models/img/cylinder_angle_definition.png (added)
	* sasmodels/models/img/cylinder_angle_projection.jpg (deleted)
	* sasmodels/models/img/cylinder_angle_projection.png (added)
	* sasmodels/models/img/elliptical_cylinder_angle_definition.jpg (deleted)
	* sasmodels/models/img/elliptical_cylinder_angle_definition.png (added)
	* sasmodels/models/img/elliptical_cylinder_angle_projection.png (added)
	* sasmodels/models/img/parallelepiped_angle_definition.jpg (deleted)
	* sasmodels/models/img/parallelepiped_angle_definition.png (added)
	* sasmodels/models/img/parallelepiped_angle_projection.jpg (deleted)
	* sasmodels/models/img/parallelepiped_angle_projection.png (added)
	* sasmodels/models/img/sc_crystal_angle_definition.jpg (deleted)
	* sasmodels/models/img/triaxial_ellipsoid_angle_projection.jpg (deleted)
	* sasmodels/models/img/triaxial_ellipsoid_angle_projection.png (added)
	* sasmodels/models/lib/sas_3j1x_x.c (modified)
	* sasmodels/models/lib/sas_J0.c (modified)
	* sasmodels/models/lib/sas_J1.c (modified)
	* sasmodels/models/lib/sas_erf.c (modified)
	* sasmodels/models/parallelepiped.c (modified)
	* sasmodels/models/parallelepiped.py (modified)
	* sasmodels/models/sc_paracrystal.c (modified)
	* sasmodels/models/sc_paracrystal.py (modified)
	* sasmodels/models/stacked_disks.py (modified)
	* sasmodels/models/triaxial_ellipsoid.c (modified)
	* sasmodels/models/triaxial_ellipsoid.py (modified)
	* sasmodels/models/two_power_law.py (modified)
	* sasmodels/sasview_model.py (modified)

	Merge branch 'master' into ticket-741


Thu, 29 Jun 2017 13:55:24 GMT Paul Kienzle <pkienzle@…> [724257c]
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	don't reload custom models in sasview unless the timestamp on the
	file ...


Tue, 11 Apr 2017 14:20:36 GMT butler [9dcb21d]
	* sasmodels/sasview_model.py (modified)

	final clean up addressing #741.  Removed old get_compostion_models
	now ...


Mon, 10 Apr 2017 16:57:40 GMT Paul Kienzle <pkienzle@…> [bf8c271]
	* sasmodels/sasview_model.py (modified)

	partial fix of P(q), S(q) intermediate value display


Tue, 21 Feb 2017 00:29:09 GMT Paul Kienzle <pkienzle@…> [749a7d4]
	* sasmodels/sasview_model.py (modified)

	test that model calculation returns NaN if point is out of range


Tue, 14 Feb 2017 20:13:21 GMT Paul Kienzle <pkienzle@…> [a38b065]
	* sasmodels/sasview_model.py (modified)

	limit sasview to a single model calculation across all threads


Tue, 07 Feb 2017 19:04:05 GMT GitHub <noreply@…> [fe8ff99]
	* sasmodels/conversion_table.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/sasview_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel_header.c (modified)
	* sasmodels/kernel_template.c (modified)
	* sasmodels/models/barbell.c (modified)
	* sasmodels/models/barbell.py (modified)
	* sasmodels/models/bcc_paracrystal.py (modified)
	* sasmodels/models/binary_hard_sphere.c (modified)
	* sasmodels/models/binary_hard_sphere.py (modified)
	* sasmodels/models/capped_cylinder.c (modified)
	* sasmodels/models/capped_cylinder.py (modified)
	* sasmodels/models/core_multi_shell.c (modified)
	* sasmodels/models/core_multi_shell.py (modified)
	* sasmodels/models/core_shell_bicelle.c (modified)
	* sasmodels/models/core_shell_bicelle.py (modified)
	* sasmodels/models/core_shell_bicelle_elliptical.c (added)
	* sasmodels/models/core_shell_bicelle_elliptical.py (added)
	* sasmodels/models/core_shell_cylinder.c (modified)
	* sasmodels/models/core_shell_cylinder.py (modified)
	* sasmodels/models/core_shell_ellipsoid.py (modified)
	* sasmodels/models/core_shell_parallelepiped.c (modified)
	* sasmodels/models/core_shell_sphere.py (modified)
	* sasmodels/models/cylinder.c (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/models/ellipsoid.c (modified)
	* sasmodels/models/ellipsoid.py (modified)
	* sasmodels/models/elliptical_cylinder.c (modified)
	* sasmodels/models/elliptical_cylinder.py (modified)
	* sasmodels/models/fcc_paracrystal.py (modified)
	* sasmodels/models/flexible_cylinder.c (modified)
	* sasmodels/models/flexible_cylinder_elliptical.c (modified)
	* sasmodels/models/fractal.c (modified)
	* sasmodels/models/fractal.py (modified)
	* sasmodels/models/fractal_core_shell.py (modified)
	* sasmodels/models/fuzzy_sphere.py (modified)
	* sasmodels/models/guinier_porod.py (modified)
	* sasmodels/models/hollow_cylinder.c (modified)
	* sasmodels/models/hollow_rectangular_prism.c (modified)
	* sasmodels/models/lib/core_shell.c (modified)
	* sasmodels/models/lib/gfn.c (modified)
	* sasmodels/models/lib/polevl.c (modified)
	* sasmodels/models/lib/sas_3j1x_x.c (moved)
	* sasmodels/models/lib/sas_J0.c (modified)
	* sasmodels/models/lib/sas_J1.c (modified)
	* sasmodels/models/lib/sas_JN.c (modified)
	* sasmodels/models/lib/sas_Si.c (moved)
	* sasmodels/models/lib/sphere_form.c (modified)
	* sasmodels/models/linear_pearls.c (modified)
	* sasmodels/models/linear_pearls.py (modified)
	* sasmodels/models/mass_fractal.c (modified)
	* sasmodels/models/mass_fractal.py (modified)
	* sasmodels/models/multilayer_vesicle.c (modified)
	* sasmodels/models/multilayer_vesicle.py (modified)
	* sasmodels/models/onion.c (modified)
	* sasmodels/models/onion.py (modified)
	* sasmodels/models/parallelepiped.c (modified)
	* sasmodels/models/pearl_necklace.c (modified)
	* sasmodels/models/pearl_necklace.py (modified)
	* sasmodels/models/polymer_micelle.c (modified)
	* sasmodels/models/polymer_micelle.py (modified)
	* sasmodels/models/pringle.c (modified)
	* sasmodels/models/raspberry.c (modified)
	* sasmodels/models/raspberry.py (modified)
	* sasmodels/models/rectangular_prism.c (modified)
	* sasmodels/models/sc_paracrystal.py (modified)
	* sasmodels/models/sphere.py (modified)
	* sasmodels/models/spherical_sld.c (modified)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/models/stacked_disks.c (modified)
	* sasmodels/models/stacked_disks.py (modified)
	* sasmodels/models/surface_fractal.c (modified)
	* sasmodels/models/surface_fractal.py (modified)
	* sasmodels/models/triaxial_ellipsoid.c (modified)
	* sasmodels/models/triaxial_ellipsoid.py (modified)
	* sasmodels/models/unified_power_Rg.py (modified)
	* sasmodels/models/vesicle.c (modified)
	* sasmodels/models/vesicle.py (modified)
	* sasmodels/resolution2d.py (modified)

	Merge pull request #14 from SasView/ticket-795

	Ticket 795


Thu, 29 Dec 2016 18:57:05 GMT mathieu [64614ad]
	* sasmodels/sasview_model.py (modified)

	Adapt SasViewModel to new multiplication model replacement


Fri, 23 Dec 2016 17:55:54 GMT Paul Kienzle <pkienzle@…> [790b16bb]
	* sasmodels/conversion_table.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/sasview_model.py (modified)

	Merge branch 'ticket-795' of github.com:sasview/sasmodels into ...


Fri, 23 Dec 2016 17:55:46 GMT Paul Kienzle <pkienzle@…> [bb584b3]
	* sasmodels/conversion_table.py (modified)
	* sasmodels/sasview_model.py (modified)

	include model class in conversion table when it differs from model
	name


Fri, 23 Dec 2016 14:36:18 GMT krzywon [a297255]
	* sasmodels/conversion_table.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/sasview_model.py (modified)

	Default to an empty dictionary when getting a value from ...


Tue, 20 Dec 2016 17:08:41 GMT krzywon [86e8e66]
	* sasmodels/conversion_table.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/sasview_model.py (modified)

	Changed conversion table keys to tuples to enforce proper ordering
	when ...


Fri, 09 Dec 2016 19:21:26 GMT krzywon [01ecc31]
	* sasmodels/sasview_model.py (modified)

	All old versions of models are run through in sasview_model.


Mon, 05 Dec 2016 20:36:01 GMT krzywon [4b4eee1]
	* sasmodels/conversion_table.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/sasview_model.py (modified)

	Added versioning to convert.py for future model reparameterization.


Thu, 03 Nov 2016 18:11:39 GMT krzywon [8977226]
	* sasmodels/sasview_model.py (modified)

	Pass params to parameters.user_parameters.


Wed, 02 Nov 2016 21:58:24 GMT Paul Kienzle <pkienzle@…> [85fe7f8]
	* sasmodels/compare.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	re-enable sasview after forward conversion and linting updates


Thu, 13 Oct 2016 04:35:53 GMT Paul Kienzle <pkienzle@…> [a80e64c]
	* sasmodels/sasview_model.py (modified)

	add sasview compatible MultiplicationModel interface to product model


Tue, 11 Oct 2016 14:57:58 GMT mathieu [64f0a1c]
	* sasmodels/sasview_model.py (modified)

	Make sure Sum|Multi models are not loaded a second time as _user. Re ...


Mon, 10 Oct 2016 19:57:25 GMT mathieu [e4bf271]
	* sasmodels/sasview_model.py (modified)

	Make sure plug-ins work with multiplication model. Re #751


Mon, 10 Oct 2016 18:51:17 GMT wojciech [689b7c4]
	* sasmodels/custom/__init__.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/models/multilayer_vesicle.py (modified)
	* sasmodels/models/vesicle.py (modified)
	* sasmodels/sasview_model.py (modified)

	Removing try/except clause that wasn't properly handled


Mon, 10 Oct 2016 18:50:06 GMT wojciech [9f37726]
	* sasmodels/sasview_model.py (modified)

	Removing try/except clause that wasn't properly handled


Mon, 10 Oct 2016 18:14:26 GMT mathieu [20a70bc]
	* sasmodels/sasview_model.py (modified)

	Make sure old-style v3 models load, and reload. Fixes #751


Mon, 10 Oct 2016 16:56:09 GMT mathieu [2f2c70c]
	* sasmodels/sasview_model.py (modified)

	Fix problem with reloading. Re #673


Mon, 10 Oct 2016 16:36:59 GMT Paul Kienzle <pkienzle@…> [8f93522]
	* sasmodels/sasview_model.py (modified)

	hide structure factor background/scale from sasview gui.  Fixes #657.


Sun, 09 Oct 2016 14:35:59 GMT mathieu [ed10b57]
	* sasmodels/sasview_model.py (modified)

	Allow loading of custom model of the same name as a std model (append ...


Thu, 06 Oct 2016 20:20:06 GMT wojciech [5b37fd6]
	* sasmodels/sasview_model.py (modified)

	Needed to try except clause, otherwise was failing when trying
	disatch ...


Thu, 06 Oct 2016 18:24:32 GMT ajj [886fa25]
	* doc/ref/gpu_computations.rst (moved)
	* doc/ref/index.rst (modified)
	* doc/ref/opencl_installation.rst (added)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/sasview_model.py (modified)

	Ticket576 - updated custom models not being recompiled (#10)

	* OpenCL ...


Tue, 27 Sep 2016 13:49:19 GMT Paul Kienzle <pkienzle@…> [9c1a59c]
	* sasmodels/sasview_model.py (modified)

	use array weights for array models; use distribution parameters from ...


Thu, 25 Aug 2016 02:09:56 GMT Paul Kienzle <pkienzle@…> [3bcb88c]
	* sasmodels/sasview_model.py (modified)

	allow fitting of models with hidden polydisperse parameters (e.g., ...


Thu, 18 Aug 2016 15:30:23 GMT Paul Kienzle <pkienzle@…> [300a2f7]
	* sasmodels/kernelcl.py (modified)
	* sasmodels/sasview_model.py (modified)

	Force programs to be recompiled on OpenCL when they are changed. Ref ...


Mon, 15 Aug 2016 03:12:40 GMT Paul Kienzle <pkienzle@…> [bde38b5]
	* sasmodels/details.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/kernel.py (modified)
	* sasmodels/kernel_iq.c (modified)
	* sasmodels/kernel_iq.cl (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/sasview_model.py (modified)

	simplify kernel calling


Thu, 11 Aug 2016 03:22:15 GMT Paul Kienzle <pkienzle@…> [fd19811]
	* sasmodels/sasview_model.py (modified)

	lint


Thu, 11 Aug 2016 01:51:47 GMT Paul Kienzle <pkienzle@…> [c95dfc63]
	* sasmodels/conversion_table.py (modified)
	* sasmodels/sasview_model.py (modified)

	support existing sum and product models


Tue, 09 Aug 2016 02:32:13 GMT Paul Kienzle <pkienzle@…> [9457498]
	* sasmodels/sasview_model.py (modified)

	support old style custom formula models (but not sum or product)


Fri, 05 Aug 2016 22:06:25 GMT Paul Kienzle <pkienzle@…> [99f446a]
	* sasmodels/sasview_model.py (modified)

	fix dispersion distribution selector


Fri, 05 Aug 2016 21:59:13 GMT Paul Kienzle <pkienzle@…> [b32dafd]
	* sasmodels/compare.py (modified)
	* sasmodels/rst2html.py (modified)
	* sasmodels/sasview_model.py (modified)

	lint


Fri, 05 Aug 2016 12:35:30 GMT Paul Kienzle <pkienzle@…> [50ec515]
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/sasview_model.py (modified)

	spherical sld: document interface shape number->interface
	relationship ...


Fri, 05 Aug 2016 03:39:39 GMT Paul Kienzle <pkienzle@…> [e7fe459]
	* sasmodels/sasview_model.py (modified)

	spherical sld: sasview assumes profile needs to be scaled by 1e6


Fri, 05 Aug 2016 03:36:37 GMT Paul Kienzle <pkienzle@…> [4e0968b]
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/sasview_model.py (modified)

	spherical sld: doc cleanup (with syntax errors fixed)


Fri, 05 Aug 2016 03:32:17 GMT Paul Kienzle <pkienzle@…> [745b7bb]
	* doc/genmodel.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/models/img/spherical_sld_profile.gif (deleted)
	* sasmodels/models/img/spherical_sld_profile.png (added)
	* sasmodels/models/lib/librefl.c (deleted)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/sasview_model.py (modified)

	spherical sld: doc cleanup


Mon, 01 Aug 2016 23:33:41 GMT Paul Kienzle <pkienzle@…> [4edec6f]
	* sasmodels/sasview_model.py (modified)

	fix sasview for new kernel interface


Sat, 23 Jul 2016 04:54:17 GMT Paul Kienzle <pkienzle@…> [9eb3632]
	* sasmodels/details.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel.py (modified)
	* sasmodels/kernel_iq.c (modified)
	* sasmodels/kernel_iq.cl (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/hardsphere.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	restructure kernels using fixed PD loops


Thu, 21 Jul 2016 21:42:33 GMT Paul Kienzle <pkienzle@…> [6a0d6aa]
	* sasmodels/kernel_template.c (modified)
	* sasmodels/sasview_model.py (modified)

	magnetic models working in sasview


Thu, 21 Jul 2016 20:08:04 GMT Paul Kienzle <pkienzle@…> [32e3c9b]
	* sasmodels/__init__.py (modified)
	* sasmodels/conversion_table.py (added)
	* sasmodels/convert.json (deleted)
	* sasmodels/convert.py (modified)
	* sasmodels/details.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel.py (modified)
	* sasmodels/kernel_iq.c (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)
	* setup.py (modified)

	dll version of magnetic sld


Mon, 18 Jul 2016 06:55:59 GMT Paul Kienzle <pkienzle@…> [ce176ca]
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/rpa.py (modified)
	* sasmodels/sasview_model.py (modified)

	fix parameter show/hide for multiplicity models


Fri, 15 Jul 2016 13:33:33 GMT Paul Kienzle <pkienzle@…> [a738209]
	* sasmodels/compare.py (modified)
	* sasmodels/details.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel.py (modified)
	* sasmodels/kernel_iq.c (modified)
	* sasmodels/kernel_iq.cl (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/sasview_model.py (modified)

	simplify kernels by remove coordination parameter logic


Thu, 14 Jul 2016 19:35:58 GMT Paul Kienzle <pkienzle@…> [56b2687]
	* MANIFEST.in (added)
	* README.rst (modified)
	* doc/git_bash.sh (deleted)
	* sascomp (modified)
	* sasmodels/__init__.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/custom/__init__.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel_template.c (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/models/_core_multi_shell.py (moved)
	* sasmodels/models/_onion.py (moved)
	* sasmodels/models/_spherical_sld.py (moved)
	* sasmodels/models/core_shell_parallelepiped.py (modified)
	* sasmodels/models/hollow_rectangular_prism.py (modified)
	* sasmodels/models/lamellar.py (modified)
	* sasmodels/models/sc_paracrystal.py (modified)
	* sasmodels/models/squarewell.py (modified)
	* sasmodels/sasview_model.py (modified)
	* sasmodels/weights.py (modified)
	* setup.py (modified)
	* doc/developer/calculator.rst (added)
	* doc/developer/index.rst (modified)
	* doc/genapi.py (modified)
	* doc/genmodel.py (modified)
	* doc/gentoc.py (modified)
	* example/polynomial.py (added)
	* sasmodels/alignment.py (modified)
	* sasmodels/bumps_model.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/compare_many.py (modified)
	* sasmodels/convert.json (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/details.py (added)
	* sasmodels/kernel.py (added)
	* sasmodels/kernel_header.c (added)
	* sasmodels/kernel_iq.c (added)
	* sasmodels/kernel_iq.cl (added)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/list_pars.py (modified)
	* sasmodels/mixture.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (added)
	* sasmodels/models/cylinder.c (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/models/flexible_cylinder.c (modified)
	* sasmodels/models/gel_fit.c (modified)
	* sasmodels/models/hardsphere.py (modified)
	* sasmodels/models/hayter_msa.py (modified)
	* sasmodels/models/lamellar_hg.py (modified)
	* sasmodels/models/lamellar_hg_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_paracrystal.py (modified)
	* sasmodels/models/lib/librefl.c (added)
	* sasmodels/models/lib/sas_JN.c (modified)
	* sasmodels/models/lib/sph_j1c.c (modified)
	* sasmodels/models/lib/sphere_form.c (modified)
	* sasmodels/models/lib/wrc_cyl.c (modified)
	* sasmodels/models/onion.c (modified)
	* sasmodels/models/rpa.c (modified)
	* sasmodels/models/rpa.py (modified)
	* sasmodels/models/spherical_sld.c (added)
	* sasmodels/models/stickyhardsphere.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/resolution2d.py (modified)
	* sasmodels/sesans.py (modified)

	Merge branch 'master' into polydisp

	Conflicts:
	        README.rst
	    ...


Mon, 27 Jun 2016 16:43:39 GMT Paul Kienzle <pkienzle@…> [fa800e72]
	* sasmodels/sasview_model.py (modified)
	* sasmodels/weights.py (modified)

	fix disperser support for sasview 4.0


Mon, 27 Jun 2016 15:27:00 GMT Paul Kienzle <pkienzle@…> [e758662]
	* sasmodels/sasview_model.py (modified)

	preserve case in model parameter names for sasview


Fri, 24 Jun 2016 21:00:40 GMT Paul Kienzle <pkienzle@…> [b3a85cd]
	* sasmodels/sasview_model.py (modified)

	control the order of the dispersion parameters in the model


Wed, 22 Jun 2016 16:13:32 GMT Paul Kienzle <pkienzle@…> [92d38285]
	* sasmodels/sasview_model.py (modified)

	manage set of models loaded by sasview; support loading sasview sum ...


Mon, 18 Apr 2016 22:15:22 GMT Paul Kienzle <pkienzle@…> [f36c1b7]
	* sasmodels/sasview_model.py (modified)

	suppress 'initializing model' print statement


Fri, 15 Apr 2016 16:31:35 GMT Paul Kienzle <pkienzle@…> [0ff62d4]
	* sasmodels/details.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/kernel.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	refactor: move dispersion_mesh alongside build_details in kernel.py


Wed, 13 Apr 2016 16:49:03 GMT Paul Kienzle <pkienzle@…> [60f03de]
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	still more type hinting


Wed, 13 Apr 2016 15:39:09 GMT Paul Kienzle <pkienzle@…> [04dc697]
	* sasmodels/bumps_model.py (modified)
	* sasmodels/kernel.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	more type hinting


Wed, 13 Apr 2016 14:10:43 GMT Paul Kienzle <pkienzle@…> [a18c5b3]
	* sasmodels/sasview_model.py (modified)

	code cleanup; make categories work again


Wed, 13 Apr 2016 14:02:03 GMT Paul Kienzle <pkienzle@…> [793beb3]
	* sasmodels/sasview_model.py (modified)
	* doc/developer/calculator.rst (added)
	* doc/developer/index.rst (modified)
	* example/polynomial.py (added)
	* sasmodels/alignment.py (modified)
	* sasmodels/bumps_model.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/compare_many.py (modified)
	* sasmodels/convert.json (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/custom/__init__.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/details.py (added)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel.py (added)
	* sasmodels/kernel_header.c (added)
	* sasmodels/kernel_iq.c (added)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/list_pars.py (modified)
	* sasmodels/mixture.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (added)
	* sasmodels/models/cylinder.c (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/models/flexible_cylinder.c (modified)
	* sasmodels/models/gel_fit.c (modified)
	* sasmodels/models/hardsphere.py (modified)
	* sasmodels/models/hayter_msa.py (modified)
	* sasmodels/models/lamellar.py (modified)
	* sasmodels/models/lamellar_hg.py (modified)
	* sasmodels/models/lamellar_hg_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_paracrystal.py (modified)
	* sasmodels/models/lib/sas_JN.c (modified)
	* sasmodels/models/lib/sph_j1c.c (modified)
	* sasmodels/models/lib/sphere_form.c (modified)
	* sasmodels/models/lib/wrc_cyl.c (modified)
	* sasmodels/models/onion.c (modified)
	* sasmodels/models/onion.py (modified)
	* sasmodels/models/rpa.c (modified)
	* sasmodels/models/rpa.py (modified)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/models/squarewell.py (modified)
	* sasmodels/models/stickyhardsphere.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/resolution2d.py (modified)
	* sasmodels/sesans.py (modified)
	* sasmodels/weights.py (modified)

	Merge remote-tracking branch 'remotes/origin/master' into polydisp
 ...


Wed, 13 Apr 2016 13:12:22 GMT Paul Kienzle <pkienzle@…> [81ec7c8]
	* sasmodels/generate.py (modified)
	* sasmodels/sasview_model.py (modified)

	update sasview wrapper so that model details are class attributes


Wed, 13 Apr 2016 12:45:00 GMT Paul Kienzle <pkienzle@…> [a936688]
	* sasmodels/generate.py (modified)
	* sasmodels/sasview_model.py (modified)
	* sasmodels/weights.py (modified)

	update sasview wrapper so that model details are class attributes


Wed, 13 Apr 2016 00:02:40 GMT Paul Kienzle <pkienzle@…> [04045f4]
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	support for rpa style variant models


Tue, 12 Apr 2016 22:02:41 GMT Paul Kienzle <pkienzle@…> [fa5fd8d]
	* sasmodels/core.py (modified)
	* sasmodels/models/onion.py (modified)
	* sasmodels/sasview_model.py (modified)
	* sasmodels/weights.py (modified)

	support number of shells selection in sasview wrapper for onion model


Mon, 11 Apr 2016 16:48:41 GMT Paul Kienzle <pkienzle@…> [7ae2b7f]
	* sasmodels/alignment.py (modified)
	* sasmodels/bumps_model.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/compare_many.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/custom/__init__.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/details.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernel.py (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/mixture.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/resolution2d.py (modified)
	* sasmodels/sasview_model.py (modified)
	* sasmodels/sesans.py (modified)
	* sasmodels/weights.py (modified)

	still more linting; ignore numpy types


Fri, 08 Apr 2016 21:52:54 GMT Paul Kienzle <pkienzle@…> [0d99a6a]
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	doc strings for modelinfo


Fri, 08 Apr 2016 16:11:16 GMT Paul Kienzle <pkienzle@…> [4bfd277]
	* sasmodels/details.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	support ER/VR calls with vector parameters


Thu, 07 Apr 2016 22:57:33 GMT Paul Kienzle <pkienzle@…> [6d6508e]
	* sasmodels/bumps_model.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/list_pars.py (modified)
	* sasmodels/mixture.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/sasview_model.py (modified)

	refactor model_info from dictionary to class


Wed, 06 Apr 2016 21:52:02 GMT Paul Kienzle <pkienzle@…> [ee8f734]
	* sasmodels/compare_many.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	only use bare except when annotating an exception


Tue, 05 Apr 2016 18:34:30 GMT Paul Kienzle <pkienzle@…> [d2bb604]
	* sasmodels/compare.py (modified)
	* sasmodels/convert.json (modified)
	* sasmodels/core.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/flexible_cylinder.c (modified)
	* sasmodels/models/hardsphere.py (modified)
	* sasmodels/models/hayter_msa.py (modified)
	* sasmodels/models/lamellar.py (modified)
	* sasmodels/models/lamellar_hg.py (modified)
	* sasmodels/models/lamellar_hg_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_paracrystal.py (modified)
	* sasmodels/models/rpa.c (modified)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/models/squarewell.py (modified)
	* sasmodels/models/stickyhardsphere.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/sasview_model.py (modified)
	* sasmodels/src (deleted)

	fix models so all dll tests pass


Tue, 05 Apr 2016 16:06:36 GMT Paul Kienzle <pkienzle@…> [1e2a1ba]
	* sasmodels/core.py (modified)
	* sasmodels/custom/__init__.py (modified)
	* sasmodels/exception.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/sasview_model.py (modified)
	* doc/developer/calculator.rst (added)
	* doc/developer/index.rst (modified)
	* example/polynomial.py (added)
	* sasmodels/bumps_model.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/kernel_header.c (added)
	* sasmodels/kernel_iq.c (added)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/mixture.py (modified)
	* sasmodels/modelinfo.py (added)
	* sasmodels/models/cylinder.c (modified)
	* sasmodels/models/gel_fit.c (modified)
	* sasmodels/models/lib/Si.c (modified)
	* sasmodels/models/lib/polevl.c (modified)
	* sasmodels/models/lib/sas_J0.c (modified)
	* sasmodels/models/lib/sas_J1.c (modified)
	* sasmodels/models/lib/sas_JN.c (modified)
	* sasmodels/models/lib/sph_j1c.c (modified)
	* sasmodels/models/lib/sphere_form.c (modified)
	* sasmodels/models/lib/wrc_cyl.c (modified)
	* sasmodels/models/onion.c (modified)
	* sasmodels/models/onion.py (modified)
	* sasmodels/models/rpa.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/src (added)

	Merge remote-tracking branch 'origin/master' into polydisp

	Conflicts:
	 ...


Tue, 05 Apr 2016 14:33:44 GMT Paul Kienzle <pkienzle@…> [4d76711]
	* sasmodels/core.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/exception.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/sasview_model.py (modified)

	adjust interface to sasview


Mon, 04 Apr 2016 22:47:27 GMT Paul Kienzle <pkienzle@…> [ea05c87]
	* sasmodels/compare.py (modified)
	* sasmodels/convert.json (added)
	* sasmodels/convert.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/models/_spherepy.py (modified)
	* sasmodels/models/adsorbed_layer.py (modified)
	* sasmodels/models/barbell.py (modified)
	* sasmodels/models/bcc_paracrystal.py (modified)
	* sasmodels/models/be_polyelectrolyte.py (modified)
	* sasmodels/models/binary_hard_sphere.py (modified)
	* sasmodels/models/broad_peak.py (modified)
	* sasmodels/models/capped_cylinder.py (modified)
	* sasmodels/models/core_multi_shell.py (modified)
	* sasmodels/models/core_shell_bicelle.py (modified)
	* sasmodels/models/core_shell_cylinder.py (modified)
	* sasmodels/models/core_shell_ellipsoid.py (modified)
	* sasmodels/models/core_shell_ellipsoid_xt.py (modified)
	* sasmodels/models/core_shell_parallelepiped.py (modified)
	* sasmodels/models/core_shell_sphere.py (modified)
	* sasmodels/models/correlation_length.py (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/models/dab.py (modified)
	* sasmodels/models/ellipsoid.py (modified)
	* sasmodels/models/elliptical_cylinder.py (modified)
	* sasmodels/models/fcc_paracrystal.py (modified)
	* sasmodels/models/flexible_cylinder.py (modified)
	* sasmodels/models/flexible_cylinder_elliptical.py (modified)
	* sasmodels/models/fractal.py (modified)
	* sasmodels/models/fractal_core_shell.py (modified)
	* sasmodels/models/fuzzy_sphere.py (modified)
	* sasmodels/models/gauss_lorentz_gel.py (modified)
	* sasmodels/models/gaussian_peak.py (modified)
	* sasmodels/models/gel_fit.py (modified)
	* sasmodels/models/guinier.py (modified)
	* sasmodels/models/guinier_porod.py (modified)
	* sasmodels/models/hardsphere.py (modified)
	* sasmodels/models/hayter_msa.py (modified)
	* sasmodels/models/hollow_cylinder.py (modified)
	* sasmodels/models/hollow_rectangular_prism.py (modified)
	* sasmodels/models/hollow_rectangular_prism_thin_walls.py (modified)
	* sasmodels/models/lamellar.py (modified)
	* sasmodels/models/lamellar_hg.py (modified)
	* sasmodels/models/lamellar_hg_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_caille.py (modified)
	* sasmodels/models/lamellar_stack_paracrystal.py (modified)
	* sasmodels/models/line.py (modified)
	* sasmodels/models/linear_pearls.py (modified)
	* sasmodels/models/lorentz.py (modified)
	* sasmodels/models/mass_fractal.py (modified)
	* sasmodels/models/mass_surface_fractal.py (modified)
	* sasmodels/models/mono_gauss_coil.py (modified)
	* sasmodels/models/multilayer_vesicle.py (modified)
	* sasmodels/models/onion.py (modified)
	* sasmodels/models/parallelepiped.py (modified)
	* sasmodels/models/peak_lorentz.py (modified)
	* sasmodels/models/pearl_necklace.py (modified)
	* sasmodels/models/poly_gauss_coil.py (modified)
	* sasmodels/models/polymer_excl_volume.py (modified)
	* sasmodels/models/polymer_micelle.py (modified)
	* sasmodels/models/porod.py (modified)
	* sasmodels/models/power_law.py (modified)
	* sasmodels/models/pringle.py (modified)
	* sasmodels/models/raspberry.py (modified)
	* sasmodels/models/rectangular_prism.py (modified)
	* sasmodels/models/rpa.py (modified)
	* sasmodels/models/sc_paracrystal.py (modified)
	* sasmodels/models/sphere.py (modified)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/models/squarewell.py (modified)
	* sasmodels/models/stacked_disks.py (modified)
	* sasmodels/models/star_polymer.py (modified)
	* sasmodels/models/stickyhardsphere.py (modified)
	* sasmodels/models/surface_fractal.py (modified)
	* sasmodels/models/teubner_strey.py (modified)
	* sasmodels/models/triaxial_ellipsoid.py (modified)
	* sasmodels/models/two_lorentzian.py (modified)
	* sasmodels/models/two_power_law.py (modified)
	* sasmodels/models/vesicle.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)
	* doc/developer/calculator.rst (added)
	* doc/developer/index.rst (modified)
	* example/polynomial.py (added)
	* sasmodels/bumps_model.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/custom/__init__.py (added)
	* sasmodels/direct_model.py (modified)
	* sasmodels/kernel_header.c (added)
	* sasmodels/kernel_iq.c (added)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/mixture.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/modelinfo.py (added)
	* sasmodels/models/cylinder.c (modified)
	* sasmodels/models/gel_fit.c (modified)
	* sasmodels/models/lib/Si.c (modified)
	* sasmodels/models/lib/polevl.c (modified)
	* sasmodels/models/lib/sas_J0.c (modified)
	* sasmodels/models/lib/sas_J1.c (modified)
	* sasmodels/models/lib/sas_JN.c (modified)
	* sasmodels/models/lib/sph_j1c.c (modified)
	* sasmodels/models/lib/sphere_form.c (modified)
	* sasmodels/models/lib/wrc_cyl.c (modified)
	* sasmodels/models/onion.c (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/src (added)

	Merge remote-tracking branch 'origin/master' into polydisp

	Conflicts:
	 ...


Mon, 04 Apr 2016 21:23:23 GMT Paul Kienzle <pkienzle@…> [f247314]
	* sasmodels/compare.py (modified)
	* sasmodels/convert.json (added)
	* sasmodels/convert.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	use sasmodels/convert.json for converting new models to old


Wed, 30 Mar 2016 05:34:16 GMT Paul Kienzle <pkienzle@…> [fb5914f]
	* sasmodels/core.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/sasview_model.py (modified)

	bind sasview to new parameter table definition


Mon, 28 Mar 2016 13:27:22 GMT Paul Kienzle <pkienzle@…> [ce896fd]
	* sasmodels/convert.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/modelinfo.py (modified)
	* sasmodels/models/onion.c (modified)
	* sasmodels/models/onion.py (modified)
	* sasmodels/models/spherical_sld.py (modified)
	* sasmodels/models/src (deleted)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	improved handling of vector parameters; remove compile errors from ...


Sat, 19 Mar 2016 13:10:24 GMT ajj [787be86]
	* sasmodels/sasview_model.py (modified)

	remove import custom that is causing breakage


Sat, 19 Mar 2016 10:52:46 GMT Paul Kienzle <pkienzle@…> [72a081d]
	* sasmodels/compare.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/mixture.py (added)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	refactor product/mixture; add load model from path; default compare
	to ...


Fri, 18 Mar 2016 15:36:02 GMT Paul Kienzle <pkienzle@…> [08376e7]
	* sasmodels/sasview_model.py (modified)

	sasview wrapper hackery


Fri, 18 Mar 2016 15:00:59 GMT Paul Kienzle <pkienzle@…> [de97440]
	* sasmodels/sasview_model.py (modified)

	picklable sasview model wrapper?


Fri, 18 Mar 2016 08:58:27 GMT gonzalezm [2622b3f]
	* sasmodels/sasview_model.py (modified)

	Use ordered dict to preserve order of parameters as given in the
	model


Thu, 17 Mar 2016 01:27:13 GMT Paul Kienzle <pkienzle@…> [fcd7bbd]
	* sasmodels/bumps_model.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/list_pars.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/product.py (modified)
	* sasmodels/sasview_model.py (modified)

	use named tuple for parameter information


Wed, 16 Mar 2016 13:25:41 GMT ajj [28da77d]
	* sasmodels/sasview_model.py (modified)

	Fixing sasview model to properly release the q value vector


Tue, 15 Mar 2016 16:47:12 GMT Paul Kienzle <pkienzle@…> [17bbadd]
	* sasmodels/compare.py (modified)
	* sasmodels/compare_many.py (modified)
	* sasmodels/convert.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/list_pars.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/product.py (added)
	* sasmodels/resolution.py (modified)
	* sasmodels/sasview_model.py (modified)

	refactor so all model defintion queries use model_info; better ...


Sun, 31 Jan 2016 02:39:59 GMT Paul Kienzle <pkienzle@…> [eafc9fa]
	* sasmodels/core.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/sasview_model.py (modified)

	refactor kernel wrappers to simplify q input handling


Fri, 04 Dec 2015 17:41:47 GMT Paul Kienzle <pkienzle@…> [9404dd3]
	* doc/conf.py (modified)
	* doc/gentoc.py (modified)
	* sasmodels/bumps_model.py (modified)
	* sasmodels/compare.py (modified)
	* sasmodels/compare_many.py (modified)
	* sasmodels/core.py (modified)
	* sasmodels/data.py (modified)
	* sasmodels/direct_model.py (modified)
	* sasmodels/exception.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kernelcl.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/kernelpy.py (modified)
	* sasmodels/model_test.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/resolution2d.py (modified)
	* sasmodels/sasview_model.py (modified)

	python 3.x support


Mon, 30 Nov 2015 19:24:28 GMT Paul Kienzle <pkienzle@…> [d138d43]
	* doc/genmodel.py (modified)
	* doc/index.rst (modified)
	* sasmodels/exception.py (modified)
	* sasmodels/generate.py (modified)
	* sasmodels/kerneldll.py (modified)
	* sasmodels/models/bcc.py (modified)
	* sasmodels/models/broad_peak.py (modified)
	* sasmodels/models/cylinder.py (modified)
	* sasmodels/models/fcc.py (modified)
	* sasmodels/models/hollow_cylinder.py (modified)
	* sasmodels/models/img/broad_peak_1d.jpg (added)
	* sasmodels/models/img/crystal_orientation.gif (moved)
	* sasmodels/models/img/fcc_1d.jpg (added)
	* sasmodels/models/img/fcc_2d.jpg (added)
	* sasmodels/models/img/fcc_lattice.jpg (added)
	* sasmodels/models/img/hollow_cylinder_1d.jpg (moved)
	* sasmodels/models/img/image061.jpg (deleted)
	* sasmodels/models/img/image062.jpg (deleted)
	* sasmodels/models/img/lamellarFFHG_137.jpg (deleted)
	* sasmodels/models/img/lamellarFFHG_1d.jpg (moved)
	* sasmodels/models/img/lamellarPC_146.jpg (deleted)
	* sasmodels/models/img/lamellarPC_147.jpg (deleted)
	* sasmodels/models/img/lamellarPC_1d.jpg (added)
	* sasmodels/models/img/lamellarPC_45.jpg (deleted)
	* sasmodels/models/img/lorentz_1d.jpg (moved)
	* sasmodels/models/lamellarFFHG.py (modified)
	* sasmodels/models/lamellarPC.py (modified)
	* sasmodels/models/lorentz.py (modified)
	* sasmodels/models/parallelepiped.py (modified)
	* sasmodels/models/spherepy.py (modified)
	* sasmodels/resolution.py (modified)
	* sasmodels/sasview_model.py (modified)

	remove documentation build errors