Skip to content

Commit

Permalink
Merge pull request #9 from lanl/lukepfister/radon_rename
Browse files Browse the repository at this point in the history 
Rename radon.py -> radon_astra.py
  • Loading branch information
@lukepfister
lukepfister authored Sep 24, 2021
2 parents 2a4309f + f15b6f7 commit bf2c092
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion data
Submodule data updated 16 files
+65 −71 notebooks/admm_nonnegative_sparse_coding.ipynb
+51 −51 notebooks/admm_ppp_bm3d_deconvolution.ipynb
+70 −70 notebooks/admm_ppp_bm3d_demosaicing.ipynb
+48 −48 notebooks/admm_ppp_dncnn_deconvolution.ipynb
+95 −95 notebooks/admm_tv_circ_deconvolution.ipynb
+70 −70 notebooks/admm_tv_ct.ipynb
+142 −172 notebooks/admm_tv_ct_weighted.ipynb
+54 −60 notebooks/admm_tv_deconvolution.ipynb
+194 −236 notebooks/admm_tv_isotropic.ipynb
+224 −76 notebooks/deconv_microscopy.ipynb
+77 −77 notebooks/pgm_ppp_bm3d_deconvolution.ipynb
+63 −63 notebooks/pgm_sparse_coding.ipynb
+179 −197 notebooks/pgm_stepsize_blockarray.ipynb
+196 −202 notebooks/pgm_stepsize_poisson.ipynb
+169 −169 notebooks/pgm_tv_isotropic.ipynb
+53 −57 notebooks/preconditioned_cg_ct.ipynb
2 changes: 1 addition & 1 deletion examples/scripts/admm_tv_ct.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import scico.numpy as snp
from scico import functional, linop, loss, metric, plot
from scico.admm import ADMM, LinearSubproblemSolver
from scico.linop.radon import ParallelBeamProjector
from scico.linop.radon_astra import ParallelBeamProjector

"""
Create a ground truth image.
Expand Down
2 changes: 1 addition & 1 deletion examples/scripts/admm_tv_ct_weighted.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import scico.numpy as snp
from scico import functional, linop, loss, metric, plot
from scico.admm import ADMM, LinearSubproblemSolver
from scico.linop.radon import ParallelBeamProjector
from scico.linop.radon_astra import ParallelBeamProjector

"""
Create a ground truth image.
Expand Down
2 changes: 1 addition & 1 deletion examples/scripts/preconditioned_cg_ct.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from scico import loss, plot
from scico.linop import CircularConvolve
from scico.linop.radon import ParallelBeamProjector
from scico.linop.radon_astra import ParallelBeamProjector
from scico.solver import cg

"""
Expand Down
0 scico/linop/radon.py → scico/linop/radon_astra.py
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion scico/test/linop/test_radon.py → scico/test/linop/test_radon_astra.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from scico.test.linop.test_linop import adjoint_AAt_test, adjoint_AtA_test

try:
from scico.linop.radon import ParallelBeamProjector
from scico.linop.radon_astra import ParallelBeamProjector
except ImportError as e:
pytest.skip("astra not installed", allow_module_level=True)

Expand Down

0 comments on commit bf2c092

Please sign in to comment.