diff --git a/data b/data index c9f2ed1b3..41a599fb2 160000 --- a/data +++ b/data @@ -1 +1 @@ -Subproject commit c9f2ed1b304e07a028cd7d269e84d4f30d5ec000 +Subproject commit 41a599fb211a2bb797963a724bd6a4ffbb964d43 diff --git a/examples/scripts/admm_tv_ct.py b/examples/scripts/admm_tv_ct.py index 114de7e53..aaf84fdf3 100644 --- a/examples/scripts/admm_tv_ct.py +++ b/examples/scripts/admm_tv_ct.py @@ -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. diff --git a/examples/scripts/admm_tv_ct_weighted.py b/examples/scripts/admm_tv_ct_weighted.py index e2a0c64eb..b7102fd03 100644 --- a/examples/scripts/admm_tv_ct_weighted.py +++ b/examples/scripts/admm_tv_ct_weighted.py @@ -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. diff --git a/examples/scripts/preconditioned_cg_ct.py b/examples/scripts/preconditioned_cg_ct.py index 87a4ffc4f..f7d94e038 100644 --- a/examples/scripts/preconditioned_cg_ct.py +++ b/examples/scripts/preconditioned_cg_ct.py @@ -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 """ diff --git a/scico/linop/radon.py b/scico/linop/radon_astra.py similarity index 100% rename from scico/linop/radon.py rename to scico/linop/radon_astra.py diff --git a/scico/test/linop/test_radon.py b/scico/test/linop/test_radon_astra.py similarity index 97% rename from scico/test/linop/test_radon.py rename to scico/test/linop/test_radon_astra.py index dc027e763..eac69d670 100644 --- a/scico/test/linop/test_radon.py +++ b/scico/test/linop/test_radon_astra.py @@ -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)