diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2018-04-19 23:24:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-19 23:24:08 +0200 |
| commit | 510cb3e98b30184beab96f908c6105df1e348030 (patch) | |
| tree | 4ac36b8644be7b340321b820f07ff390661a07c3 /Wrappers/Python/ccpi | |
| parent | e19a7eafb496fca9dbaa648451bb0cefac4b0662 (diff) | |
| parent | bf2da3ac3484a671815e95d7f4d622586301ba7d (diff) | |
| download | astra-wrapper-510cb3e98b30184beab96f908c6105df1e348030.tar.gz astra-wrapper-510cb3e98b30184beab96f908c6105df1e348030.tar.bz2 astra-wrapper-510cb3e98b30184beab96f908c6105df1e348030.tar.xz astra-wrapper-510cb3e98b30184beab96f908c6105df1e348030.zip | |
Merge pull request #1 from vais-ral/merge_modular
Merge modular
Diffstat (limited to 'Wrappers/Python/ccpi')
| -rwxr-xr-x[-rw-r--r--] | Wrappers/Python/ccpi/astra/ops.py (renamed from Wrappers/Python/ccpi/astra/astra_ops.py) | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | Wrappers/Python/ccpi/astra/processors.py (renamed from Wrappers/Python/ccpi/astra/astra_processors.py) | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | Wrappers/Python/ccpi/astra/utils.py (renamed from Wrappers/Python/ccpi/astra/astra_utils.py) | 0 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Wrappers/Python/ccpi/astra/astra_ops.py b/Wrappers/Python/ccpi/astra/ops.py index 45b8238..cd0ef9e 100644..100755 --- a/Wrappers/Python/ccpi/astra/astra_ops.py +++ b/Wrappers/Python/ccpi/astra/ops.py @@ -15,12 +15,12 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -from ccpi.reconstruction.ops import Operator +from ccpi.optimisation.ops import Operator import numpy import astra from ccpi.framework import AcquisitionData, ImageData, DataContainer -from ccpi.reconstruction.ops import PowerMethodNonsquare -from ccpi.astra.astra_processors import AstraForwardProjector, AstraBackProjector, \ +from ccpi.optimisation.ops import PowerMethodNonsquare +from ccpi.astra.processors import AstraForwardProjector, AstraBackProjector, \ AstraForwardProjectorMC, AstraBackProjectorMC class AstraProjectorSimple(Operator): diff --git a/Wrappers/Python/ccpi/astra/astra_processors.py b/Wrappers/Python/ccpi/astra/processors.py index 3de43bf..16c1f78 100644..100755 --- a/Wrappers/Python/ccpi/astra/astra_processors.py +++ b/Wrappers/Python/ccpi/astra/processors.py @@ -1,5 +1,5 @@ from ccpi.framework import DataSetProcessor, ImageData, AcquisitionData -from ccpi.astra.astra_utils import convert_geometry_to_astra +from ccpi.astra.utils import convert_geometry_to_astra import astra diff --git a/Wrappers/Python/ccpi/astra/astra_utils.py b/Wrappers/Python/ccpi/astra/utils.py index 9f8fe46..9f8fe46 100644..100755 --- a/Wrappers/Python/ccpi/astra/astra_utils.py +++ b/Wrappers/Python/ccpi/astra/utils.py |