Merge branch 'master' into cleandemos

3 files changed, 6 insertions, 6 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 fac4551..02c9070 100644
--- a/Wrappers/Python/ccpi/astra/astra_processors.py
+++ b/Wrappers/Python/ccpi/astra/processors.py
@@ -1,5 +1,5 @@
-from ccpi.framework import DataProcessor, ImageData, AcquisitionData
-from ccpi.astra.astra_utils import convert_geometry_to_astra
+from ccpi.framework import DataSetProcessor, ImageData, AcquisitionData
+from ccpi.astra.utils import convert_geometry_to_astra
 import astra
 
 
@@ -202,4 +202,4 @@ class AstraBackProjectorMC(AstraBackProjector):
                     DATA.as_array()[k], 
                     self.proj_id)
             astra.data2d.delete(rec_id)
-        return IM
\ No newline at end of file
+        return IM
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