r7939: Initial working version of fftw3 conversion -- tested only with pjrec

[ctsim.git] / libctsim / projections.cpp

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index db8fd0c3d60a63632acbea37bacdd08387d3b8d5..8674647146a8c4f64f160c4323ef7be974b304d9 100644 (file)
--- a/libctsim/projections.cpp
+++ b/libctsim/projections.cpp
@@ -8,7 +8,7 @@
 **  This is part of the CTSim program
 **  Copyright (c) 1983-2001 Kevin Rosenberg
 **
-**  $Id: projections.cpp,v 1.81 2003/03/15 10:27:30 kevin Exp $
+**  $Id$
 **
 **  This program is free software; you can redistribute it and/or modify
 **  it under the terms of the GNU General Public License (version 2) as
@@ -26,6 +26,7 @@
 
 #include "ct.h"
 #include <ctime>
+#include "interpolator.h"
 
 const kuint16 Projections::m_signature = ('P'*256 + 'J');
 
@@ -36,15 +37,15 @@ const int Projections::POLAR_INTERP_BICUBIC = 2;
 
 const char* const Projections::s_aszInterpName[] = 
 {
-  {"nearest"},
-  {"bilinear"},
+  "nearest",
+  "bilinear",
 //  {"bicubic"},
 };
 
 const char* const Projections::s_aszInterpTitle[] = 
 {
-  {"Nearest"},
-  {"Bilinear"},
+  "Nearest",
+  "Bilinear",
 //  {"Bicubic"},
 };
 
