diff options
| author | Edoardo Pasca <edo.paskino@gmail.com> | 2019-05-03 15:54:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-03 15:54:09 +0100 |
| commit | 7933e269363f6a24bc1258bea6779b8bff2c61ac (patch) | |
| tree | 7abf20746357e4be5ee8c31cfea0f6e834dba69b | |
| parent | 3d69f8d06c01656339558f3229e08ebbcf712431 (diff) | |
| download | astra-wrapper-7933e269363f6a24bc1258bea6779b8bff2c61ac.tar.gz astra-wrapper-7933e269363f6a24bc1258bea6779b8bff2c61ac.tar.bz2 astra-wrapper-7933e269363f6a24bc1258bea6779b8bff2c61ac.tar.xz astra-wrapper-7933e269363f6a24bc1258bea6779b8bff2c61ac.zip | |
PowerMethod is moved to LinearOperator (#20)
* powermethod is moved to LinearOperator
* remove comment
3 files changed, 4 insertions, 7 deletions
diff --git a/Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py b/Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py index 8058cdc..8ba7684 100644 --- a/Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py +++ b/Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py @@ -17,7 +17,6 @@ from ccpi.optimisation.operators import Operator, LinearOperator from ccpi.framework import AcquisitionData, ImageData, DataContainer -from ccpi.optimisation.ops import PowerMethodNonsquare from ccpi.astra.processors import AstraForwardProjector, AstraBackProjector, \ AstraForwardProjector3D, AstraBackProjector3D @@ -65,5 +64,5 @@ class AstraProjector3DSimple(LinearOperator): def norm(self): x0 = self.volume_geometry.allocate('random') - self.s1, sall, svec = PowerMethodNonsquare(self, 50, x0) + self.s1, sall, svec = LinearOperator.PowerMethodNonsquare(self, 50, x0) return self.s1
\ No newline at end of file diff --git a/Wrappers/Python/ccpi/astra/operators/AstraProjectorMC.py b/Wrappers/Python/ccpi/astra/operators/AstraProjectorMC.py index f796a63..514ffce 100644 --- a/Wrappers/Python/ccpi/astra/operators/AstraProjectorMC.py +++ b/Wrappers/Python/ccpi/astra/operators/AstraProjectorMC.py @@ -17,7 +17,6 @@ from ccpi.optimisation.operators import Operator, LinearOperator from ccpi.framework import AcquisitionData, ImageData, DataContainer -from ccpi.optimisation.ops import PowerMethodNonsquare from ccpi.astra.processors import AstraForwardProjector, AstraBackProjector, \ AstraForwardProjectorMC, AstraBackProjectorMC, AstraForwardProjector3D, \ AstraBackProjector3D @@ -68,5 +67,5 @@ class AstraProjectorMC(LinearOperator): def norm(self): x0 = self.volume_geometry.allocate('random') - self.s1, sall, svec = PowerMethodNonsquare(self, 50, x0) + self.s1, sall, svec = LinearOperator.PowerMethodNonsquare(self, 50, x0) return self.s1
\ No newline at end of file diff --git a/Wrappers/Python/ccpi/astra/operators/AstraProjectorSimple.py b/Wrappers/Python/ccpi/astra/operators/AstraProjectorSimple.py index 71bc3c6..ffe4700 100644 --- a/Wrappers/Python/ccpi/astra/operators/AstraProjectorSimple.py +++ b/Wrappers/Python/ccpi/astra/operators/AstraProjectorSimple.py @@ -17,7 +17,6 @@ from ccpi.optimisation.operators import Operator, LinearOperator from ccpi.framework import AcquisitionData, ImageData, DataContainer -from ccpi.optimisation.ops import PowerMethodNonsquare from ccpi.astra.processors import AstraForwardProjector, AstraBackProjector class AstraProjectorSimple(LinearOperator): @@ -66,5 +65,5 @@ class AstraProjectorSimple(LinearOperator): def norm(self): x0 = self.volume_geometry.allocate('random') - self.s1, sall, svec = PowerMethodNonsquare(self, 50, x0) - return self.s1
\ No newline at end of file + self.s1, sall, svec = LinearOperator.PowerMethodNonsquare(self, 50, x0) + return self.s1 |