Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug fix #267

Merged
merged 7 commits into from
Mar 30, 2022
Merged

Bug fix #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
af9dbef
Bug fix
bwohlberg Mar 30, 2022
540581a
Add fan-beam CT example to main index and rebuild other index files
Mar 30, 2022
87313b4
Update submodule
Mar 30, 2022
ad798a5
Attempt to fix workflow failure
Mar 30, 2022
9e96452
Attempt to fix workflow failure
Mar 30, 2022
051cc08
Give up on temporary fix
Mar 30, 2022
1593fea
Merge branch 'main' into brendt/bug-fix
Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ jobs:
with:
python-version: "3.8"

- name: Black Code Formatter
- name: Black code formatter
uses: psf/black@stable
with:
version: "22.3"

- name: isort Import Sorter
- name: Isort import sorter
uses: isort/[email protected]
2 changes: 1 addition & 1 deletion data
Open in desktop
Submodule data updated 13 files
+54 −68 notebooks/ct_astra_pcg.ipynb
+73 −123 notebooks/ct_astra_tv_admm.ipynb
+159 −299 notebooks/ct_astra_weighted_tv_admm.ipynb
+851 −0 notebooks/ct_fan_svmbir_ppp_bm3d_admm_prox.ipynb
+79 −87 notebooks/ct_svmbir_ppp_bm3d_admm_cg.ipynb
+123 −131 notebooks/ct_svmbir_ppp_bm3d_admm_prox.ipynb
+224 −226 notebooks/ct_svmbir_tv_multi.ipynb
+64 −81 notebooks/deconv_microscopy_allchn_tv_admm.ipynb
+158 −166 notebooks/deconv_microscopy_tv_admm.ipynb
+57 −65 notebooks/deconv_ppp_bm4d_admm.ipynb
+659 −697 notebooks/denoise_tv_iso_multi.ipynb
+323 −298 notebooks/denoise_tv_iso_pgm.ipynb
+123 −59 notebooks/index.ipynb
3 changes: 3 additions & 0 deletions docs/source/examples.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Computed Tomography
examples/ct_astra_weighted_tv_admm
examples/ct_svmbir_ppp_bm3d_admm_cg
examples/ct_svmbir_ppp_bm3d_admm_prox
examples/ct_fan_svmbir_ppp_bm3d_admm_prox
examples/ct_svmbir_tv_multi


Expand Down Expand Up @@ -89,6 +90,7 @@ Plug and Play Priors

examples/ct_svmbir_ppp_bm3d_admm_cg
examples/ct_svmbir_ppp_bm3d_admm_prox
examples/ct_fan_svmbir_ppp_bm3d_admm_prox
examples/deconv_ppp_bm3d_admm
examples/deconv_ppp_bm3d_pgm
examples/deconv_ppp_bm4d_admm
Expand Down Expand Up @@ -148,6 +150,7 @@ ADMM
examples/ct_astra_weighted_tv_admm
examples/ct_svmbir_ppp_bm3d_admm_cg
examples/ct_svmbir_ppp_bm3d_admm_prox
examples/ct_fan_svmbir_ppp_bm3d_admm_prox
examples/ct_svmbir_tv_multi
examples/deconv_circ_tv_admm
examples/deconv_microscopy_tv_admm
Expand Down
6 changes: 6 additions & 0 deletions examples/scripts/README.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Computed Tomography
CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+CG)
`ct_svmbir_ppp_bm3d_admm_prox.py <ct_svmbir_ppp_bm3d_admm_prox.py>`_
CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+Prox)
`ct_fan_svmbir_ppp_bm3d_admm_prox.py <ct_fan_svmbir_ppp_bm3d_admm_prox.py>`_
Fan-beam CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+Prox)
`ct_svmbir_tv_multi.py <ct_svmbir_tv_multi.py>`_
CT Reconstruction with TV Regularization

Expand Down Expand Up @@ -89,6 +91,8 @@ Plug and Play Priors
CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+CG)
`ct_svmbir_ppp_bm3d_admm_prox.py <ct_svmbir_ppp_bm3d_admm_prox.py>`_
CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+Prox)
`ct_fan_svmbir_ppp_bm3d_admm_prox.py <ct_fan_svmbir_ppp_bm3d_admm_prox.py>`_
Fan-beam CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+Prox)
`deconv_ppp_bm3d_admm.py <deconv_ppp_bm3d_admm.py>`_
Image Deconvolution (ADMM Plug-and-Play Priors w/ BM3D)
`deconv_ppp_bm3d_pgm.py <deconv_ppp_bm3d_pgm.py>`_
Expand Down Expand Up @@ -164,6 +168,8 @@ ADMM
CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+CG)
`ct_svmbir_ppp_bm3d_admm_prox.py <ct_svmbir_ppp_bm3d_admm_prox.py>`_
CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+Prox)
`ct_fan_svmbir_ppp_bm3d_admm_prox.py <ct_fan_svmbir_ppp_bm3d_admm_prox.py>`_
Fan-beam CT Reconstruction (ADMM Plug-and-Play Priors w/ BM3D, SVMBIR+Prox)
`ct_svmbir_tv_multi.py <ct_svmbir_tv_multi.py>`_
CT Reconstruction with TV Regularization
`deconv_circ_tv_admm.py <deconv_circ_tv_admm.py>`_
Expand Down
3 changes: 3 additions & 0 deletions examples/scripts/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Computed Tomography
- ct_astra_weighted_tv_admm.py
- ct_svmbir_ppp_bm3d_admm_cg.py
- ct_svmbir_ppp_bm3d_admm_prox.py
- ct_fan_svmbir_ppp_bm3d_admm_prox.py
- ct_svmbir_tv_multi.py


Expand Down Expand Up @@ -61,6 +62,7 @@ Plug and Play Priors

- ct_svmbir_ppp_bm3d_admm_cg.py
- ct_svmbir_ppp_bm3d_admm_prox.py
- ct_fan_svmbir_ppp_bm3d_admm_prox.py
- deconv_ppp_bm3d_admm.py
- deconv_ppp_bm3d_pgm.py
- deconv_ppp_bm4d_admm.py
Expand Down Expand Up @@ -108,6 +110,7 @@ ADMM
- ct_astra_weighted_tv_admm.py
- ct_svmbir_ppp_bm3d_admm_cg.py
- ct_svmbir_ppp_bm3d_admm_prox.py
- ct_fan_svmbir_ppp_bm3d_admm_prox.py
- ct_svmbir_tv_multi.py
- deconv_circ_tv_admm.py
- deconv_microscopy_tv_admm.py
Expand Down
2 changes: 1 addition & 1 deletion scico/functional/_norm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def __init__(self, delta: float = 1.0):
"""
self.delta = delta
self._call_lt_branch = lambda xl2: 0.5 * xl2**2
self._call_gt_branch = lambda xl2: self.delta * xl2 - 0.5
self._call_gt_branch = lambda xl2: self.delta * (xl2 - self.delta / 2.0)
super().__init__()

def __call__(self, x: Union[JaxArray, BlockArray]) -> float:
Expand Down