Made step size configurable in cuda forward projector

SimonRit · Jul 21, 2014 · fb62489 · fb62489
1 parent 6e040cb
commit fb62489
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/applications/rtkforwardprojections/rtkforwardprojections.cxx b/applications/rtkforwardprojections/rtkforwardprojections.cxx
@@ -104,6 +104,7 @@ int main(int argc, char * argv[])
   case(fp_arg_CudaRayCast):
 #ifdef RTK_USE_CUDA
     forwardProjection = rtk::CudaForwardProjectionImageFilter::New();
+    dynamic_cast<rtk::CudaForwardProjectionImageFilter*>( forwardProjection.GetPointer() )->SetStepSize(args_info.step_arg);
 #else
     std::cerr << "The program has not been compiled with cuda option" << std::endl;
     return EXIT_FAILURE;

diff --git a/applications/rtkforwardprojections/rtkforwardprojections.ggo b/applications/rtkforwardprojections/rtkforwardprojections.ggo
@@ -6,6 +6,7 @@ option "config"    - "Config file"
 option "geometry"  g  "XML geometry file name"                                   string   yes
 option "input"     i "Input volume file name"                                    string   yes
 option "output"    o "Output projections file name"                              string   yes
+option "step"      s "Step size along ray (for CudaRayCast only)"                double   no   default="1"
 
 section "Projectors"
 option "fp"    f "Forward projection method" values="Joseph","RayCastInterpolator","CudaRayCast" enum no default="Joseph"

diff --git a/code/rtkCudaForwardProjectionImageFilter.cxx b/code/rtkCudaForwardProjectionImageFilter.cxx
@@ -31,7 +31,8 @@ namespace rtk
 {
 
 CudaForwardProjectionImageFilter
-::CudaForwardProjectionImageFilter()
+::CudaForwardProjectionImageFilter():
+    m_StepSize(1)
 {
 }
 
@@ -46,7 +47,6 @@ ::GPUGenerateData()
   const unsigned int nPixelsPerProj = this->GetOutput()->GetBufferedRegion().GetSize(0) *
     this->GetOutput()->GetBufferedRegion().GetSize(1);
 
-  float t_step = 1; // Step in mm
   itk::Vector<double, 4> source_position;
 
   // Setting BoxMin and BoxMax
@@ -119,7 +119,7 @@ ::GPUGenerateData()
                         (float*)&(matrix[0][0]),
                         pout + nPixelsPerProj * projectionOffset,
                         pvol,
-                        t_step,
+                        m_StepSize,
                         (double*)&(source_position[0]),
                         boxMin,
                         boxMax,

diff --git a/code/rtkCudaForwardProjectionImageFilter.h b/code/rtkCudaForwardProjectionImageFilter.h
@@ -70,6 +70,10 @@ class ITK_EXPORT CudaForwardProjectionImageFilter :
   /** Run-time type information (and related methods). */
   itkTypeMacro(CudaForwardProjectionImageFilter, ImageToImageFilter);
 
+  /** Set step size along ray (in mm). Default is 1 mm. */
+  itkGetConstMacro(StepSize, double);
+  itkSetMacro(StepSize, double);
+
 protected:
   rtkcuda_EXPORT CudaForwardProjectionImageFilter();
   ~CudaForwardProjectionImageFilter() {};
@@ -81,6 +85,7 @@ class ITK_EXPORT CudaForwardProjectionImageFilter :
   CudaForwardProjectionImageFilter(const Self&);
   void operator=(const Self&);
 
+  double             m_StepSize;
   int                m_VolumeDimension[3];
   int                m_ProjectionDimension[2];
   float *            m_DeviceVolume;