Merge branch 'master' into parallel_vec

4 files changed, 27 insertions, 8 deletions

diff --git a/matlab/mex/astra_mex_algorithm_c.cpp b/matlab/mex/astra_mex_algorithm_c.cpp
index a9cd14b..f20f3a5 100644
--- a/matlab/mex/astra_mex_algorithm_c.cpp
+++ b/matlab/mex/astra_mex_algorithm_c.cpp
@@ -83,7 +83,7 @@ void astra_mex_algorithm_create(int nlhs, mxArray* plhs[], int nrhs, const mxArr
 	CAlgorithm* pAlg = CAlgorithmFactory::getSingleton().create(cfg->self.getAttribute("type"));
 	if (!pAlg) {
 		delete cfg;
-		mexErrMsgTxt("Unknown algorithm. \n");
+		mexErrMsgTxt("Unknown Algorithm. \n");
 		return;
 	}
 
@@ -91,7 +91,7 @@ void astra_mex_algorithm_create(int nlhs, mxArray* plhs[], int nrhs, const mxArr
 	if (!pAlg->initialize(*cfg)) {
 		delete cfg;
 		delete pAlg;
-		mexErrMsgTxt("Algorithm not initialized. \n");
+		mexErrMsgTxt("Unable to initialize Algorithm. \n");
 		return;
 	}
 	delete cfg;
diff --git a/matlab/mex/astra_mex_projector3d_c.cpp b/matlab/mex/astra_mex_projector3d_c.cpp
index 3135939..c5f2291 100644
--- a/matlab/mex/astra_mex_projector3d_c.cpp
+++ b/matlab/mex/astra_mex_projector3d_c.cpp
@@ -68,10 +68,18 @@ void astra_mex_projector3d_create(int nlhs, mxArray* plhs[], int nrhs, const mxA
 	Config* cfg = structToConfig("Projector3D", prhs[1]);
 
 	// create algorithm
-	CProjector3D* pProj = CProjector3DFactory::getSingleton().create(*cfg);
+	CProjector3D* pProj = CProjector3DFactory::getSingleton().create(cfg->self.getAttribute("type"));
 	if (pProj == NULL) {
 		delete cfg;
-		mexErrMsgTxt("Error creating Projector3D. \n");
+		mexErrMsgTxt("Unknown Projector3D. \n");
+		return;
+	}
+
+	// create algorithm
+	if (!pProj->initialize(*cfg)) {
+		delete cfg;
+		delete pProj;
+		mexErrMsgTxt("Unable to initialize Projector3D. \n");
 		return;
 	}
 	delete cfg;
diff --git a/matlab/mex/astra_mex_projector_c.cpp b/matlab/mex/astra_mex_projector_c.cpp
index 36a5704..5c2ba72 100644
--- a/matlab/mex/astra_mex_projector_c.cpp
+++ b/matlab/mex/astra_mex_projector_c.cpp
@@ -77,10 +77,18 @@ void astra_mex_projector_create(int nlhs, mxArray* plhs[], int nrhs, const mxArr
 	Config* cfg = structToConfig("Projector2D", prhs[1]);
 
 	// create algorithm
-	CProjector2D* pProj = CProjector2DFactory::getSingleton().create(*cfg);
+	CProjector2D* pProj = CProjector2DFactory::getSingleton().create(cfg->self.getAttribute("type"));
 	if (pProj == NULL) {
 		delete cfg;
-		mexErrMsgTxt("Error creating projector. \n");
+		mexErrMsgTxt("Unknown Projector2D. \n");
+		return;
+	}
+
+	// create algorithm
+	if (!pProj->initialize(*cfg)) {
+		delete cfg;
+		delete pProj;
+		mexErrMsgTxt("Unable to initialize Projector2D. \n");
 		return;
 	}
 	delete cfg;
diff --git a/matlab/tools/opTomo.m b/matlab/tools/opTomo.m
index 81de534..3ae1163 100644
--- a/matlab/tools/opTomo.m
+++ b/matlab/tools/opTomo.m
@@ -51,6 +51,8 @@ classdef opTomo < opSpot
     properties ( SetAccess = private, GetAccess = public )
         proj_size
         vol_size
+        proj_geom
+        vol_geom
     end % properties
     
     %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -92,11 +94,9 @@ classdef opTomo < opSpot
                 if gpuEnabled
                     fp_alg = 'FP_CUDA';
                     bp_alg = 'BP_CUDA';
-                    proj_id = [];
                 else
                     fp_alg = 'FP';
                     bp_alg = 'BP';
-                    proj_id = astra_create_projector(type, proj_geom, vol_geom);
                 end
                 
                 % configuration for ASTRA fp algorithm
@@ -129,6 +129,7 @@ classdef opTomo < opSpot
                 op.bp_alg_id   = bp_alg_id;
                 op.sino_id     = sino_id;
                 op.vol_id      = vol_id;
+                
             else
                 % 3D
                 % only gpu/cuda code for 3D
@@ -158,6 +159,8 @@ classdef opTomo < opSpot
             op.vol_size    = vol_size;
             op.cflag       = false;
             op.sweepflag   = false;
+            op.proj_geom   = proj_geom;
+            op.vol_geom   = vol_geom;
 
         end % opTomo - constructor