summaryrefslogtreecommitdiffstats
path: root/include/astra/cuda
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2019-03-30 21:12:01 +0100
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2019-09-25 14:10:09 +0200
commit11114e33fb504b0b74f3d239e77fe248a027cc23 (patch)
tree60be0df745bbe2c9df5defe63565ef2420e9db85 /include/astra/cuda
parent48f4e7b165404a0375db300b9fe59da92edf1cce (diff)
downloadastra-11114e33fb504b0b74f3d239e77fe248a027cc23.tar.gz
astra-11114e33fb504b0b74f3d239e77fe248a027cc23.tar.bz2
astra-11114e33fb504b0b74f3d239e77fe248a027cc23.tar.xz
astra-11114e33fb504b0b74f3d239e77fe248a027cc23.zip
Clean up outputscale naming confusion in cuda::algo
Diffstat (limited to 'include/astra/cuda')
-rw-r--r--include/astra/cuda/2d/algo.h2
-rw-r--r--include/astra/cuda/2d/fbp.h6
2 files changed, 7 insertions, 1 deletions
diff --git a/include/astra/cuda/2d/algo.h b/include/astra/cuda/2d/algo.h
index b6ec231..b670b8b 100644
--- a/include/astra/cuda/2d/algo.h
+++ b/include/astra/cuda/2d/algo.h
@@ -136,7 +136,7 @@ protected:
SDimensions dims;
SParProjection* parProjs;
SFanProjection* fanProjs;
- float fOutputScale;
+ float fProjectorScale;
bool freeGPUMemory;
diff --git a/include/astra/cuda/2d/fbp.h b/include/astra/cuda/2d/fbp.h
index 1adf3b1..3aa4741 100644
--- a/include/astra/cuda/2d/fbp.h
+++ b/include/astra/cuda/2d/fbp.h
@@ -79,6 +79,11 @@ public:
bool setShortScan(bool ss) { m_bShortScan = ss; return true; }
+ // Scale the final reconstruction.
+ // May be called at any time before iterate().
+ bool setReconstructionScale(float fScale);
+
+
virtual bool init();
virtual bool iterate(unsigned int iterations);
@@ -90,6 +95,7 @@ protected:
void* D_filter; // cufftComplex*
bool m_bShortScan;
+ float fReconstructionScale;
};
}