diff options
| author | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-03-12 14:28:03 +0100 |
|---|---|---|
| committer | Willem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl> | 2015-03-12 14:28:03 +0100 |
| commit | 9458268a8b9192af98fc1b88bf0a5fbbc7696a77 (patch) | |
| tree | e0f4dc2bfa82ee9770958de4a39b586de0b5e4ef /cuda/2d/astra.cu | |
| parent | 1a7dfb0964fa7686aa01f0d836f95910dc4dc07f (diff) | |
| download | astra-9458268a8b9192af98fc1b88bf0a5fbbc7696a77.tar.gz astra-9458268a8b9192af98fc1b88bf0a5fbbc7696a77.tar.bz2 astra-9458268a8b9192af98fc1b88bf0a5fbbc7696a77.tar.xz astra-9458268a8b9192af98fc1b88bf0a5fbbc7696a77.zip | |
Add outputScale argument to 2D CUDA BP
Diffstat (limited to 'cuda/2d/astra.cu')
| -rw-r--r-- | cuda/2d/astra.cu | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/cuda/2d/astra.cu b/cuda/2d/astra.cu index 0b5be06..5e2a07a 100644 --- a/cuda/2d/astra.cu +++ b/cuda/2d/astra.cu @@ -367,21 +367,19 @@ bool AstraFBP::run() } + float fOutputScale = (M_PI / 2.0f) / (float)pData->dims.iProjAngles; + if (pData->bFanBeam) { - ok = FanBP_FBPWeighted(pData->D_volumeData, pData->volumePitch, pData->D_sinoData, pData->sinoPitch, pData->dims, pData->fanProjections); + ok = FanBP_FBPWeighted(pData->D_volumeData, pData->volumePitch, pData->D_sinoData, pData->sinoPitch, pData->dims, pData->fanProjections, fOutputScale); } else { - ok = BP(pData->D_volumeData, pData->volumePitch, pData->D_sinoData, pData->sinoPitch, pData->dims, pData->angles, pData->TOffsets); + ok = BP(pData->D_volumeData, pData->volumePitch, pData->D_sinoData, pData->sinoPitch, pData->dims, pData->angles, pData->TOffsets, fOutputScale); } if(!ok) { return false; } - processVol<opMul>(pData->D_volumeData, - (M_PI / 2.0f) / (float)pData->dims.iProjAngles, - pData->volumePitch, pData->dims); - return true; } @@ -593,7 +591,7 @@ bool BPalgo::iterate(unsigned int) { // TODO: This zeroVolume makes an earlier memcpy of D_volumeData redundant zeroVolumeData(D_volumeData, volumePitch, dims); - callBP(D_volumeData, volumePitch, D_sinoData, sinoPitch); + callBP(D_volumeData, volumePitch, D_sinoData, sinoPitch, 1.0f); return true; } |