summaryrefslogtreecommitdiffstats
path: root/cuda/2d
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <wjp@usecode.org>2015-03-02 14:42:34 +0100
committerWillem Jan Palenstijn <wjp@usecode.org>2015-03-02 14:42:34 +0100
commite468c6c546dbb4d9665ccb95b1571a160753d50e (patch)
tree0c0544cb4e9f892523b2aed581c7a56510383595 /cuda/2d
parent24a2b2b0a6a354efd58774a4bce930cb9f90334f (diff)
parentbf5aa06406162656752f031edf3ca90f00ff76dd (diff)
downloadastra-e468c6c546dbb4d9665ccb95b1571a160753d50e.tar.gz
astra-e468c6c546dbb4d9665ccb95b1571a160753d50e.tar.bz2
astra-e468c6c546dbb4d9665ccb95b1571a160753d50e.tar.xz
astra-e468c6c546dbb4d9665ccb95b1571a160753d50e.zip
Merge pull request #24 from wjp/cuda_includes
Untangle cuda and astra includes
Diffstat (limited to 'cuda/2d')
-rw-r--r--cuda/2d/dims.h12
1 files changed, 3 insertions, 9 deletions
diff --git a/cuda/2d/dims.h b/cuda/2d/dims.h
index 37bfa66..e870da5 100644
--- a/cuda/2d/dims.h
+++ b/cuda/2d/dims.h
@@ -29,18 +29,12 @@ $Id$
#ifndef _CUDA_DIMS_H
#define _CUDA_DIMS_H
-namespace astraCUDA {
+#include "astra/GeometryUtil2D.h"
-struct SFanProjection {
- // the source
- float fSrcX, fSrcY;
- // the start of the (linear) detector
- float fDetSX, fDetSY;
+namespace astraCUDA {
- // the length of a single detector pixel
- float fDetUX, fDetUY;
-};
+using astra::SFanProjection;
struct SDimensions {