r348: fix linefeed problem

[ctsim.git] / libctsim / procsignal.cpp

diff --git a/libctsim/procsignal.cpp b/libctsim/procsignal.cpp
index 41895ac06a37308f297e000bf8cf9b1ad5b43551..71a0e67bad2121c37eb063ca893f0e70f4e7919e 100644 (file)
--- a/libctsim/procsignal.cpp
+++ b/libctsim/procsignal.cpp
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: procsignal.cpp,v 1.13 2001/01/02 05:34:57 kevin Exp $
+**  $Id: procsignal.cpp,v 1.14 2001/01/02 16:02:13 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
@@ -115,7 +115,7 @@ ProcessSignal::ProcessSignal (const char* szFilterName, const char* szFilterMeth
 
 void
 ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandwidth, double dSignalIncrement, int nSignalPoints, double dFilterParam, const int idDomain, const int idFilterGeneration, const int iZeropad, const int iPreinterpolationFactor, int iTraceLevel, int iGeometry, double dFocalLength, SGP* pSGP)
-{\r
+{
   int i;
   m_idFilter = idFilter;
   m_idDomain = idDomain;
@@ -200,7 +200,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
       }
 #endif
       ProcessSignal::finiteFourierTransform (adFrequencyFilter, m_adFilter, m_nFilterPoints, FORWARD);
-      delete adFrequencyFilter;\r
+      delete adFrequencyFilter;
 #ifdef HAVE_SGP
       if (pEZPlot && m_traceLevel >= Trace::TRACE_PLOT) {
         pEZPlot->ezset ("title Inverse Fourier Frequency: Fourier Order");
@@ -335,7 +335,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
       if (m_traceLevel >= Trace::TRACE_CONSOLE)
         std::cout << "nFilterPoints = " << m_nFilterPoints << endl;
 #endif
-      double* adSpatialFilter = new double [m_nFilterPoints];\r
+      double* adSpatialFilter = new double [m_nFilterPoints];
       SignalFilter filter (m_idFilter, m_dFilterMin, m_dFilterMax, nSpatialPoints, m_dBandwidth, m_dFilterParam, SignalFilter::DOMAIN_SPATIAL);
       filter.copyFilterData (adSpatialFilter, 0, nSpatialPoints);
 #ifdef HAVE_SGP
@@ -364,17 +364,17 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
           double dScale = 0.5 * sinScale * sinScale;
           adSpatialFilter[i] *= dScale;
         }
-      }\r
+      }
       for (i = nSpatialPoints; i < m_nFilterPoints; i++)
         adSpatialFilter[i] = 0;
       
       m_adFilter = new double [m_nFilterPoints];
-      std::complex<double>* acInverseFilter = new std::complex<double> [m_nFilterPoints];\r
+      std::complex<double>* acInverseFilter = new std::complex<double> [m_nFilterPoints];
       finiteFourierTransform (adSpatialFilter, acInverseFilter, m_nFilterPoints, BACKWARD);
-      delete adSpatialFilter;\r
+      delete adSpatialFilter;
       for (i = 0; i < m_nFilterPoints; i++)
         m_adFilter[i] = std::abs (acInverseFilter[i]) * m_dSignalInc;
-      delete acInverseFilter;\r
+      delete acInverseFilter;
 #ifdef HAVE_SGP
       if (pEZPlot && m_traceLevel >= Trace::TRACE_PLOT) {
         pEZPlot->ezset ("title Spatial Filter: Inverse");
@@ -382,7 +382,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
         pEZPlot->ezset ("yporigin 0.50");
         pEZPlot->addCurve (m_adFilter, m_nFilterPoints);
         pEZPlot->plot (pSGP);
-        delete pEZPlot;\r
+        delete pEZPlot;
       }
 #endif
     }
@@ -528,7 +528,7 @@ void
 ProcessSignal::filterSignal (const float constInput[], double output[]) const
 {
   double* input = new double [m_nSignalPoints];
-  int i;\r
+  int i;
   for (i = 0; i < m_nSignalPoints; i++)
     input[i] = constInput[i];
   
@@ -542,7 +542,7 @@ ProcessSignal::filterSignal (const float constInput[], double output[]) const
       int iDetFromCenter = i - (m_nSignalPoints / 2);
       input[i] *= m_dFocalLength * cos (iDetFromCenter * m_dSignalInc);
     }
