diff options
| author | Suren A. Chilingaryan <csa@suren.me> | 2020-03-27 20:34:09 +0100 |
|---|---|---|
| committer | Suren A. Chilingaryan <csa@suren.me> | 2020-03-27 20:34:09 +0100 |
| commit | 2587b06c63c7d38e9617b317ce2bdd31b81e7be1 (patch) | |
| tree | 8ee0535a908be239e42aa52ac6870d3862b08d95 | |
| parent | 190a5a7679c506e9fc78969ec0f1df4f730aa6f7 (diff) | |
| download | astra-wrapper-fast_tnv.tar.gz astra-wrapper-fast_tnv.tar.bz2 astra-wrapper-fast_tnv.tar.xz astra-wrapper-fast_tnv.zip | |
ccpi intra-version compatibility fixesfast_tnv
| -rw-r--r-- | Wrappers/Python/ccpi/astra/operators/AstraProjector3DMC.py | 2 | ||||
| -rw-r--r-- | Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Wrappers/Python/ccpi/astra/operators/AstraProjector3DMC.py b/Wrappers/Python/ccpi/astra/operators/AstraProjector3DMC.py index b7b52ef..d749ae8 100644 --- a/Wrappers/Python/ccpi/astra/operators/AstraProjector3DMC.py +++ b/Wrappers/Python/ccpi/astra/operators/AstraProjector3DMC.py @@ -24,7 +24,7 @@ class AstraProjector3DMC(LinearOperator): """ASTRA projector modified to use DataSet and geometry.""" def __init__(self, geomv, geomp): - super(AstraProjector3DMC, self).__init__() + super(AstraProjector3DMC, self).__init__(geomv) # Store volume and sinogram geometries. self.sinogram_geometry = geomp diff --git a/Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py b/Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py index a139f64..3d30424 100644 --- a/Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py +++ b/Wrappers/Python/ccpi/astra/operators/AstraProjector3DSimple.py @@ -25,7 +25,7 @@ class AstraProjector3DSimple(LinearOperator): """ASTRA projector modified to use DataSet and geometry.""" def __init__(self, geomv, geomp): - super(AstraProjector3DSimple, self).__init__() + super(AstraProjector3DSimple, self).__init__(geomv) # Store volume and sinogram geometries. # The order of the ouput sinogram is not the default one from the acquistion geometry @@ -70,10 +70,10 @@ class AstraProjector3DSimple(LinearOperator): def range_geometry(self): return self.sinogram_geometry - def norm(self): - x0 = self.volume_geometry.allocate('random') - self.s1, sall, svec = LinearOperator.PowerMethod(self, 50, x0) - return self.s1 +# def norm(self): +# x0 = self.volume_geometry.allocate('random') +# self.s1, sall, svec = LinearOperator.PowerMethod(self, 50, x0) +# return self.s1 if __name__ == '__main__': |