pytme 0.3b0.post1__cp311-cp311-macosx_15_0_arm64.whl → 0.3.1.post1__cp311-cp311-macosx_15_0_arm64.whl

{pytme-0.3b0.post1.dist-info → pytme-0.3.1.post1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytme
-Version: 0.3b0.post1
+Version: 0.3.1.post1
 Summary: Python Template Matching Engine
 Author: Valentin Maurer
 Author-email: Valentin Maurer <valentin.maurer@embl-hamburg.de>
@@ -25,10 +25,8 @@ Requires-Dist: h5py
 Requires-Dist: importlib_resources
 Requires-Dist: joblib
 Provides-Extra: cupy
-Requires-Dist: cupy-cuda12x>=13.0.0; extra == "cupy"
-Provides-Extra: cupy-voltools
-Requires-Dist: cupy-cuda12x>=13.0.0; extra == "cupy-voltools"
-Requires-Dist: voltools; extra == "cupy-voltools"
+Requires-Dist: cupy-cuda12x>13.0.0; extra == "cupy"
+Requires-Dist: voltools; extra == "cupy"
 Provides-Extra: pytorch
 Requires-Dist: torch; extra == "pytorch"
 Requires-Dist: torchvision; extra == "pytorch"
@@ -77,8 +75,8 @@ You can find alternative installation methods in the [documentation](https://kos
 
 Learn how to get started with
 
-- [Installation:](https://kosinskilab.github.io/pyTME/quickstart/installation.html).
-- [Template matching:](https://kosinskilab.github.io/pyTME/quickstart/matching/particle_picking.html) Find your template of interest.
+- [Installation](https://kosinskilab.github.io/pyTME/quickstart/installation.html)
+- [Template matching](https://kosinskilab.github.io/pyTME/quickstart/matching/particle_picking.html) Find your template of interest.
 - [Postprocessing](https://kosinskilab.github.io/pyTME/quickstart/postprocessing/motivation.html) Analyze template matching results and downstream integrations.
 
 ## How to Cite

{pytme-0.3b0.post1.dist-info → pytme-0.3.1.post1.dist-info}/RECORD

@@ -1,37 +1,39 @@
-pytme-0.3b0.post1.data/scripts/estimate_memory_usage.py,sha256=Ry46LXUv3SZ0g41g3RDUg9UH6hiSnnG3mHTyaGletXE,2114
-pytme-0.3b0.post1.data/scripts/match_template.py,sha256=GKTFpetaxNWpuGNX3fwmE8lMZ73MUaSe2caZoMV-UiA,37837
-pytme-0.3b0.post1.data/scripts/postprocess.py,sha256=qqndzyPK09ZqRVf0NyoGasQ8kw1J7BC5R8Ssrk0hIUg,27282
-pytme-0.3b0.post1.data/scripts/preprocess.py,sha256=eq-67cuj3WFx5jAdS56yQSVv_sCt7SRW-dqzQRbLnVE,6328
-pytme-0.3b0.post1.data/scripts/preprocessor_gui.py,sha256=JZv5r1iqsbtvRG_3h2PXEHQbb0fRCMAQdbc3hD6Cu8I,41834
-pytme-0.3b0.post1.data/scripts/pytme_runner.py,sha256=tVtF2sL4pRvWwbTiiU3Tv5hr0kpi2H3oAnt86ucmTss,26312
-pytme-0.3b0.post1.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+pytme-0.3.1.post1.data/scripts/estimate_memory_usage.py,sha256=Ry46LXUv3SZ0g41g3RDUg9UH6hiSnnG3mHTyaGletXE,2114
+pytme-0.3.1.post1.data/scripts/match_template.py,sha256=X0Sa4dBuE3fvKer--JgY7kPSyZ7H6fa5PKi2lxRoyzM,37563
+pytme-0.3.1.post1.data/scripts/postprocess.py,sha256=GVlavaLWPdbTmMeEczsrG0cGhHXW4wZOZ5zLIV0sx4o,27708
+pytme-0.3.1.post1.data/scripts/preprocess.py,sha256=eq-67cuj3WFx5jAdS56yQSVv_sCt7SRW-dqzQRbLnVE,6328
+pytme-0.3.1.post1.data/scripts/preprocessor_gui.py,sha256=R73N-UTSiAplTqyRw-SLGcGusnJVv2dlAFLuqmUrl-8,44153
+pytme-0.3.1.post1.data/scripts/pytme_runner.py,sha256=dqCd60puAOOOSvuCxrJC1MbfdsRS-ctMso5YIwM-JkI,40356
+pytme-0.3.1.post1.dist-info/licenses/LICENSE,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
 scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scripts/estimate_memory_usage.py,sha256=UiaX30o_H59vzTQZaXISxgzWj5jwgFbMoH1E5ydVHcw,2115
 scripts/eval.py,sha256=ebJVLxbRlB6TI5YHNr0VavZ4lmaRdf8QVafyiDhh_oU,2528
-scripts/extract_candidates.py,sha256=GnJb7LI0z2UpMvOS3uY6oIXUJ90R4f2V1jPK5SvJbXg,7246
-scripts/match_template.py,sha256=1PczCZKYFgk7JjmImXeomO2mcSFZaVXKlWrByGGFZa8,37838
+scripts/extract_candidates.py,sha256=B2O4Xm0eVJzBZOblfkH5za8fTxLIdBRDl89Qwkq4Kjk,8097
+scripts/match_template.py,sha256=LsoS7gPh6tx3c5uyF3v5XbATjb8jJ_jh91zmO2IruZ0,37564
 scripts/match_template_filters.py,sha256=Gj4a1b_S5NWp_dfFEPFn0D7jGf-qYgBbnTvZZ4bwqOQ,42036
-scripts/postprocess.py,sha256=rFg8roR6QSvLNNVPySST7n0U3bo0HyFo9Vp3IdddHxk,27283
+scripts/postprocess.py,sha256=ysI1hBFqRly8noeOgL2ZONm27hSkPoVsbeG1kwI53G4,27709
 scripts/preprocess.py,sha256=PrtO0aWGbTvSMqCdNYuzW02FoGvSsvQzJab52DTssQ4,6329
-scripts/preprocessor_gui.py,sha256=m7MK7unTd6Bk4ao-1D-sy29Z75v9B_0EIy7kCiHEA1E,41835
-scripts/pytme_runner.py,sha256=F81QrC13M5RqloDtEKUz0YKO8B31BJxsBmMdG7uf6Qo,26313
-scripts/refine_matches.py,sha256=pwhmIlApvtJ5uyZwqbgkETso_ggrfNa2HIYnkRtgv50,21899
+scripts/preprocessor_gui.py,sha256=eozUE6D_vJOO11Prardwm7zWrjvTXLHFaAMmY7yfNIc,44154
+scripts/pytme_runner.py,sha256=BD5u45vtzJo_d6ZAM2N_CKnGpfjtNg4v7C-31vbTGnU,40357
+scripts/refine_matches.py,sha256=1AG-E2PuTauflR_qVC1CaZKg7ev9xxGu3CIYeyJ2-WQ,12777
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_analyzer.py,sha256=HNZf12dZbuMTJ1oYhdDd1nn9NSGXV12ReEqRjNQ96UI,8393
-tests/test_backends.py,sha256=sSiTQbtn7SOi-SDcBPKGXCA8X9_Ydo9iQPILAKlmxvE,17567
-tests/test_density.py,sha256=vzzy0Gk3uUR096aZgA-e5gOfLnw9qG3RH-xyXtHCO_I,18971
-tests/test_extensions.py,sha256=1Zv9dG_dmmC2mlbX91YIPyGLSToPC0202-ffLAfVcr4,5203
+tests/test_analyzer.py,sha256=9TVJacQF44AnMYOWfLhqQgz1V2TeKjijVT1rJb50NMw,8360
+tests/test_backends.py,sha256=65jCvPfB2YjUHkhmjkC49Rpd1SyPRQ7_lnLXHI5QC-U,17361
+tests/test_density.py,sha256=JVQunV445qij5WdcpKn-5GKqT3endzjXvBPkIaXPADo,18914
+tests/test_extensions.py,sha256=K71MvMhLdZz66ifJYqRl0IEr7-PCXSMxKokg-4NCc8Q,5170
 tests/test_matching_cli.py,sha256=JF7LQixpFQMpbijoPwtNSe9FoYXZmBR6J3T5BvsLbR8,11202
 tests/test_matching_data.py,sha256=U6ISe4lBLDj-OzgA6QAaoO_aegCJjPtXqHbPiPZ2tkA,6091
 tests/test_matching_exhaustive.py,sha256=bRPCN0pyZk3DmXMrWRcEGAksYoch8P7fRiwE3g0yIf4,4039
 tests/test_matching_memory.py,sha256=XrBGRi4cIp3-4nN6s7tj0pBbFJrvJaG3vQdtK-6uzY0,1151
 tests/test_matching_optimization.py,sha256=bYt3d_nHewTRxKCXgGaMLhObkqBufGwrYL4gfinr_jE,7732
-tests/test_matching_utils.py,sha256=mWX2_uaYMR49w-TF0-uDoWB5ffVLbY5kVXZ1KmCAeco,6318
+tests/test_matching_utils.py,sha256=m6mkjo-rgA0q67MYQwjeyy_y6GBErh68A-lqxvQ8NT4,4948
 tests/test_orientations.py,sha256=ydqYZc3mOWSweFEGWMrMaygxX7-7in7forUtiNWfQKc,6767
 tests/test_parser.py,sha256=57oaksWrKNB4Z_22IxfW0nXMyQWLJFVsuvnJQPhMn10,993
-tests/test_rotations.py,sha256=CTEkpO8Z-6afgCIk2wGexXBaOqUeGJL2-krm1z4YRFY,5358
+tests/test_rotations.py,sha256=Kll51PZm_5MWP6TcW_II6oJLgORM4piZtWbzhn2fiA8,5374
 tests/test_structure.py,sha256=Qgrex3wYl9TpFLcqMeUOkq-7w93bzEsMNStKdJdsbnw,8881
+tests/data/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 tests/data/README.md,sha256=RMyG_mojKLo6AEIHUj40nTPI7ZGcs_6dRzWSRGxTgGY,83
+tests/data/Blurring/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 tests/data/Blurring/blob_width18.npy,sha256=_BVu5T2q_8N5lA2KCMUTLwknec8fHXh9Nsyoa4ov0wo,21408
 tests/data/Blurring/edgegaussian_sigma3.npy,sha256=OvxXAyJs5V_m7b91BFhBqS9BnisKWbckVcMlHuChQiY,21408
 tests/data/Blurring/gaussian_sigma2.npy,sha256=OS9sNpu0Y7l--X8dyB-mp-EE5eaNHISqiNkOOutllfc,21408
@@ -41,8 +43,11 @@ tests/data/Blurring/localgaussian_sigma0510.npy,sha256=KXASnlhxAnvvcgIDCniIHkak-
 tests/data/Blurring/mean_size5.npy,sha256=2APwsCR_1fpwGIc_mG0dPegpcbgXhUbcEEeQo9Wa1iA,42688
 tests/data/Blurring/ntree_sigma0510.npy,sha256=HxYh_ItxdKulp8UiPMzQ0ze2iiQ3Oi7seWFvEzO1kWQ,21408
 tests/data/Blurring/rank_rank3.npy,sha256=MxCsomoNPmiV0Cd-5nl2S8TYCfLyEj-WV19gLH_xe0c,21408
+tests/data/Maps/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 tests/data/Maps/emd_8621.mrc.gz,sha256=ZAlSOQRT9B_e8xpeodio9j0WBzygl2R1ctg9m8QhCRA,4572566
+tests/data/Raw/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 tests/data/Raw/em_map.map,sha256=YeY_R0p-90-oZgxfbKGIsyE5bui_uWq9iGhWl0bLYZI,22304
+tests/data/Structures/.DS_Store,sha256=1lFlJ5EFymdzGAUAaI30vcaaLHt3F1LwpG7xILf9jsM,6148
 tests/data/Structures/1pdj.cif,sha256=QdO4e2ulO621PVoK3q9n0qDPDKnzJpV6sPeG6zQec1A,169343
 tests/data/Structures/1pdj.pdb,sha256=nTFGjecultoXNVUBDdsyho0CEzX5i1fSo_aBYDh5-pU,115749
 tests/data/Structures/5khe.cif,sha256=SnC0so37wyuoYwAX5UDTTLvQiknZXxeJrvkGai-11rw,214644
@@ -53,39 +58,41 @@ tests/preprocessing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 tests/preprocessing/test_compose.py,sha256=z44fgQhxJU0-zHSV0CLBMEJqwhK5gEFDhUCLuVsQpQc,2490
 tests/preprocessing/test_frequency_filters.py,sha256=UmOK5a67tZeeppE0_O8f3ZczxI6RLIyBuVeHdaPT3tk,7057
 tests/preprocessing/test_preprocessor.py,sha256=XyR4xc4YM76PUKuTIiive76Q85DdcyDAvbXNGcoKL8w,4820
-tests/preprocessing/test_utils.py,sha256=2V1a9XtFZYmCyQzgsj0qWzWuXg-JAsOoG5_rtTwxvGg,3031
+tests/preprocessing/test_utils.py,sha256=RnqlA3vHcVguWp0gmBOwBgUZK85ylNLqr_oFkf8wVFo,3706
 tme/__init__.py,sha256=GXfIuzU4fh2KZfgUOIXnNeKlJ8kSp3EqoBr6bSik848,217
-tme/__version__.py,sha256=qYfo45YGvS-HdfrXh9bz8U8hmQRcBHt7Oa8v3GN0B9E,29
+tme/__version__.py,sha256=r4xAFihOf72W9TD-lpMi6ntWSTKTP2SlzKP1ytkjRbI,22
 tme/cli.py,sha256=48Q7QGIuCwNSms5wOnGmWjMSlZrXjAQUz_9zsIFT9tY,3652
-tme/density.py,sha256=GSKrM45ZixRjh86bekmR02m6NjoLsLG3NIHZRBXzojU,82514
-tme/extensions.cpython-311-darwin.so,sha256=vNaZYhhSrVlCjBlj5nzpKcnnJ_L_-84WhTRz2kWYK2Y,395696
-tme/matching_data.py,sha256=ts3RQePEHaL4FcNrYZHp3cUenpqZ3i0Brv6ZmeUwK_8,30898
-tme/matching_exhaustive.py,sha256=xUKe8eg4muEoHRDHHZTBlwntGFesM_0A-Oppt1e2aOg,18852
-tme/matching_optimization.py,sha256=xWWjCN_BsTEdHwkIs1-BgTh6ayh4e7SlwotSykDtix4,45687
-tme/matching_scores.py,sha256=UTaEdV3H6Wm3jpFkH8y-z8PiuzCnDjH8dd137-EI1VM,41376
-tme/matching_utils.py,sha256=NS18oIYdPnBYSy16HU7QPS3FIf9h0k8CvBMWM-4pp_8,37643
-tme/memory.py,sha256=UC8L00aINgz7po2xqwpZzKZRrnsoCJGp58rCjZSwGb4,9679
-tme/orientations.py,sha256=7rvhN3pmbCU5vzXRaCJQEKwWrjFTsWhFZ4TDUCar-CA,21394
+tme/density.py,sha256=iupy3gL7gwE2Q9FHcZfHY_AcbOSUAo3i9tSbC-KF-DA,82405
+tme/extensions.cpython-311-darwin.so,sha256=xUCjh1eMK3iKWMC04oFG3LzxBRAqHpl7idIIV4ezx3Q,415840
+tme/mask.py,sha256=4xHqWtOabgdYDDCXHpXflaZmLlmE2_9-bxjs4AaCIYM,10472
+tme/matching_data.py,sha256=y6UBUykYpZHsl5NEDyKthKztuwcKFIaOIlB0eEh-Sww,31255
+tme/matching_exhaustive.py,sha256=DnWl7zBfnK83MFZzLDQ9WsBvI2mZkTikxpiXIWrdmxQ,18385
+tme/matching_optimization.py,sha256=r2zMyOKyvoP8OX9xValJE0DLWbLpNdyY1MLWcOi-H1U,45715
+tme/matching_scores.py,sha256=sX4hMki9WjwgenNWJ1wNu04J808wOgGuVqbRYSA2TB8,35860
+tme/matching_utils.py,sha256=Qn65B2F8v1yHLetqpiirvUbj-A9-J1giq3lE9cSb-1E,27426
+tme/memory.py,sha256=lOD_XJtAWo3IFG5fJIdYgLSpn8o0ORO6Vua_tlm5YEk,9683
+tme/orientations.py,sha256=xMVC5FWDNYSoiIpRXqTi3K1QiSsH2ilUoDEUqEJLYzk,21642
 tme/parser.py,sha256=d59A7meIUJ8OzfB6eaVqd7CwLj9oYnOfubqlvygbu1U,24210
 tme/preprocessor.py,sha256=7DAGRfCPc9ge-hEuYsNA_KCeajVnpWl-w4NzGQS53GM,40377
-tme/rotations.py,sha256=VTWzVyfsih1qGeE5hHPvusAAsic2trWA7-bjyAizoYU,10622
+tme/rotations.py,sha256=wVnvZrRCHb1wd5E6yDsLxiP2G0Oin66A4W14vsz4i50,10641
 tme/structure.py,sha256=ojk-IQnIe1JrzxUVHlNlyLxtwzNkNykvxTaXvyBMmbs,72135
 tme/types.py,sha256=NAY7C4qxE6yz-DXVtClMvFfoOV-spWGLNfpLATZ1LcU,442
 tme/analyzer/__init__.py,sha256=aJyVGlQwO6Ij-_NZ5rBlgBQQSIj0dqpUwlmvIvnQqBM,89
-tme/analyzer/_utils.py,sha256=BFC1mWXqh5DGj1FmpjP4ZsIIEqegbdYnrL3ceI4Ux3k,6339
-tme/analyzer/aggregation.py,sha256=DaZ_lgKPernaEdoaIk_HTGUpdkEVrPv1zKtKT0AsI68,27757
+tme/analyzer/_utils.py,sha256=48Xq2Hi_P3VYl1SozYz3WwEj3BwL1QdtFYx7dTxv0bc,6344
+tme/analyzer/aggregation.py,sha256=3ieZlNcDp0dhnQ85DdVLsCFrRfqU4jim3JRcMwORF_U,28518
 tme/analyzer/base.py,sha256=2uEYKa0xLwggJUenAA6-l8DIO5sYtklHMg9dR3DzAOI,3887
-tme/analyzer/peaks.py,sha256=OISX30eqabTP_RoDTjlkrlYwaMPVGEErdglo88J6gU8,32682
+tme/analyzer/peaks.py,sha256=y40YVa2zJFLWD3aoP0xtuhK8yOrQV0AVH6ElWyVjXkM,32587
 tme/analyzer/proxy.py,sha256=NH0J93ESl5NAVd_22rLZGDWjCx1ov8I995Fr3mYqUSM,4162
 tme/backends/__init__.py,sha256=VUvEnpfjmZQVn_9QHkLPBoa6y8M3gDyNNL9kq4OQNGE,5249
 tme/backends/_cupy_utils.py,sha256=scxCSK9BcsDaIbHR2mFxAJRIxdc0r5JTC1gCJmVJa64,24558
-tme/backends/_jax_utils.py,sha256=5VKafAuxl_oedeAB6DQ0cclITriv4vblbOQUHrFOWoY,5805
-tme/backends/cupy_backend.py,sha256=VkHbVriJqOUU6HtbAMWy58MDtqdQghzJNvlL8E_kaY4,9747
-tme/backends/jax_backend.py,sha256=nIiecMvdyjjvaHYYq27t_rgaA6jIp5qrtA7irXetnBg,11325
-tme/backends/matching_backend.py,sha256=eFBtFy4_kSoprFJugkXEZ8QYQsTFnJX46STRw6b70Aw,34856
-tme/backends/mlx_backend.py,sha256=DxcKJmORTDuFFJ6EVVhZOuuiYt88swc314M6MbmCfSw,7756
-tme/backends/npfftw_backend.py,sha256=LE7mgxsaKdqODXeG6uYvlC8ulZGtxGi9MYGD9rm5khc,19340
-tme/backends/pytorch_backend.py,sha256=xo3YxljJTCekl4XfaCPL1l7NOieTj9ORiManFGJj-3I,15163
+tme/backends/_jax_utils.py,sha256=UrC0RwwxwnNdz6QusPOgC8eISTX_C1KbZmt7Karl_Nk,6096
+tme/backends/_numpyfftw_utils.py,sha256=RnYgbSs_sL-NlwYGRqU9kziq0U5qzl9GecVx9uUeSJs,7904
+tme/backends/cupy_backend.py,sha256=Ms2sObxr0xc_tdHctcL659G8YWOTqPG59F3665yZH4c,8163
+tme/backends/jax_backend.py,sha256=d14u__H9leb5aXCz383T1xjTrGOzxgfWxXjgRrRWZMI,12676
+tme/backends/matching_backend.py,sha256=B9LXxKpfNYdJBIksyGm7g7V7SC9G3mrluscz3aqISsU,33199
+tme/backends/mlx_backend.py,sha256=3aAKv7VkK_jfxwDMPQZsLp_lRU8MBJ6zNAzrs6VZd3s,6718
+tme/backends/npfftw_backend.py,sha256=8-Hs3slqnWvsHpqICxKxb-fbmg3IbSok3sThXew-P7M,18800
+tme/backends/pytorch_backend.py,sha256=yn1hhowUMmzMLHdh2jqw2B0CvBIVcSAWOvRMMDkSHmw,14229
 tme/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tme/data/c48n309.npy,sha256=NwH64mOEbm3tStq5c98o81fY1vMOoq4nvXDAh7Z7iZg,296768
 tme/data/c48n527.npy,sha256=saSUMTa1R0MisPvgFL02a7IHQSwEZ-mJu0v3qJjg5AU,506048
@@ -115,12 +122,12 @@ tme/filters/__init__.py,sha256=aDgaWTCcl01BVamzrc8iEyfTfeRB4OdNRU1ywRZ8450,292
 tme/filters/_utils.py,sha256=VZj7qixVhmFmXIvssxJ0PoUNv2SyyYXFLvY3zZoYyr8,10874
 tme/filters/bandpass.py,sha256=-xmoBhMIDQA_ah2kiERfom0T9oVZ5n0avt0HLZ90OtQ,8751
 tme/filters/compose.py,sha256=yeC84D0HznqhRJ7guV6Cpxzq2UWpvV6nouhFECjIDEw,1980
-tme/filters/ctf.py,sha256=SAkpjCPzM3YVHFHWLH422kqKmKS9XBD2eYxaALEex_I,24132
+tme/filters/ctf.py,sha256=HNB03Pw3gn2Y8pIM2391iRHQzp2NcHZWFDC61v3K0oM,24520
 tme/filters/reconstruction.py,sha256=4gCGpuWuM-yCDQvuzyex_Q8bmsFqUI_8IoZnv3B_3UA,7564
-tme/filters/wedge.py,sha256=jB53gbBCtXm1Ga--vuObWaNV1T0bArskmSD4Xs6GEYo,19462
+tme/filters/wedge.py,sha256=JWiN9IwRXnc7A7syq11kSuin6QjhlVmi38nwGHu4yxE,19541
 tme/filters/whitening.py,sha256=Zwk-0jMVqy_F8TdQ0ht5unMz2JBOePOC3okUhQpU0bo,6348
-pytme-0.3b0.post1.dist-info/METADATA,sha256=AKQpO_empsgGAkCbodWyG76HN3e3Bt5ZRn-Et2-JAZk,5090
-pytme-0.3b0.post1.dist-info/WHEEL,sha256=SPbiHAOPLnBtml4sk5MIwvWF6YnGfOfy9C__W6Bpeg4,109
-pytme-0.3b0.post1.dist-info/entry_points.txt,sha256=pbUSmB0J4Ghlg0w7jHfaFSvPMuvRWzeSuvdjdRPisAU,288
-pytme-0.3b0.post1.dist-info/top_level.txt,sha256=ovCUR7UXXouH3zYt_fJLoqr_vtjp1wudFgjVAnztQLE,18
-pytme-0.3b0.post1.dist-info/RECORD,,
+pytme-0.3.1.post1.dist-info/METADATA,sha256=2EXMjS9Dx7TEo0gDEgGjvWD7rKnhJ0eTTb4AalGW9kE,4985
+pytme-0.3.1.post1.dist-info/WHEEL,sha256=SPbiHAOPLnBtml4sk5MIwvWF6YnGfOfy9C__W6Bpeg4,109
+pytme-0.3.1.post1.dist-info/entry_points.txt,sha256=pbUSmB0J4Ghlg0w7jHfaFSvPMuvRWzeSuvdjdRPisAU,288
+pytme-0.3.1.post1.dist-info/top_level.txt,sha256=ovCUR7UXXouH3zYt_fJLoqr_vtjp1wudFgjVAnztQLE,18
+pytme-0.3.1.post1.dist-info/RECORD,,

scripts/extract_candidates.py

@@ -1,19 +1,22 @@
 #!python3
-""" Prepare orientations stack for refinement.
+"""Prepare orientations stack for refinement.
 
-    Copyright (c) 2023 European Molecular Biology Laboratory
+Copyright (c) 2023 European Molecular Biology Laboratory
 
-    Author: Valentin Maurer <valentin.maurer@embl-hamburg.de>
+Author: Valentin Maurer <valentin.maurer@embl-hamburg.de>
 """
 import argparse
-from os.path import splitext
+from os import unlink
+from os.path import splitext, basename
 
 import numpy as np
+from collections import defaultdict
 
+from tme.parser import StarParser
 from tme import Density, Orientations
-from tme.matching_utils import (
-    generate_tempfile_name,
-    rotation_aligning_vectors,
+from tme.matching_utils import generate_tempfile_name
+from tme.rotations import (
+    align_vectors,
     euler_from_rotationmatrix,
     euler_to_rotationmatrix,
 )
@@ -25,7 +28,7 @@ class ProgressBar:
     """
 
     def __init__(self, message: str, nchars: int, total: int):
-        self._size = nchars - len(message) - (len(str(total))+2) * 2
+        self._size = nchars - len(message) - (len(str(total)) + 2) * 2
         self._message = message
         self._total = total
 
@@ -45,20 +48,14 @@ def parse_args():
     )
 
     io_group = parser.add_argument_group("Input / Output")
-    io_group.add_argument(
-        "--target",
-        required=True,
-        type=str,
-        help="Extract candidates from this target.",
-    )
     io_group.add_argument(
         "--orientations",
         required=True,
         type=str,
-        help="Path to file generated by postprocess.py using output_format orientations.",
+        help="Star file with picks and micrograph names.",
     )
     io_group.add_argument(
-        "--orientations_sampling",
+        "--orientations-scaling",
         required=False,
         type=float,
         default=1.0,
@@ -67,54 +64,59 @@ def parse_args():
     )
     io_group.add_argument(
         "-o",
-        "--output_file",
+        "--output-prefix",
         required=True,
         type=str,
-        help="Path to write output H5 file.",
+        help="Output prefix to use.",
     )
 
     alignment_group = parser.add_argument_group("Alignment")
     alignment_group.add_argument(
-        "--align_orientations",
+        "--align-orientations",
         action="store_true",
         required=False,
         help="Whether to align extracted orientations based on their angles. Allows "
         "for efficient subsequent sampling of cone angles.",
     )
     alignment_group.add_argument(
-        "--angles_are_vector",
+        "--angles-are-vector",
         action="store_true",
         required=False,
         help="Considers euler_z euler_y, euler_x as vector that will be rotated to align "
         "with the z-axis (1,0,0). Only considered when --align_orientations is set.",
     )
     alignment_group.add_argument(
-        "--interpolation_order",
-        dest="interpolation_order",
+        "--interpolation-order",
         required=False,
         type=int,
         default=1,
         help="Interpolation order for alignment, less than zero is no interpolation.",
     )
+    alignment_group.add_argument(
+        "--split-by-micrograph",
+        action="store_true",
+        required=False,
+        help="Create separate output files for each micrograph."
+    )
 
     extraction_group = parser.add_argument_group("Extraction")
     extraction_group.add_argument(
-        "--box_size",
-        required=False,
+        "--box-size",
+        required=True,
         type=int,
-        help="Box size for extraction, defaults to two times the template.",
+        help="Box size for extraction.",
     )
     extraction_group.add_argument(
-        "--translation_uncertainty",
+        "--translation-uncertainty",
         required=False,
         type=int,
         help="Sets box size for extraction to template box plus this value.",
     )
     extraction_group.add_argument(
-        "--keep_out_of_box",
+        "--drop-out-of-box",
         action="store_true",
         required=False,
-        help="Whether to keep orientations that fall outside the box. If the "
+        help="Whether to drop orientations that fall outside the box. If the "
         "orientations are sensible, it is safe to pass this flag.",
     )
 
@@ -125,100 +127,117 @@ def parse_args():
 
 def main():
     args = parse_args()
+
+    data = StarParser(args.orientations, delimiter="\t")
+    key = list(data.keys())[0]
+
+    index_map = defaultdict(list)
+    for index, value in enumerate(data[key]["_rlnMicrographName"]):
+        index_map[value].append(index)
+
     orientations = Orientations.from_file(args.orientations)
     orientations.translations = np.divide(
-        orientations.translations, args.orientations_sampling
+        orientations.translations, args.orientations_scaling
     )
 
-    target = Density.from_file(args.target, use_memmap=True)
-
     box_size = np.array(args.box_size)
-    box_size = np.repeat(box_size, target.data.ndim // box_size.size).astype(int)
-
+    box_size = np.repeat(box_size, 3 // box_size.size).astype(int)
     extraction_shape = np.copy(box_size)
-    if args.align_orientations:
-        extraction_shape[:] = int(np.linalg.norm(box_size) + 1)
-
-    orientations, cand_slices, obs_slices = orientations.get_extraction_slices(
-        target_shape=target.shape,
-        extraction_shape=extraction_shape,
-        drop_out_of_box=not args.keep_out_of_box,
-        return_orientations=True,
-    )
 
     if args.align_orientations:
+        extraction_shape[:] = int(np.linalg.norm(box_size) + 1)
         for index in range(orientations.rotations.shape[0]):
             rotation_matrix = euler_to_rotationmatrix(orientations.rotations[index])
             rotation_matrix = np.linalg.inv(rotation_matrix)
             if args.angles_are_vector:
-                rotation_matrix = rotation_aligning_vectors(
+                rotation_matrix = align_vectors(
                     orientations.rotations[index], target_vector=(1, 0, 0)
                 )
             orientations.rotations[index] = euler_from_rotationmatrix(rotation_matrix)
 
-    filename = generate_tempfile_name()
-    output_dtype = target.data.dtype
-    if args.align_orientations is not None:
-        output_dtype = np.float32
-
-    target.data = target.data.astype(output_dtype)
-
-    dens = Density(
-        np.memmap(
-            filename,
-            mode="w+",
-            shape=(len(obs_slices), *box_size),
-            dtype=output_dtype,
-        ),
-        sampling_rate=(1, *target.sampling_rate),
-        origin=(0, *target.origin),
-    )
-    dens.data[:] = target.metadata["mean"]
-
-    data_subset = np.zeros(extraction_shape, dtype=target.data.dtype)
-    pbar = ProgressBar(message="Aligning ", nchars=80, total=len(obs_slices))
-    for index, (obs_slice, cand_slice) in enumerate(zip(obs_slices, cand_slices)):
-        pbar.update(index + 1)
-
-        data_subset.fill(0)
-        data_subset[cand_slice] = target.data[obs_slice]
-        target_subset = Density(
-            data_subset,
-            sampling_rate=target.sampling_rate,
-            origin=target.origin,
+    ret_orientations, ret_dens, ix = [], [], 0
+    n_particles = orientations.translations.shape[0]
+    pbar = ProgressBar(message="Processing ", nchars=80, total=n_particles)
+    for target_path, indices in index_map.items():
+
+        target = Density.from_file(target_path, use_memmap=True)
+
+        subset = orientations[indices]
+        subset, cand_slices, obs_slices = subset.get_extraction_slices(
+            target_shape=target.shape,
+            extraction_shape=extraction_shape,
+            drop_out_of_box=args.drop_out_of_box,
+            return_orientations=True,
         )
 
-        if args.align_orientations:
-            rotation_matrix = euler_to_rotationmatrix(orientations.rotations[index])
-            target_subset = target_subset.rigid_transform(
-                rotation_matrix=rotation_matrix,
-                use_geometric_center=True,
-                order=args.interpolation_order,
+        dens = Density(
+            np.memmap(
+                generate_tempfile_name(),
+                mode="w+",
+                shape=(subset.translations.shape[0], *box_size),
+                dtype=np.float32,
+            ),
+            sampling_rate = (1, *target.sampling_rate),
+            metadata = {"batch_dimension" : (0,), "path" : target_path}
+        )
+
+        data_subset = np.zeros(extraction_shape, dtype=target.data.dtype)
+        for index, (obs_slice, cand_slice) in enumerate(zip(obs_slices, cand_slices)):
+            pbar.update(ix + 1)
+
+            data_subset.fill(0)
+            data_subset[cand_slice] = target.data[obs_slice]
+            target_subset = Density(
+                data_subset,
+                sampling_rate=target.sampling_rate,
+                origin=target.origin,
             )
-        target_subset.pad(box_size, center=True)
 
-        # target_value = target.data[tuple(orientations.translations[index].astype(int))]
-        # center = np.divide(target_subset.data.shape, 2).astype(int)
-        # print(np.where(target_subset.data == target_value), center)
-        # print(target_subset.data[tuple(center.astype(int))],
-        # target_value,
-        # target_subset.data[tuple(center.astype(int))] == target_value
-        # )
+            if args.align_orientations:
+                rotation_matrix = euler_to_rotationmatrix(subset.rotations[index])
+                target_subset = target_subset.rigid_transform(
+                    rotation_matrix=rotation_matrix,
+                    use_geometric_center=True,
+                    order=args.interpolation_order,
+                )
+            target_subset.pad(box_size, center=True)
+            dens.data[index] = target_subset.data.astype(np.float32)
+            ix += 1
 
-        dens.data[index] = target_subset.data
-    print("")
+        ret_dens.append(dens)
+        ret_orientations.append(subset)
 
-    target_meta = {
-        k: v for k, v in target.metadata.items() if k in ("mean", "max", "min", "std")
-    }
-    dens.metadata.update(target_meta)
-    dens.metadata["batch_dimension"] = (0,)
-    dens.metadata["normals"] = orientations.rotations
+    if not len(ret_dens):
+        exit("Found no valid particles.")
 
-    dens.to_file(args.output_file)
-    orientations.to_file(
-        f"{splitext(args.output_file)[0]}_aligned.tsv", file_format="text"
-    )
+    print("")
+    if not args.split_by_micrograph:
+        ret_orientations = [Orientations(
+            translations=np.concatenate([x.translations for x in ret_orientations]),
+            rotations=np.concatenate([x.rotations for x in ret_orientations]),
+            scores=np.concatenate([x.scores for x in ret_orientations]),
+            details=np.concatenate([x.details for x in ret_orientations]),
+        )]
+        dens_data = Density(
+            np.concatenate([x.data for x in ret_dens]),
+            sampling_rate=ret_dens[0].sampling_rate
+        )
+        _ = [unlink(x.data.filename) for x in ret_dens]
+        dens_data.metadata.update({"batch_dimension" : (0, )})
+        ret_dens = [dens_data]
+
+    for orientation, dens in zip(ret_orientations, ret_dens):
+        fname = args.output_prefix
+        if args.split_by_micrograph:
+            target = splitext(basename(dens.metadata["path"]))[0]
+            fname = f"{args.output_prefix}_{target}"
+
+        dens.to_file(f"{fname}.h5")
+        orientation.to_file(f"{fname}_aligned.star")
+        try:
+            unlink(dens.data.filename)
+        except Exception:
+            continue
 
 if __name__ == "__main__":
     main()