|
|
|
@b314f89
|
7 years |
adam.washington |
Convert example spin echo files into file format version 1.0
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@580904b
|
7 years |
adam.washington |
Switch SiO2_100pc_H2O_0pc_D20.ses out of Mac line endings
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bf94e6e
|
7 years |
pkienzle |
move compiled dlls from /tmp to ~/.sasmodels/compiled_models on unix
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@49d1f8b8
|
7 years |
pkienzle |
move multiscat into sasmodels namespace to make it easier to run the …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bc248f8
|
7 years |
pkienzle |
add support for instrumental resolution to multiple scattering calculation …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1ee5ac6
|
7 years |
pkienzle |
example/fit.py: py3 compatibility
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@6cbdcd4
|
7 years |
pkienzle |
code cleanup: kernel_template.c/kernel_iq.cl are no longer used by …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d18d6dd
|
7 years |
pkienzle |
set background to 0 before calculating resolution in direct_model so that …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f549e37
|
7 years |
pkienzle |
allow plotting of non-gridded data in sasmodels
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@fc3ae1b
|
7 years |
pkienzle |
elliptical bicelle: change description of x_core to r_major/r_minor
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@362a66f
|
7 years |
pkienzle |
realspace: add shell thickness parameters in analytic comparison
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@6868151
|
7 years |
pkienzle |
realspace: fix sampling for cscyl rim
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@4f6f9431
|
7 years |
pkienzle |
realspace: fix major/minor axis mapping between monte carlo and analytic …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@893bea2
|
7 years |
pkienzle |
realspace: add elliptical cylinder and core-shell bicelle to realspace.py
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@199bd07
|
7 years |
pkienzle |
jitter: move tracking dot for paracrystal to 0,0,1
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@58a1be9
|
7 years |
pkienzle |
show paracrystal models as points in jitter explorer
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@3db96b0
|
7 years |
pkienzle |
improve plotting for 2d monte carlo calculator
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@aa90015
|
7 years |
pkienzle |
polymer_excl_volume: note in the code that scipy gammainc is regularized, …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@547c6f0
|
7 years |
pkienzle |
polymer_excl_volume: update eq. to match paper. Refs #1073
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a2ca6e5
|
7 years |
smk78 |
Updated help doc for polymer_excl_volume model in wake of Ticket 1073
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@13bd583
|
7 years |
noreply |
Merge pull request #62 from SasView?/pytest
add support for pytest and use …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e309e23
|
7 years |
pkienzle |
multiscat: improved plots
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@54a5024
|
7 years |
pkienzle |
multiscat: use correct weightings for the multiscattering contributions
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a09d55d
|
7 years |
pkienzle |
multiscat: use correct weightings for the multiscattering contributions
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@aadec17
|
7 years |
pkienzle |
opencl: remove compiler warning for Radeon
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f6fd413
|
7 years |
pkienzle |
pytest: is_generator is not part of public api, so reimplement it in …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e526a9d
|
7 years |
noreply |
Merge pull request #59 from SasView?/boltzmann
add BoltzmannDistribution? …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@032646d
|
7 years |
pkienzle |
explore/realspace.py: separate shape from lattice spec
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@8bd379a
|
7 years |
pkienzle |
explore/realspace: fix bug in numba version of x-y calculator
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@b4272a2
|
7 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
|
|
|
@3221de0
|
7 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
|
|
|
@b3af1c2
|
7 years |
pkienzle |
conftest.py cleanup
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0e7611b
|
7 years |
pkienzle |
pytest: re-enable referencing on yielded tests
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@049e02d
|
7 years |
pkienzle |
explore/multiscat.py: slightly improved help
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ae91fce
|
7 years |
pkienzle |
explore/multiscat.py multiple scattering calc with FFT
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@7d0afa3
|
7 years |
pkienzle |
explore/realspace: update monte carlo simulation with command line …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@335271e
|
7 years |
pkienzle |
remove restriction on pytest<4
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f354e46
|
7 years |
pkienzle |
yield tests: need function scope to capture context correctly
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e59f60a
|
7 years |
pkienzle |
py.test needs kernelcl import to succeed even if pyopencl is not available
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@6dba2f0
|
7 years |
pkienzle |
py.test needs kernelcl import to succeed even if pyopencl is not available
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2ab1bac
|
7 years |
pkienzle |
include matplotlib in reqs; trying fixing opencl test for travis
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1f991d6
|
7 years |
pkienzle |
add 'test' target to setup.py
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@42158d2
|
7 years |
pkienzle |
work around travis/appveyor limitations for pytest
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bb4ff2a
|
7 years |
pkienzle |
work around travis/appveyor limitations for pytest
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ecb485c
|
7 years |
pkienzle |
Merge branch 'master' into pytest
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a69d8cd
|
7 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
|
|
|
@ecf895e
|
7 years |
pkienzle |
code tidying
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@95498a3
|
7 years |
pkienzle |
allow composite models whose parts are oriented
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@49284e1
|
7 years |
noreply |
Merge pull request #61 from rprospero/better_model_info_parser
Ticket …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@7a516d0
|
7 years |
adam.washington |
Add test for model combiner
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@7fec3b7
|
7 years |
adam.washington |
Futureproof MixtureParts? class for Python3
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@3fb9404
|
7 years |
pkienzle |
Merge branch 'master' of github.com:sasview/sasmodels
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0d5a655
|
7 years |
pkienzle |
make jitter explorer available from sasview app
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@31a02f1
|
7 years |
pkienzle |
draw one face of parallelepiped in different colour on jitter …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e68bae9
|
7 years |
adam.washington |
Give "@" a higher precedence than "*" in the combined models
As mentioned …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@fefc185
|
7 years |
pkienzle |
tweak appveyor config; maybe it will work?
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@068f7b6
|
7 years |
pkienzle |
tweak appveyor config; maybe it will work?
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1f4770c
|
7 years |
pkienzle |
tweak appveyor config; maybe it will work?
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@772e49c
|
7 years |
pkienzle |
tweak appveyor config; maybe it will work?
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9c640ff
|
7 years |
pkienzle |
tweak appveyor config; maybe it will work?
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@72e41a0
|
7 years |
pkienzle |
Merge branch 'master' into boltzmann
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1258e32
|
7 years |
pkienzle |
tweak appveyor config; maybe it will work?
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e81d79b
|
7 years |
pkienzle |
tweak appveyor config; maybe it will work?
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0014c77
|
7 years |
pkienzle |
tweak appveyor config; maybe it will work?
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@924a119
|
7 years |
noreply |
Merge pull request #57 from SasView?/ticket-1043
use Iqac/Iqabc? for the …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@c1bccff
|
7 years |
noreply |
Merge pull request #56 from SasView?/generic_integration_loop
Generic …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@925b3b5
|
7 years |
noreply |
Merge pull request #55 from SasView?/ticket-786
core_shell_parallelepiped: …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ec8d4ac
|
7 years |
pkienzle |
tinycc for windows 64 did not allow passing structures by value. Ref #1050
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@88096f5
|
7 years |
pkienzle |
back out attempted marketplace update fix
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2d09df1
|
7 years |
pkienzle |
attempt to fix travis deploy to marketplace; also restrict deploy to one …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@99b84ec
|
7 years |
pkienzle |
remove templated copyright notice from gaussian distributions
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e9ed2de
|
7 years |
pkienzle |
add note to preserve gauss 20, 76, and 150 to .gitignore
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ead25cb
|
7 years |
pkienzle |
update comment to explain length 152 vector for gauss150
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@92d330fd
|
7 years |
dirk |
undo typo in polydispersity docs
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ffc2a61
|
7 years |
adam.washington |
Simplify model parser
The updated model parser uses only a single switch …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@3d58247
|
7 years |
dirk |
uniform distribution ignores nsigma
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@71bf6de
|
7 years |
adam.washington |
First draft of solution
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@3c44c34
|
7 years |
dirk |
Merge branch 'boltzmann' of https://github.com/SasView/sasmodels into …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1ceb951
|
7 years |
dirk |
closes #1060
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@8fb2a94
|
7 years |
pkienzle |
play with numba JIT compiler
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@97be877
|
7 years |
pkienzle |
update authorship/verification for core-shell parallelepiped
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e077231
|
7 years |
pkienzle |
correct internal comments in core shell parallelepiped
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2a7e20e
|
7 years |
pkienzle |
update developer docs with current interpretation of orientation; describe …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2ab331f
|
7 years |
pkienzle |
play with non-dilute cylinder models
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@226473d
|
7 years |
pkienzle |
add Iqxy to realspace explorer
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@4c08e69
|
7 years |
pkienzle |
Merge branch 'master' into boltzmann
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@22279a4
|
7 years |
pkienzle |
doc tweak: don't need to give the number of distributions in the list
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@5fb0634
|
7 years |
pkienzle |
update orientation docs
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@8cfb486
|
7 years |
pkienzle |
update orientation docs
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@06ee63c
|
7 years |
pkienzle |
update orientation docs
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@7e6bc45e
|
7 years |
pkienzle |
update orientation docs
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@93fbc34
|
7 years |
pkienzle |
Merge branch 'generic_integration_loop' into ticket-1043
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9149238
|
7 years |
pkienzle |
Merge branch 'ticket-786' into generic_integration_loop
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@c654160
|
7 years |
noreply |
Corrected typo in plugin.rst
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@b85227d
|
7 years |
pkienzle |
improve latex for 1-D integration equations
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ef85a09
|
7 years |
pkienzle |
document the new c_code='…' model definition option
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@108e70e
|
7 years |
pkienzle |
use Iqac/Iqabc? for the new orientation interface but Iqxy for the old
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a1c32c2
|
7 years |
pkienzle |
Use gauss-legendre integration for cross-checking against P(r)
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@cfa28d3
|
7 years |
pkienzle |
add monte carlo calculator as explore/realspace.py
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a189283
|
7 years |
pkienzle |
add overlap support for core-shell-parallelepiped to asymint
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|