summaryrefslogtreecommitdiffstats
path: root/cuda/3d/dims3d.h
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/3d/dims3d.h
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/3d/dims3d.h')
-rw-r--r--cuda/3d/dims3d.h41
1 files changed, 1 insertions, 40 deletions
diff --git a/cuda/3d/dims3d.h b/cuda/3d/dims3d.h
index 9bf0b68..5437a85 100644
--- a/cuda/3d/dims3d.h
+++ b/cuda/3d/dims3d.h
@@ -29,46 +29,7 @@ $Id$
#ifndef _CUDA_CONE_DIMS_H
#define _CUDA_CONE_DIMS_H
-namespace astra {
-
-struct SConeProjection {
- // the source
- double fSrcX, fSrcY, fSrcZ;
-
- // the origin ("bottom left") of the (flat-panel) detector
- double fDetSX, fDetSY, fDetSZ;
-
- // the U-edge of a detector pixel
- double fDetUX, fDetUY, fDetUZ;
-
- // the V-edge of a detector pixel
- double fDetVX, fDetVY, fDetVZ;
-};
-
-struct SPar3DProjection {
- // the ray direction
- double fRayX, fRayY, fRayZ;
-
- // the origin ("bottom left") of the (flat-panel) detector
- double fDetSX, fDetSY, fDetSZ;
-
- // the U-edge of a detector pixel
- double fDetUX, fDetUY, fDetUZ;
-
- // the V-edge of a detector pixel
- double fDetVX, fDetVY, fDetVZ;
-};
-
-void computeBP_UV_Coeffs(const SPar3DProjection& proj, double &fUX, double &fUY, double &fUZ, double &fUC,
- double &fVX, double &fVY, double &fVZ, double &fVC);
-
-void computeBP_UV_Coeffs(const SConeProjection& proj, double &fUX, double &fUY, double &fUZ, double &fUC,
- double &fVX, double &fVY, double &fVZ, double &fVC,
- double &fDX, double &fDY, double &fDZ, double &fDC);
-
-}
-
-
+#include "astra/GeometryUtil3D.h"
namespace astraCUDA3d {