Use CompositeGeometryManager for FDK

Also fix a number of scaling/weighting issues in FDK, and
switch to standard cone_bp with FDKWeighting for the BP step.

1 files changed, 0 insertions, 80 deletions

diff --git a/cuda/3d/astra3d.cu b/cuda/3d/astra3d.cu
index dd6d551..91f4530 100644
--- a/cuda/3d/astra3d.cu
+++ b/cuda/3d/astra3d.cu
@@ -1291,84 +1291,4 @@ bool astraCudaBP_SIRTWeighted(float* pfVolume,
 
 
 
-bool astraCudaFDK(float* pfVolume, const float* pfProjections,
-                  const CVolumeGeometry3D* pVolGeom,
-                  const CConeProjectionGeometry3D* pProjGeom,
-                  bool bShortScan,
-                  int iGPUIndex, int iVoxelSuperSampling)
-{
-	SDimensions3D dims;
-	SProjectorParams3D params;
-
-	params.iRaysPerVoxelDim = iVoxelSuperSampling;
-
-	bool ok = convertAstraGeometry_dims(pVolGeom, pProjGeom, dims);
-
-	// TODO: Check that pVolGeom is normalized, since we don't support
-	// other volume geometries yet
-
-	if (!ok)
-		return false;
-
-
-	if (iVoxelSuperSampling == 0)
-		return false;
-
-	if (iGPUIndex != -1) {
-		cudaSetDevice(iGPUIndex);
-		cudaError_t err = cudaGetLastError();
-
-		// Ignore errors caused by calling cudaSetDevice multiple times
-		if (err != cudaSuccess && err != cudaErrorSetOnActiveProcess)
-			return false;
-	}
-
-	cudaPitchedPtr D_volumeData = allocateVolumeData(dims);
-	ok = D_volumeData.ptr;
-	if (!ok)
-		return false;
-
-	cudaPitchedPtr D_projData = allocateProjectionData(dims);
-	ok = D_projData.ptr;
-	if (!ok) {
-		cudaFree(D_volumeData.ptr);
-		return false;
-	}
-
-	ok &= copyProjectionsToDevice(pfProjections, D_projData, dims, dims.iProjU);
-
-	ok &= zeroVolumeData(D_volumeData, dims);
-
-	if (!ok) {
-		cudaFree(D_volumeData.ptr);
-		cudaFree(D_projData.ptr);
-		return false;
-	}
-
-	float fOriginSourceDistance = pProjGeom->getOriginSourceDistance();
-	float fOriginDetectorDistance = pProjGeom->getOriginDetectorDistance();
-	float fDetUSize = pProjGeom->getDetectorSpacingX();
-	float fDetVSize = pProjGeom->getDetectorSpacingY();
-	const float *pfAngles = pProjGeom->getProjectionAngles();
-
-
-	// TODO: Offer interface for SrcZ, DetZ
-	// TODO: Voxel scaling
-	ok &= FDK(D_volumeData, D_projData, fOriginSourceDistance,
-	          fOriginDetectorDistance, 0, 0, fDetUSize, fDetVSize,
-	          dims, pfAngles, bShortScan);
-
-	ok &= copyVolumeFromDevice(pfVolume, D_volumeData, dims, dims.iVolX);
-
-
-	cudaFree(D_volumeData.ptr);
-	cudaFree(D_projData.ptr);
-
-	return ok;
-
-}
-
-
-
-
 }