summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-09-16 15:52:30 +0200
committerWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2015-09-16 15:52:40 +0200
commit8144bf0397ee1913b830d82058ccd40df741f1b3 (patch)
tree7f707615c104621226fd8bdd868f86aee8e5bd73 /include
parent47b520d51fc4fc49db992b9117f6c0abfa8152b5 (diff)
parentc1713c00c4aeae594913667d868106e8591dd1d1 (diff)
downloadastra-8144bf0397ee1913b830d82058ccd40df741f1b3.tar.gz
astra-8144bf0397ee1913b830d82058ccd40df741f1b3.tar.bz2
astra-8144bf0397ee1913b830d82058ccd40df741f1b3.tar.xz
astra-8144bf0397ee1913b830d82058ccd40df741f1b3.zip
Merge branch 'master'
Diffstat (limited to 'include')
-rw-r--r--include/astra/CudaProjector2D.h6
-rw-r--r--include/astra/CudaProjector3D.h5
2 files changed, 10 insertions, 1 deletions
diff --git a/include/astra/CudaProjector2D.h b/include/astra/CudaProjector2D.h
index a571851..ecfca41 100644
--- a/include/astra/CudaProjector2D.h
+++ b/include/astra/CudaProjector2D.h
@@ -121,9 +121,15 @@ public:
virtual std::string description() const;
+ Cuda2DProjectionKernel getProjectionKernel() const { return m_projectionKernel; }
+ int getVoxelSuperSampling() const { return m_iVoxelSuperSampling; }
+ int getDetectorSuperSampling() const { return m_iDetectorSuperSampling; }
+
protected:
Cuda2DProjectionKernel m_projectionKernel;
+ int m_iVoxelSuperSampling;
+ int m_iDetectorSuperSampling;
};
//----------------------------------------------------------------------------------------
diff --git a/include/astra/CudaProjector3D.h b/include/astra/CudaProjector3D.h
index a181531..1d570fe 100644
--- a/include/astra/CudaProjector3D.h
+++ b/include/astra/CudaProjector3D.h
@@ -115,11 +115,14 @@ public:
Cuda3DProjectionKernel getProjectionKernel() const { return m_projectionKernel; }
+ int getVoxelSuperSampling() const { return m_iVoxelSuperSampling; }
+ int getDetectorSuperSampling() const { return m_iDetectorSuperSampling; }
protected:
Cuda3DProjectionKernel m_projectionKernel;
-
+ int m_iVoxelSuperSampling;
+ int m_iDetectorSuperSampling;
};