diff options
| author | Willem Jan Palenstijn <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:13:40 +0000 |
|---|---|---|
| committer | wpalenst <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:13:40 +0000 |
| commit | c72bc7cd47ecb5665a287fb88e101f88118f5232 (patch) | |
| tree | 367c19f29647f4256783acfce9db4e8431bd0039 /cuda/2d/algo.cu | |
| parent | bcff7884bb89dbecd394c75a8f57b0a54a743b52 (diff) | |
| download | astra-c72bc7cd47ecb5665a287fb88e101f88118f5232.tar.gz astra-c72bc7cd47ecb5665a287fb88e101f88118f5232.tar.bz2 astra-c72bc7cd47ecb5665a287fb88e101f88118f5232.tar.xz astra-c72bc7cd47ecb5665a287fb88e101f88118f5232.zip | |
Split up processVol in Vol/Sino cases
Diffstat (limited to 'cuda/2d/algo.cu')
| -rw-r--r-- | cuda/2d/algo.cu | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/cuda/2d/algo.cu b/cuda/2d/algo.cu index 333481a..33ca1a3 100644 --- a/cuda/2d/algo.cu +++ b/cuda/2d/algo.cu @@ -264,20 +264,18 @@ bool ReconAlgo::copyDataToGPU(const float* pfSinogram, unsigned int iSinogramPit return false; bool ok = copySinogramToDevice(pfSinogram, iSinogramPitch, - dims.iProjDets, - dims.iProjAngles, + dims, D_sinoData, sinoPitch); if (!ok) return false; // rescale sinogram to adjust for pixel size - processVol<opMul>(D_sinoData, fSinogramScale, + processSino<opMul>(D_sinoData, fSinogramScale, //1.0f/(fPixelSize*fPixelSize), - sinoPitch, - dims.iProjDets, dims.iProjAngles); + sinoPitch, dims); ok = copyVolumeToDevice(pfReconstruction, iReconstructionPitch, - dims.iVolWidth, dims.iVolHeight, + dims, D_volumeData, volumePitch); if (!ok) return false; @@ -289,7 +287,7 @@ bool ReconAlgo::copyDataToGPU(const float* pfSinogram, unsigned int iSinogramPit return false; ok = copyVolumeToDevice(pfVolMask, iVolMaskPitch, - dims.iVolWidth, dims.iVolHeight, + dims, D_maskData, maskPitch); if (!ok) return false; @@ -300,7 +298,7 @@ bool ReconAlgo::copyDataToGPU(const float* pfSinogram, unsigned int iSinogramPit return false; ok = copySinogramToDevice(pfSinoMask, iSinoMaskPitch, - dims.iProjDets, dims.iProjAngles, + dims, D_smaskData, smaskPitch); if (!ok) return false; @@ -313,8 +311,7 @@ bool ReconAlgo::getReconstruction(float* pfReconstruction, unsigned int iReconstructionPitch) const { bool ok = copyVolumeFromDevice(pfReconstruction, iReconstructionPitch, - dims.iVolWidth, - dims.iVolHeight, + dims, D_volumeData, volumePitch); if (!ok) return false; |