|
|
|
@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
|
|
|
@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
|
|
|
@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
|
|
|
@df69efa
|
7 years |
pkienzle |
correct name for log1p function
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d0dc9a3
|
7 years |
pkienzle |
document GAUSS_N, GAUSS_Z, GAUSS_W and simplify use from sasmodels.special
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@7dde87f
|
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
|
|
|
@0f113fb
|
7 years |
pkienzle |
Merge branch 'master' into ticket-786
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@791281c
|
7 years |
noreply |
polymer_micelle code verified and description reviewed
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ef07e95
|
7 years |
pkienzle |
use consistent formatting for 'Last Reviewed'
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@5a99d43
|
7 years |
pkienzle |
polymer micelle: correct typo in doc to show the correct equation
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@37f08d2
|
7 years |
pkienzle |
lint
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@6e68289
|
7 years |
pkienzle |
suppress lint errors from scipy
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a261a83
|
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
|
|
|
@10ee838
|
7 years |
pkienzle |
core_shell_parallelepiped: use ER from parallelepiped, with a, b, c …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@4493288
|
7 years |
pkienzle |
core_shell_parallelepiped: simplify the calculation and update the docs
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0e55afe
|
7 years |
pkienzle |
Merge branch 'master' into ticket-786
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@b669b49
|
7 years |
pkienzle |
let pylint know about sas module
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@237b800f
|
7 years |
pkienzle |
maybe reenable pylint
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@2d81cfe
|
7 years |
pkienzle |
lint
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a839b22
|
7 years |
pkienzle |
lint
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@fa79f5c
|
7 years |
pkienzle |
restore working sesans example using direct model
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@32398dc
|
7 years |
pkienzle |
remove sascomp support for sasview 3.x models
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e65c3ba
|
7 years |
pkienzle |
lint
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@110f69c
|
7 years |
pkienzle |
lint
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0b07b91
|
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
|
|
|
@688d315
|
7 years |
pkienzle |
Merge branch 'ticket-776-orientation' into ticket-786
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@8c7d5d5
|
7 years |
pkienzle |
Merge branch 'master' into ticket-776-orientation
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@435cc89
|
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
|
|
|
@4073633
|
7 years |
pkienzle |
Merge branch 'ticket-776-orientation' into ticket-786
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1f159bd
|
7 years |
pkienzle |
fcc/bcc paracrystal, core shell parallelepiped: suppress broken tests
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ac60a39
|
7 years |
pkienzle |
Merge branch 'master' into ticket-776-orientation
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@4f5afc9
|
7 years |
pkienzle |
magnetism: add docs about spin state weighting in final calc
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9248bf7
|
7 years |
pkienzle |
ignore lib/gauss###.c files created when playing with integration accuracy
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@fa70e04
|
7 years |
pkienzle |
suppress tests in core_shell_parallelepiped for now
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1e867a4
|
7 years |
pkienzle |
check1d doesn't make sense with -2d, so strip it from args
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d4db147
|
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
|
|
|
@ff31782
|
7 years |
pkienzle |
add -ngauss option to compare in order to set the number of integration …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@74768cb
|
7 years |
pkienzle |
update models to use generic GAUSS_N, GAUSS_Z, GAUSS_W rather than …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d8ac2ad
|
7 years |
pkienzle |
Merge branch 'ticket-776-orientation' into ticket-786
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@eb87965
|
7 years |
pkienzle |
Merge branch 'ticket-776-orientation' of github.com:sasview/sasmodels into …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@82592da
|
7 years |
richardh |
swapped 2d qa with qb in three elliptical particles, edits to orientation …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@c15e03c
|
7 years |
pkienzle |
don't need pure python parallelepiped model anymore (it is now in asymint)
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@49eb251
|
7 years |
pkienzle |
add core_shell_parallelepiped to asymint (and fix parallelepiped)
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@393facf
|
7 years |
dirk |
update documentation for core_shell_parallelepiped, …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@8de1477
|
7 years |
pkienzle |
rectangular_prism/hollow_rectangular_prism: add 2d models
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@fc0b7aa
|
7 years |
pkienzle |
core_shell_parallelepiped: modify calculation to be consistent with hollow …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@510277d
|
7 years |
pkienzle |
Merge branch 'ticket-786' of https://github.com/SasView/sasmodels into …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@376b0ee
|
7 years |
pkienzle |
sascomp: fix bug in -random when comparing models
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@146793b
|
7 years |
pkienzle |
document ProductModel? attributes
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d0462cf
|
7 years |
noreply |
Merge branch 'ticket-776-orientation' into ticket-786
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@17db833
|
7 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
|
|
|
@ce99754
|
7 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
|
|
|
@6aee3ab
|
7 years |
pkienzle |
make sure that jitter angle defaults to zero if no polydispersity
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@9d9fcbd
|
7 years |
pkienzle |
further guyou code cleanup
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ff10479
|
7 years |
pkienzle |
set projection used in theory to that selected in jitter.py
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@cf8b630
|
7 years |
pkienzle |
Merge branch 'master' into ticket-776-orientation
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bd36af0
|
7 years |
noreply |
Merge pull request #54 from SasView?/ticket1006
Fixes #1006
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@edb0f85
|
7 years |
pkienzle |
tweak implementation of sld profile for product models
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a06af5d
|
7 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
|
|
|
@129bdc4
|
7 years |
richardh |
new model with long name, core_shell_bicelle_elliptical_belt_rough, using …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f475f90
|
7 years |
pkienzle |
further guyou code cleanup
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@4991048
|
7 years |
pkienzle |
set projection used in theory to that selected in jitter.py
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@3a1fc7d
|
7 years |
pkienzle |
core_shell_parallelepiped: rewrite so that integrated 2D matches 1D
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@de71632
|
7 years |
pkienzle |
label the jitter plots with the projection name
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ebd2ba6
|
7 years |
pkienzle |
save before commit next time
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@05e4f8a
|
7 years |
pkienzle |
guyou code cleanup
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bc386f0
|
7 years |
pkienzle |
guyou code cleanup
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0f65169
|
7 years |
pkienzle |
Add Guyou projection to jitter options
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@d73a5ac
|
7 years |
pkienzle |
doc tweak for jitter
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bcb5594
|
7 years |
pkienzle |
allow selection of jitter mesh behaviour from command line
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ee95012
|
7 years |
gonzalez |
Fixes #1006 (cleaner)
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@904cd9c
|
7 years |
pkienzle |
Merge branch 'master' into ticket-776-orientation
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@5b5ea20
|
7 years |
pkienzle |
[possibly] correct weighting for the azimuthal equidistant projection
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@439ffcd
|
7 years |
gonzalezm |
Fixes #1006
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@87a6591
|
7 years |
pkienzle |
explore different map projections for jitter
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@ef969d9
|
7 years |
dirk |
Merge branch 'master' of https://github.com/SasView/sasmodels
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@c69d6d6
|
7 years |
dirk |
code rewritten for core_shell_parallelepiped adresses ticket #786
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@dd4d95d
|
7 years |
pkienzle |
consistent $-math expression for sasmodels and sasview, now allowing …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@0db85af
|
7 years |
pkienzle |
Now allowed '-' before and after '$', such as 1-$\sigma$ or $x$-$y$-$z$
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@3d40839
|
7 years |
pkienzle |
update orientation docs
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@e964ab1
|
7 years |
pkienzle |
reformat orientation docs to 80 columns
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@5f8b72b
|
7 years |
pkienzle |
80 columns for license file
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@bebdb87
|
7 years |
noreply |
Merge pull request #53 from SasView?/ticket1006
Ticket 1006
closes #1006
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@eda8b30
|
7 years |
richardh |
further changes to model docs for orientation calcs
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@da5536f
|
7 years |
richardh |
new chapters in main user and developed docs for Orientation
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@767dca8
|
7 years |
pkienzle |
use alternative jitter, which maintains constant arc length for the phi …
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a9bc435
|
7 years |
pkienzle |
fix typo in type checking support
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@1f35235
|
7 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
|
|
|
@b9578fc
|
7 years |
pkienzle |
alternative handling of phi point density: scale phi
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@89d530c
|
7 years |
gonzalez |
Remove unnecessary return in MultiplicationModel?
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@f39d4a3
|
7 years |
pkienzle |
twiddle with explore/angles.py; no change in angle defn
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@3bfd924
|
7 years |
pkienzle |
sascomp: fix scale for residuals plot
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@6db17bd
|
7 years |
pkienzle |
fix py3 support for opencl kernels
core_shell_microgelscostrafo411magnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@eb3fab6
|
7 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
|
|
|
@a7db3c05
|
7 years |
dirk |
Fix broken explore/symint.py (calling of gauss_quad_1d)
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|
@a5f91a7
|
7 years |
pkienzle |
add psi integration to check1d
core_shell_microgelsmagnetic_modelticket-1257-vesicle-productticket_1156ticket_1265_superballticket_822_more_unit_tests
|
|
|