-  }\r
+  }
   if (m_idFilterMethod == FILTER_METHOD_CONVOLUTION) {
     for (i = 0; i < m_nSignalPoints; i++)
       output[i] = convolve (input, m_dSignalInc, i, m_nSignalPoints);
@@ -553,15 +553,15 @@ ProcessSignal::filterSignal (const float constInput[], double output[]) const
     for (i = m_nSignalPoints; i < m_nFilterPoints; i++)
       inputSignal[i] = 0;  // zeropad
     std::complex<double>* fftSignal = new std::complex<double> [m_nFilterPoints];
-    finiteFourierTransform (inputSignal, fftSignal, m_nFilterPoints, FORWARD);\r
+    finiteFourierTransform (inputSignal, fftSignal, m_nFilterPoints, FORWARD);
     delete inputSignal;
     for (i = 0; i < m_nFilterPoints; i++)
       fftSignal[i] *= m_adFilter[i];
     double* inverseFourier = new double [m_nFilterPoints];
-    finiteFourierTransform (fftSignal, inverseFourier, m_nFilterPoints, BACKWARD);\r
+    finiteFourierTransform (fftSignal, inverseFourier, m_nFilterPoints, BACKWARD);
     delete fftSignal;
     for (i = 0; i < m_nSignalPoints; i++) 
-      output[i] = inverseFourier[i];\r
+      output[i] = inverseFourier[i];
     delete inverseFourier;
   } else if (m_idFilterMethod == FILTER_METHOD_FOURIER_TABLE) {
     double* inputSignal = new double [m_nFilterPoints];
@@ -570,15 +570,15 @@ ProcessSignal::filterSignal (const float constInput[], double output[]) const
     for (i = m_nSignalPoints; i < m_nFilterPoints; i++)
       inputSignal[i] = 0;  // zeropad
     std::complex<double>* fftSignal = new std::complex<double> [m_nFilterPoints];
-    finiteFourierTransform (inputSignal, fftSignal, FORWARD);\r
+    finiteFourierTransform (inputSignal, fftSignal, FORWARD);
     delete inputSignal;
     for (i = 0; i < m_nFilterPoints; i++)
       fftSignal[i] *= m_adFilter[i];
     double* inverseFourier = new double [m_nFilterPoints];
-    finiteFourierTransform (fftSignal, inverseFourier, BACKWARD);\r
+    finiteFourierTransform (fftSignal, inverseFourier, BACKWARD);
     delete fftSignal;
     for (i = 0; i < m_nSignalPoints; i++) 
-      output[i] = inverseFourier[i];\r
+      output[i] = inverseFourier[i];
     delete inverseFourier;
   }
 #if HAVE_FFTW
@@ -589,7 +589,7 @@ ProcessSignal::filterSignal (const float constInput[], double output[]) const
     fftw_real* fftOutput = new fftw_real [ m_nFilterPoints ];
     rfftw_one (m_realPlanForward, m_adRealFftInput, fftOutput);
     for (i = 0; i < m_nFilterPoints; i++)
-      m_adRealFftSignal[i] = m_adFilter[i] * fftOutput[i];\r
+      m_adRealFftSignal[i] = m_adFilter[i] * fftOutput[i];
     delete [] fftOutput;
     for (i = m_nFilterPoints; i < m_nOutputPoints; i++)
             m_adRealFftSignal[i] = 0;
@@ -597,7 +597,7 @@ ProcessSignal::filterSignal (const float constInput[], double output[]) const
     fftw_real* ifftOutput = new fftw_real [ m_nOutputPoints ];
     rfftw_one (m_realPlanBackward, m_adRealFftSignal, ifftOutput);
     for (i = 0; i < m_nSignalPoints * m_iPreinterpolationFactor; i++)
-      output[i] = ifftOutput[i];\r
+      output[i] = ifftOutput[i];
     delete [] ifftOutput;
   } else if (m_idFilterMethod == FILTER_METHOD_FFTW) {
     for (i = 0; i < m_nSignalPoints; i++)
@@ -608,15 +608,15 @@ ProcessSignal::filterSignal (const float constInput[], double output[]) const
     for (i = 0; i < m_nFilterPoints; i++) {
       m_adComplexFftSignal[i].re = m_adFilter[i] * fftOutput[i].re;
       m_adComplexFftSignal[i].im = m_adFilter[i] * fftOutput[i].im;
-    }\r
+    }
     delete [] fftOutput;
     fftw_complex* ifftOutput = new fftw_complex [ m_nOutputPoints ];
     fftw_one (m_complexPlanBackward, m_adComplexFftSignal, ifftOutput);
     for (i = 0; i < m_nSignalPoints * m_iPreinterpolationFactor; i++) 
-      output[i] = ifftOutput[i].re;\r
+      output[i] = ifftOutput[i].re;
     delete [] ifftOutput;
   }
-#endif\r
+#endif
   delete input;
 }
 
@@ -690,7 +690,7 @@ ProcessSignal::finiteFourierTransform (const double input[], double output[], co
   
   finiteFourierTransform (input, complexOutput, n, direction);
   for (int i = 0; i < n; i++)
-    output[i] = complexOutput[i].real();\r
+    output[i] = complexOutput[i].real();
   delete [] complexOutput;
 }
 
@@ -733,8 +733,8 @@ ProcessSignal::finiteFourierTransform (const std::complex<double> input[], std::
     std::complex<double> sum (0,0);
     for (int j = 0; j < n; j++) {
       double angle = i * j * angleIncrement;
-      std::complex<double> exponentTerm (cos(angle), sin(angle));\r
-      sum += input[j] * exponentTerm;\r
+      std::complex<double> exponentTerm (cos(angle), sin(angle));
+      sum += input[j] * exponentTerm;
     }
     if (direction < 0) {
       sum /= n;