X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=libctsim%2Fprojections.cpp;h=9533d7f9da2824d5c2f94ea3c9f2abb07590c488;hb=8e3ba3d86e5b1293140adab70ecc0b6a20e2f651;hp=b2d3c4aabc39cfcc37cc1eea20887322a5c9eebf;hpb=27baab81972b095035e92f958843f86bf2632f68;p=ctsim.git

diff --git a/libctsim/projections.cpp b/libctsim/projections.cpp
index b2d3c4a..9533d7f 100644
--- 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.76 2001/09/24 11:29:41 kevin Exp $
+**  $Id: projections.cpp,v 1.79 2002/06/27 01:48:26 kevin Exp $
 **
 **  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
@@ -25,6 +25,7 @@
 ******************************************************************************/
 
 #include "ct.h"
+#include <ctime>
 
 const kuint16 Projections::m_signature = ('P'*256 + 'J');
 
@@ -650,7 +651,7 @@ Projections::read (const char* filename)
 #ifdef MSVC
   frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary);
 #else
-  frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary | std::ios::nocreate);
+  frnetorderstream fileRead (m_filename.c_str(), std::ios::in | std::ios::binary); // | std::ios::nocreate);
 #endif
   
   if (fileRead.fail())
@@ -970,7 +971,7 @@ Projections::convertPolar (ImageFile& rIF, int iInterpolationID)
   double** ppdDet = adDet.getArray();
 
   std::complex<double>** ppcDetValue = new std::complex<double>* [pProj->m_nView];
-  unsigned int iView;
+  int iView;
   for (iView = 0; iView < pProj->m_nView; iView++) {
     ppcDetValue[iView] = new std::complex<double> [pProj->m_nDet];
     DetectorValue* detval = pProj->getDetectorArray (iView).detValues();
@@ -1033,10 +1034,10 @@ Projections::convertFFTPolar (ImageFile& rIF, int iInterpolationID, int iZeropad
   int iZerosAdded = iNumInterpDetWithZeros - iInterpDet;
 
   // For each view, interpolate to nx length, shift to center at origin, and FFt transform
-  for (unsigned int iView = 0; iView < m_nView; iView++) {
+  for (int iView = 0; iView < m_nView; iView++) {
     DetectorValue* detval = pProj->getDetectorArray(iView).detValues();
     LinearInterpolator<DetectorValue> projInterp (detval, pProj->m_nDet);
-    for (unsigned int iDet = 0; iDet < iInterpDet; iDet++) {
+    for (int iDet = 0; iDet < iInterpDet; iDet++) {
       double dInterpPos = (m_nDet / 2.) + (iDet - dMidPoint) * dInterpScale;
       pcIn[iDet].re = projInterp.interpolate (dInterpPos) * dInterpScale;
       pcIn[iDet].im = 0;
@@ -1044,16 +1045,16 @@ Projections::convertFFTPolar (ImageFile& rIF, int iInterpolationID, int iZeropad
 
     Fourier::shuffleFourierToNaturalOrder (pcIn, iInterpDet);
     if (iZerosAdded > 0) {
-      for (unsigned int iDet1 = iMidPoint; iDet1 < iInterpDet; iDet1++)
+      for (int iDet1 = iMidPoint; iDet1 < iInterpDet; iDet1++)
         pcIn[iDet1+iZerosAdded] = pcIn[iDet1];
-      for (unsigned int iDet2 = iMidPoint; iDet2 < iMidPoint + iZerosAdded; iDet2++) 
+      for (int iDet2 = iMidPoint; iDet2 < iMidPoint + iZerosAdded; iDet2++) 
         pcIn[iDet2].re = pcIn[iDet2].im = 0;
     }
 
     fftw_one (plan, pcIn, NULL);
 
     ppcDetValue[iView] = new std::complex<double> [iNumInterpDetWithZeros];
-    for (unsigned int iD = 0; iD < iNumInterpDetWithZeros; iD++) {
+    for (int iD = 0; iD < iNumInterpDetWithZeros; iD++) {
       ppcDetValue[iView][iD] = std::complex<double> (pcIn[iD].re * dFFTScale, pcIn[iD].im * dFFTScale); 
     }
 
@@ -1206,22 +1207,22 @@ Projections::initFromSomatomAR_STAR (int iNViews, int iNDets, unsigned char* pDa
   for (int iv = 0; iv < iNViews; iv++) {
     unsigned char* pArgBase = pData + lDataPos;
     unsigned char* p = pArgBase+0; SwapBytes4IfLittleEndian (p);
-    long lProjNumber = *reinterpret_cast<long*>(p);
+    // long lProjNumber = *reinterpret_cast<long*>(p);
 
     p = pArgBase+20;  SwapBytes4IfLittleEndian (p);
     long lEscale = *reinterpret_cast<long*>(p);
 
     p = pArgBase+28;  SwapBytes4IfLittleEndian (p);
-    long lTime = *reinterpret_cast<long*>(p);
+    // long lTime = *reinterpret_cast<long*>(p);
 
     p = pArgBase + 4; SwapBytes4IfLittleEndian (p);
     double dAlpha = *reinterpret_cast<float*>(p) + HALFPI;
 
     p = pArgBase+12; SwapBytes4IfLittleEndian (p);
-    double dAlign = *reinterpret_cast<float*>(p);
+    // double dAlign = *reinterpret_cast<float*>(p);
 
     p = pArgBase + 16; SwapBytes4IfLittleEndian (p);
-    double dMaxValue = *reinterpret_cast<float*>(p);
+    // double dMaxValue = *reinterpret_cast<float*>(p);
 
     DetectorArray& detArray = getDetectorArray (iv);
     detArray.setViewAngle (dAlpha);
@@ -1292,9 +1293,9 @@ Projections::interpolateToParallel () const
 
     double dViewAngle = m_rotStart;
     int iLastFloor = -1;
+    LinearInterpolator<double> interp (pdThetaValuesForT, pdRaysumsForT, pProjNew->nView(), false);
     for (int iV = 0; iV < pProjNew->nView(); iV++, dViewAngle += pProjNew->m_rotInc) {
       DetectorValue* detValues = pProjNew->getDetectorArray (iV).detValues();
-      LinearInterpolator<double> interp (pdThetaValuesForT, pdRaysumsForT, pProjNew->nView(), false);
       detValues[iD] = interp.interpolate (dViewAngle, &iLastFloor);
     }
   }