@@ -1018,12 +1019,12 @@ Projections::convertFFTPolar (ImageFile& rIF, int iInterpolationID, int iZeropad
 
   int iInterpDet = static_cast<int>(static_cast<double>(sqrt(nx*nx+ny*ny)));
   int iNumInterpDetWithZeros = ProcessSignal::addZeropadFactor (iInterpDet, iZeropad);
-  double dProjScale = iInterpDet / (pProj->viewDiameter() * 0.5);
+  double dProjScale = iInterpDet / (pProj->viewDiameter() * 0.05);
   double dZeropadRatio = static_cast<double>(iNumInterpDetWithZeros) / static_cast<double>(iInterpDet);
 
-  fftw_plan plan = fftw_create_plan (iNumInterpDetWithZeros, FFTW_FORWARD, FFTW_IN_PLACE | FFTW_ESTIMATE | FFTW_USE_WISDOM);
+  fftw_complex* pcIn = static_cast<fftw_complex*> (fftw_malloc (sizeof(fftw_complex) * iNumInterpDetWithZeros));
+  fftw_plan plan = fftw_plan_dft_1d (iNumInterpDetWithZeros, pcIn, pcIn, FFTW_FORWARD, FFTW_ESTIMATE);
 
-  fftw_complex* pcIn = new fftw_complex [iNumInterpDetWithZeros];
   std::complex<double>** ppcDetValue = new std::complex<double>* [pProj->m_nView];
   //double dInterpScale = (pProj->m_nDet-1) / static_cast<double>(iInterpDet-1);
   double dInterpScale = pProj->m_nDet / static_cast<double>(iInterpDet);
@@ -1039,28 +1040,30 @@ Projections::convertFFTPolar (ImageFile& rIF, int iInterpolationID, int iZeropad
     LinearInterpolator<DetectorValue> projInterp (detval, pProj->m_nDet);
     for (int iDet = 0; iDet < iInterpDet; iDet++) {
       double dInterpPos = (m_nDet / 2.) + (iDet - dMidPoint) * dInterpScale;
-      pcIn[iDet].re = projInterp.interpolate (dInterpPos) * dProjScale;
-      pcIn[iDet].im = 0;
+      pcIn[iDet][0] = projInterp.interpolate (dInterpPos) * dProjScale;
+      pcIn[iDet][1] = 0;
     }
 
     Fourier::shuffleFourierToNaturalOrder (pcIn, iInterpDet);
     if (iZerosAdded > 0) {
-       for (int iDet1 = iInterpDet -1; iDet1 >= iMidPoint; iDet1--)
-        pcIn[iDet1+iZerosAdded] = pcIn[iDet1];
+      for (int iDet1 = iInterpDet -1; iDet1 >= iMidPoint; iDet1--) {
+        pcIn[iDet1+iZerosAdded][0] = pcIn[iDet1][0];
+        pcIn[iDet1+iZerosAdded][1] = pcIn[iDet1][1];
+      }
       for (int iDet2 = iMidPoint; iDet2 < iMidPoint + iZerosAdded; iDet2++) 
-        pcIn[iDet2].re = pcIn[iDet2].im = 0;
+        pcIn[iDet2][0] = pcIn[iDet2][1] = 0;
     }
 
-    fftw_one (plan, pcIn, NULL);
+    fftw_execute (plan);
 
     ppcDetValue[iView] = new std::complex<double> [iNumInterpDetWithZeros];
     for (int iD = 0; iD < iNumInterpDetWithZeros; iD++) {
-      ppcDetValue[iView][iD] = std::complex<double> (pcIn[iD].re * dFFTScale, pcIn[iD].im * dFFTScale); 
+      ppcDetValue[iView][iD] = std::complex<double> (pcIn[iD][0] * dFFTScale, pcIn[iD][1] * dFFTScale); 
     }
 
     Fourier::shuffleFourierToNaturalOrder (ppcDetValue[iView], iNumInterpDetWithZeros);
   }
-  delete [] pcIn;
+  fftw_free(pcIn) ;
 
   fftw_destroy_plan (plan);  
   
@@ -1091,7 +1094,6 @@ Projections::calcArrayPolarCoordinates (unsigned int nx, unsigned int ny, double
                                         int iNumDetWithZeros, double dZeropadRatio, double dDetInc)
 {
   double dLength = viewDiameter();
-//  double dLength = phmLen();
   double xMin = -dLength / 2;
   double xMax = xMin + dLength;
   double yMin = -dLength / 2;
@@ -1120,9 +1122,9 @@ Projections::calcArrayPolarCoordinates (unsigned int nx, unsigned int ny, double
       double r = ::sqrt (x * x + y * y);
       double phi = atan2 (y, x);
 
-      if (phi < 0)
+      if (phi <= -m_rotInc / 2)
         phi += TWOPI;
-      if (phi >= PI) {
+      if (phi >= PI - (m_rotInc / 2)) {
         phi -= PI;
         r = -r;
       }
@@ -1140,30 +1142,29 @@ Projections::interpolatePolar (ImageFileArray& v, ImageFileArray& vImag,
 {
   typedef std::complex<double> complexValue;
 
-  BilinearInterpolator<complexValue>* pBilinear =  NULL;  
+  BilinearPolarInterpolator<complexValue>* pBilinear = NULL;  
+  BicubicPolyInterpolator<complexValue>* pBicubic = NULL;  
   if (iInterpolationID == POLAR_INTERP_BILINEAR)
-    pBilinear = new BilinearInterpolator<complexValue> (ppcDetValue, nView, nDetWithZeros);
-
-  BicubicPolyInterpolator<complexValue>* pBicubic;  
-  if (iInterpolationID == POLAR_INTERP_BICUBIC)
+    pBilinear = new BilinearPolarInterpolator<complexValue> (ppcDetValue, nView, nDetWithZeros);
+  else if (iInterpolationID == POLAR_INTERP_BICUBIC)
     pBicubic = new BicubicPolyInterpolator<complexValue> (ppcDetValue, nView, nDetWithZeros);
-
+  
   for (unsigned int ix = 0; ix < ny; ix++) {
     for (unsigned int iy = 0; iy < ny; iy++) {
-
       if (iInterpolationID == POLAR_INTERP_NEAREST) {
         unsigned int iView = nearest<int> (ppdView[ix][iy]);
         unsigned int iDet = nearest<int> (ppdDet[ix][iy]);
-        if (iView == nView) {
-          iView = 0;
-          iDet = m_nDet - iDet;
-        }
+        if (iView == nView)
+         iView = 0;
         if (iDet >= 0 && iDet < nDetWithZeros && iView >= 0 && iView < nView) {
           v[ix][iy] = ppcDetValue[iView][iDet].real();
           if (vImag)
             vImag[ix][iy] = ppcDetValue[iView][iDet].imag();
-        } else
+        } else {
           v[ix][iy] = 0;
+          if (vImag)
+            vImag[ix][iy] = 0;
+       }
 
       } else if (iInterpolationID == POLAR_INTERP_BILINEAR) {
         std::complex<double> vInterp = pBilinear->interpolate (ppdView[ix][iy], ppdDet[ix][iy]);