|
|
|
@9f8ade1
|
7 years |
pkienzle |
python 3 moves thread to _thread
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@c0d7ab3
|
7 years |
pkienzle |
split gpu setup from sasmodels installation
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9844c3a
|
7 years |
pkienzle |
add note to the model writer about integer parameters
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0f48f1e
|
7 years |
pkienzle |
remove any associated .pyc file before loading a module from path; this …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@b866abf
|
7 years |
pkienzle |
make sure doc build doesn't require access to display
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@058460c
|
7 years |
lewis |
Better error message for invalid P(Q)*S(Q) models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@dd4f5ed
|
7 years |
noreply |
Merge pull request #41 from SasView?/ticket-741
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ca04add
|
7 years |
lewis |
Modify model docs to render correctly on marketplace
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2ba5ba5
|
7 years |
lewis |
Try to fix deploy again
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bef029d
|
7 years |
butler |
Merge branch 'master' of https://github.com/SasView/sasmodels.git
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@5da1ac8
|
7 years |
butler |
further clarify star polymer documentation
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@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
|
|
|
@946c8d27
|
7 years |
pkienzle |
add a to the calc_composition_models code
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ad79f49
|
7 years |
pkienzle |
Merge branch 'master' into ticket-741
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9d1e3e4
|
7 years |
lewis |
Fix build
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0edb6c1
|
7 years |
lewis |
Merge branch 'ticket-767' of https://github.com/lewisodriscoll/sasmodels …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2ad5d30
|
7 years |
pkienzle |
remove last RST macro for greek letters from the model docs
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@765eb0e
|
7 years |
pkienzle |
allow random generation of parameters for product and mixture models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@22e922e
|
7 years |
lewis |
Merge branch 'master' into ticket-767
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ce8c388
|
7 years |
lewis |
Fix typo in travis config
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@33bf960
|
7 years |
lewis |
Try conditional deploy again
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e34fe7c
|
7 years |
lewis |
Fix key decryption
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f246d6b
|
7 years |
lewis |
Try re-encrypting travis_rsa
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9d90393
|
7 years |
lewis |
Try old deploy again
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@4673c13
|
7 years |
lewis |
Debug deploy
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@98a5871
|
7 years |
lewis |
Merge branch 'master' into ticket-767
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@7e11c3a
|
7 years |
lewis |
Try to fix deploy again
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9e9d96b
|
7 years |
lewis |
Merge branch 'master' into ticket-767
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@833c8d3
|
7 years |
lewis |
Don't decrypt keyfile until deploy
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@6726fb9
|
7 years |
lewis |
Merge branch 'master' into ticket-767
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@dd6885e
|
7 years |
lewis |
Only deploy master branch
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@be3cce9
|
7 years |
lewis |
Merge branch 'master' into ticket-767
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a57a902
|
7 years |
lewis |
Merge branch 'master' into ticket-741
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ab60822
|
7 years |
noreply |
Merge pull request #50 from SasView?/ticket-510
Ticket 510 pdf build - …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@c63a7c8
|
7 years |
lewis |
Change line.py docs
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d9d77b0
|
7 years |
lewis |
Change deploy script
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@09c975f
|
7 years |
lewis |
Retry deploy
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9a083dc
|
7 years |
lewis |
Try fixing deploy (again)
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@947a61e
|
7 years |
lewis |
Try fixing deploy again
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@55897aa
|
7 years |
lewis |
Fix deploy
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@eb77f9c
|
7 years |
lewis |
Retry deploy to sasmodels marketplace
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@fb3f5a9
|
7 years |
lewis |
Re-try travis_rsa encryption
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@6c12927
|
7 years |
lewis |
No longer try deploy to sasmodel marketplace
Deploy not working due to …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@83129f5
|
7 years |
lewis |
Try to fix deploy
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@38b8c48
|
7 years |
lewis |
Try deploy again
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@95468ca
|
7 years |
lewis |
Try new Travis build
This (should) push a copy of the sasmodels repo to …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@30b60d2
|
7 years |
pkienzle |
allow build of both latex and html
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@64eecf7
|
7 years |
pkienzle |
Merge branch 'master' into ticket-510
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a85a569
|
7 years |
lewis |
Merge branch 'master' into ticket-767
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@31ae428
|
7 years |
lewis |
Fix labelling of mixture model parameters
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@60335cc
|
7 years |
lewis |
Allow mixtures to use custom models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@dd02bce
|
7 years |
pkienzle |
Merge branch 'master' into ticket-741
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@6a5ccfb
|
7 years |
lewis |
Appropriately name models formfactor@structurefactor
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@142a8e2
|
7 years |
noreply |
Merge pull request #45 from SasView?/simulation
Simulation
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2ead7e2
|
7 years |
noreply |
Merge pull request #47 from rprospero/sesans_tof
Sesans tof
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@481ff64
|
7 years |
lewis |
Use '@' for structure factor product
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@61a4bd4
|
7 years |
lewis |
Refactor load_model_info to parse more complex model strings
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@65314f7
|
7 years |
lewis |
Ensure tests for new sum/multi models pass
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@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
|
|
|
@fb9a3b6
|
7 years |
lewis |
Allow mixture models to do multiplication as well as addition
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@573ffab
|
7 years |
butler |
fix A2 rendering in docs
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@33e475a
|
7 years |
paperspace |
Merge branch 'master' of https://github.com/SasView/sasmodels.git
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d439007
|
7 years |
butler |
Corrected errors in star_polymer documentation identified by MN student …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bedb9b0
|
7 years |
pkienzle |
address review comments for #754
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@7a3f840
|
7 years |
noreply |
Merge pull request #46 from lewisodriscoll/ticket-754
Ticket 754
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f8a2baa
|
7 years |
wojciech |
Minor edits to rst files
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f0fc507
|
7 years |
noreply |
Clarification of the Hankel transform
I've tried to tidy up the …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@133103b
|
7 years |
adam.washington |
Merge branch 'master' into sesans_tof
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@44ca3e1
|
7 years |
pkienzle |
Merge branch 'master' into ticket-741
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@cdf7dac
|
7 years |
pkienzle |
Merge branch 'master' into doc_update
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@b419c2d
|
7 years |
pkienzle |
fix travis failures due to slow linux compiler
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9e07e4a
|
7 years |
pkienzle |
travis osx does indeed need language: generic
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@5533cf4
|
7 years |
pkienzle |
travis build linux/osx 2.7, linux 3.4, osx 3.6
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@39aa0f6
|
7 years |
pkienzle |
use verbose mode on travis to see if the tests run to completion
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@c95d9255
|
7 years |
pkienzle |
test python 3.4 and 3.6; print python version in test
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@793d802
|
7 years |
pkienzle |
Merge branch 'master' into doc_update
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@870a2f4
|
7 years |
pkienzle |
fix doc builds
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d9ec8f9
|
7 years |
pkienzle |
elliptical cylinder axis ratio is 1 or greater
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@92708d8
|
7 years |
pkienzle |
re-enable ellipsoid ER
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@4553dae
|
7 years |
pkienzle |
don't generate psi dispersity if shape has rotational symmetry
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9826f82
|
7 years |
lewis |
Fix import on Python 3
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f0e09d6
|
7 years |
lewis |
Merge branch 'master' into ticket-754
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f2cbeb7
|
7 years |
lewis |
Return unit test output as string in check_model
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0f6c41c
|
7 years |
pkienzle |
set range of randomly generated magnetic SLDs
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@97d89af
|
7 years |
pkienzle |
provide default polydispersity/magnetism for sascomp if -poly/-magnetic is …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bb39b4a
|
7 years |
pkienzle |
make the sascomp command line more regular
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@232bb12
|
7 years |
pkienzle |
tuned random model generation for models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9f6823b
|
7 years |
pkienzle |
paper bag fixes for rushed commits
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@883ecf4
|
7 years |
pkienzle |
paper bag fixes for rushed commits
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2d07219
|
7 years |
pkienzle |
Merge branch 'master' into simulation
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@8c89d06
|
7 years |
pkienzle |
tuned random model generation for more models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bd21b12
|
7 years |
pkienzle |
allow None for dtype, using default precision for the model
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@8f04da4
|
7 years |
pkienzle |
tuned random model generation for more models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1511c37c
|
7 years |
pkienzle |
tuned random model generation for more models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@31df0c9
|
7 years |
pkienzle |
tuned random model generation for more models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d49ca5c
|
7 years |
pkienzle |
tuned random model generation for core_shell_sphere
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@109d963
|
7 years |
pkienzle |
set up random polydispersity; usually sets about 15% pd on a single …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@48462b0
|
7 years |
pkienzle |
tuned random model generation for even more models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@997c9ca
|
7 years |
butler |
update version number - last update was for SasView? release 4.0. New
tags …
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@404ebbd
|
7 years |
pkienzle |
tuned random model generation for more models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|