diff options
| author | Willem Jan Palenstijn <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:13:33 +0000 |
|---|---|---|
| committer | wpalenst <WillemJan.Palenstijn@uantwerpen.be> | 2014-04-16 11:13:33 +0000 |
| commit | bcff7884bb89dbecd394c75a8f57b0a54a743b52 (patch) | |
| tree | 7b1d52bdb9dea23fb5c2dcacf3e6b179786ad26b /cuda/2d/em.cu | |
| parent | 959f476f456b147999649ec3a8cca10017b2ad6c (diff) | |
| download | astra-bcff7884bb89dbecd394c75a8f57b0a54a743b52.tar.gz astra-bcff7884bb89dbecd394c75a8f57b0a54a743b52.tar.bz2 astra-bcff7884bb89dbecd394c75a8f57b0a54a743b52.tar.xz astra-bcff7884bb89dbecd394c75a8f57b0a54a743b52.zip | |
Change allocate/zeroVolume to volume/sinogram-specific variants
Diffstat (limited to 'cuda/2d/em.cu')
| -rw-r--r-- | cuda/2d/em.cu | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cuda/2d/em.cu b/cuda/2d/em.cu index cf3f10c..b281516 100644 --- a/cuda/2d/em.cu +++ b/cuda/2d/em.cu @@ -73,14 +73,14 @@ void EM::reset() bool EM::init() { - allocateVolume(D_pixelWeight, dims.iVolWidth, dims.iVolHeight, pixelPitch); - zeroVolume(D_pixelWeight, pixelPitch, dims.iVolWidth, dims.iVolHeight); + allocateVolumeData(D_pixelWeight, pixelPitch, dims); + zeroVolumeData(D_pixelWeight, pixelPitch, dims); - allocateVolume(D_tmpData, dims.iVolWidth, dims.iVolHeight, tmpPitch); - zeroVolume(D_tmpData, tmpPitch, dims.iVolWidth, dims.iVolHeight); + allocateVolumeData(D_tmpData, tmpPitch, dims); + zeroVolumeData(D_tmpData, tmpPitch, dims); - allocateVolume(D_projData, dims.iProjDets, dims.iProjAngles, projPitch); - zeroVolume(D_projData, projPitch, dims.iProjDets, dims.iProjAngles); + allocateProjectionData(D_projData, projPitch, dims); + zeroProjectionData(D_projData, projPitch, dims); // We can't precompute pixelWeights when using a volume mask #if 0 @@ -94,7 +94,7 @@ bool EM::init() bool EM::precomputeWeights() { - zeroVolume(D_pixelWeight, pixelPitch, dims.iVolWidth, dims.iVolHeight); + zeroVolumeData(D_pixelWeight, pixelPitch, dims); #if 0 if (useSinogramMask) { callBP(D_pixelWeight, pixelPitch, D_smaskData, smaskPitch); @@ -129,14 +129,14 @@ bool EM::iterate(unsigned int iterations) for (unsigned int iter = 0; iter < iterations && !shouldAbort; ++iter) { // Do FP of volumeData - zeroVolume(D_projData, projPitch, dims.iProjDets, dims.iProjAngles); + zeroProjectionData(D_projData, projPitch, dims); callFP(D_volumeData, volumePitch, D_projData, projPitch, 1.0f); // Divide sinogram by FP (into projData) processVol<opDividedBy>(D_projData, D_sinoData, projPitch, dims.iProjDets, dims.iProjAngles); // Do BP of projData into tmpData - zeroVolume(D_tmpData, tmpPitch, dims.iVolWidth, dims.iVolHeight); + zeroVolumeData(D_tmpData, tmpPitch, dims); callBP(D_tmpData, tmpPitch, D_projData, projPitch); // Multiply volumeData with tmpData divided by pixel weights |