source: sasmodels/sasmodels/sasview_model.py

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @a34b811   5 years pkienzle use radius_effective/radius_effective_mode/radius_effective_modes … ticket-1257-vesicle-productticket_1156ticket_822_more_unit_tests
(edit) @b297ba9   5 years pkienzle lint core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @fd7291e   5 years pkienzle Merge branch 'beta_approx' into ticket-1022-sum_multiplicity core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9150036   5 years pkienzle Merge branch 'master' into beta_approx core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @21c93c3   5 years pkienzle fix translation of 3.x models with control parameters to 4.2 core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @a8a1d48   5 years noreply Set structure factor background default to 0.0. Closes #1157. core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @3a1afed   5 years pkienzle remove calculate_ER/calculate_VR since it was broken and only needed for … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @b171acd   5 years pkienzle move 'multiplicity' handling into sasview model. Refs #1022. core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @c1799d3   5 years pkienzle Merge branch 'beta_approx' into ticket-1157 core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @a4f1a73   5 years pkienzle clean out existing kernels when changing compute engine core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @5024a56   5 years pkienzle Make sure that the label radius_effective_mode is used throughout core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @17695aa   5 years pkienzle Merge branch 'master' into ticket-1157 core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @aa8c6e0   5 years pkienzle Merge branch 'master' into beta_approx core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @39a06c9   5 years pkienzle Remove references to ER and VR from sasmodels. Refs #1202. core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @ce1eed5   5 years wojciech Fixed conflict after merging master core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @be43e39   5 years pkienzle Merge branch 'master' into beta_approx core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @e44432d   5 years pkienzle support hollow models in structure factor calculations core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @6da1d76   5 years pkienzle Merge branch 'master' into ticket-1157 core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9ae0d2e   5 years pkienzle Merge branch 'master' into beta_approx core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @bd547d0   5 years pkienzle restrict magnetic parameters to visible shells. Refs #1188 core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @610ef23   5 years pkienzle rename magnetic parameters to not contain colon. Refs #1188 core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @d321747   5 years pkienzle sasview only updates models when code changes; now detects changes to c … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @0535624   6 years pkienzle set background=0 in modelinfo.defaults, and simplify sasview model … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @293fee5   6 years pkienzle test that sasview model defaults to zero background core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @839fd68   6 years pkienzle cache modules by timestamp in the custom kernel loader core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @c952e59   6 years torin.cooper-bennun make SasviewModel?'s parsing of par units, bounds sane again core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @2773c66   6 years torin.cooper-bennun Merge branch 'beta_approx' into beta_approx_new_R_eff core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @84f2962   6 years torin.cooper-bennun calculate_Iq returns intermediate results from ProductKernel? core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @117c02a   6 years torin.cooper-bennun cherry-picking lazy results implementation from beta_approx_lazy_results, … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @aa44a6a   6 years torin.cooper-bennun merge from beta_approx_lazy_results; include ER as intermediate result; … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @d32de68   6 years torin.cooper-bennun put intermediate results into helper functions; tidy up; retain sasview … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @d3ffeb7   6 years torin.cooper-bennun beta_mode takes choices from units; lazy results implementation core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @6e7ba14   6 years pkienzle allow for different forms of effective_radius core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @12eec1e   6 years pkienzle refactor model tests so SasviewModel? can run tests without reloading model … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @d533590   6 years pkienzle do not release kernel in sasview_model wrapper; this avoids error for … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @7c3fb15   6 years pkienzle code cleanup: correct a type sig and fix an exception string core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @05df1de   6 years pkienzle fix magnetic modelling for spherosymmetric shapes. Fixes #1083. core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @3221de0   6 years pkienzle restructure handling of opencl flags so it works with sasview core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @a69d8cd   6 years pkienzle add support for pytest and use it on travis/appveyor core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @2d81cfe   6 years pkienzle lint core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @e65c3ba   6 years pkienzle lint core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @17db833   6 years pkienzle fix structure factor models, so scale=1, background=0 again core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @ce99754   6 years pkienzle make sure that nominal values get into the weight vector even when there … core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @a06af5d   6 years pkienzle fix models with hidden parameters to work from sasview again core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @904cd9c   6 years pkienzle Merge branch 'master' into ticket-776-orientation core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @a9bc435   6 years pkienzle fix typo in type checking support core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @1f35235   6 years gonzalez Fixing the issue using the control attribute in make_product_info core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @89d530c   6 years gonzalez Remove unnecessary return in MultiplicationModel? core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @eb3fab6   6 years gonzalez Fix interface problem appearing when a form factor that has multiplicity … core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @32f87a5   6 years pkienzle update sasview wrapper with new way of handling orientation dispersity core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9f8ade1   7 years pkienzle python 3 moves thread to _thread core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9644b5a   7 years pkienzle avoid recalculation of components unless it is a P@S product model core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @946c8d27   7 years pkienzle add a TODO to the calc_composition_models code core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @ad79f49   7 years pkienzle Merge branch 'master' into ticket-741 core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @bcdd6c9   7 years lewis Make 'make_model_from_info' method public It's now used by custom … core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @44ca3e1   7 years pkienzle Merge branch 'master' into ticket-741 core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @724257c   7 years pkienzle don't reload custom models in sasview unless the timestamp on the file has … core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9dcb21d   7 years butler final clean up addressing #741. Removed old get_compostion_models now … core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @bf8c271   7 years pkienzle partial fix of P(q), S(q) intermediate value display core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @749a7d4   7 years pkienzle test that model calculation returns NaN if point is out of range core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @a38b065   7 years pkienzle limit sasview to a single model calculation across all threads core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @fe8ff99   7 years noreply Merge pull request #14 from SasView?/ticket-795 Ticket 795 core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @64614ad   7 years mathieu Adapt SasViewModel? to new multiplication model replacement core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @790b16bb   7 years pkienzle Merge branch 'ticket-795' of github.com:sasview/sasmodels into ticket-795 core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @bb584b3   7 years pkienzle include model class in conversion table when it differs from model name core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @a297255   7 years krzywon Default to an empty dictionary when getting a value from CONVERSION_TABLE. core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @86e8e66   7 years krzywon Changed conversion table keys to tuples to enforce proper ordering when … core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @01ecc31   7 years krzywon All old versions of models are run through in sasview_model. core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @4b4eee1   7 years krzywon Added versioning to convert.py for future model reparameterization. core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @8977226   7 years krzywon Pass params to parameters.user_parameters. core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @85fe7f8   7 years pkienzle re-enable sasview after forward conversion and linting updates core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @a80e64c   7 years pkienzle add sasview compatible MultiplicationModel? interface to product model core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @64f0a1c   7 years mathieu Make sure Sum|Multi models are not loaded a second time as _user. Re #766 core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @e4bf271   7 years mathieu Make sure plug-ins work with multiplication model. Re #751 core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @689b7c4   7 years wojciech Removing try/except clause that wasn't properly handled core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9f37726   7 years wojciech Removing try/except clause that wasn't properly handled core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @20a70bc   7 years mathieu Make sure old-style v3 models load, and reload. Fixes #751 core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @2f2c70c   7 years mathieu Fix problem with reloading. Re #673 core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @8f93522   7 years pkienzle hide structure factor background/scale from sasview gui. Fixes #657. core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @ed10b57   7 years mathieu Allow loading of custom model of the same name as a std model (append … core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @5b37fd6   7 years wojciech Needed to try except clause, otherwise was failing when trying disatch … core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @886fa25   7 years ajj Ticket576 - updated custom models not being recompiled (#10) * OpenCL … core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9c1a59c   8 years pkienzle use array weights for array models; use distribution parameters from … core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @3bcb88c   8 years pkienzle allow fitting of models with hidden polydisperse parameters (e.g., … core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @300a2f7   8 years pkienzle Force programs to be recompiled on OpenCL when they are changed. Ref #576 core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @bde38b5   8 years pkienzle simplify kernel calling core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @fd19811   8 years pkienzle lint core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @c95dfc63   8 years pkienzle support existing sum and product models core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9457498   8 years pkienzle support old style custom formula models (but not sum or product) core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @99f446a   8 years pkienzle fix dispersion distribution selector core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @b32dafd   8 years pkienzle lint core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @50ec515   8 years pkienzle spherical sld: document interface shape number→interface relationship … core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @e7fe459   8 years pkienzle spherical sld: sasview assumes profile needs to be scaled by 1e6 core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @4e0968b   8 years pkienzle spherical sld: doc cleanup (with syntax errors fixed) core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @745b7bb   8 years pkienzle spherical sld: doc cleanup core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @4edec6f   8 years pkienzle fix sasview for new kernel interface core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @9eb3632   8 years pkienzle restructure kernels using fixed PD loops core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @6a0d6aa   8 years pkienzle magnetic models working in sasview core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @32e3c9b   8 years pkienzle dll version of magnetic sld core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
(edit) @ce176ca   8 years pkienzle fix parameter show/hide for multiplicity models core_shell_microgelscostrafo411magnetic_modelrelease_v0.94release_v0.95ticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
Note: See TracRevisionLog for help on using the revision log.