X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=include%2Fprocsignal.h;h=2be3b7c20a65d535e53141bb3c607ac141029257;hp=1b08aea8fd5ce5d76877662acb92902df3c19dbf;hb=9b2bb510160bdb56f04847f5b55ab61dd8a47976;hpb=e36dfad3f0818b4c3457fbe7277faa6f4ca28dfe

diff --git a/include/procsignal.h b/include/procsignal.h
index 1b08aea..2be3b7c 100644
--- a/include/procsignal.h
+++ b/include/procsignal.h
@@ -9,7 +9,7 @@
 **  This is part of the CTSim program
 **  Copyright (C) 1983-2000 Kevin Rosenberg
 **
-**  $Id: procsignal.h,v 1.1 2000/08/19 23:00:05 kevin Exp $
+**  $Id: procsignal.h,v 1.11 2001/01/02 05:34:57 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
@@ -39,8 +39,11 @@
 
 #include <complex>
 
-
 class SignalFilter;
+class SGP;
+
+typedef std::complex<double> CTSimComplex;
+
 
 class ProcessSignal {
  public:
@@ -57,18 +60,20 @@ class ProcessSignal {
     static const int FILTER_GENERATION_INVALID;
     static const int FILTER_GENERATION_DIRECT;
     static const int FILTER_GENERATION_INVERSE_FOURIER;
+
+    enum {
+      FORWARD = -1,
+      BACKWARD = 1,
+    };
 
-    ProcessSignal (const char* szFilterName, const char* szFilterMethodName,double bw, double signalIncrement, int n, double param, const char* szDomainName, const char* szFilterGenerationName, const int zeropad = 0, const int preinterpolationFactor = 1);
-
-    ProcessSignal (const int idFilter, int idFilterMethod, double dBandwidth, double dSignalIncrement, int nSignalPoints, double dFilterParam, const int idDomain, int idFilterGeneration, const int iZeropad = 0, const int iPreinterpolationFactor = 1);
+    ProcessSignal (const char* szFilterName, const char* szFilterMethodName,double bw, double signalIncrement, int n, double param, const char* szDomainName, const char* szFilterGenerationName, const int zeropad = 0, const int preinterpolationFactor = 1, const int iTraceLevel = Trace::TRACE_NONE, int iGeometry = Scanner::GEOMETRY_PARALLEL, double dFocalLength = 1., SGP* pSGP = NULL);
 
     ~ProcessSignal();
 
-    void filterSignal (const double input[], double output[]) const;
     void filterSignal (const float input[], double output[]) const;
 
     bool fail(void) const 	{return m_fail;}
-    const string& failMessage(void) const {return m_failMessage;}
+    const std::string& failMessage(void) const {return m_failMessage;}
 
     void setTraceLevel (int traceLevel) {m_traceLevel = traceLevel; }
 
@@ -97,18 +102,14 @@ class ProcessSignal {
 
     // transforms using direct trigometric calculation
     static void finiteFourierTransform (const double input[], double output[], const int n, const int direction);
-    static void finiteFourierTransform (const double input[], complex<double> output[], const int n, const int direction);
-    static void finiteFourierTransform (const complex<double> input[], complex<double> output[], const int n, const int direction);
-    static void finiteFourierTransform (const complex<double> input[], double output[], const int n, const int direction);
-
-
-    static void shuffleNaturalToFourierOrder (double* pdVector, const int n);
-
-    static void shuffleFourierToNaturalOrder (double* pdVector, const int n);
+    static void finiteFourierTransform (const double input[], std::complex<double> output[], const int n, const int direction);
+    static void finiteFourierTransform (const std::complex<double> input[], std::complex<double> output[], const int n, const int direction);
+    static void finiteFourierTransform (const std::complex<double> input[], double output[], const int n, const int direction);
+
 
  private:
-    string m_nameFilterMethod;
-    string m_nameFilterGeneration;
+	 std::string m_nameFilterMethod;
+	 std::string m_nameFilterGeneration;
     int m_idFilterMethod;
     int m_idFilterGeneration;
     int m_nSignalPoints;
@@ -132,9 +133,11 @@ class ProcessSignal {
     int m_iZeropad;
     int m_nOutputPoints;
     int m_iPreinterpolationFactor;
+    int m_idGeometry;
+    double m_dFocalLength;
 
     bool m_fail;
-    string m_failMessage;
+    std::string m_failMessage;
 
     static const char* s_aszFilterMethodName[];
     static const char* s_aszFilterMethodTitle[];
@@ -150,14 +153,15 @@ class ProcessSignal {
     fftw_plan m_complexPlanForward, m_complexPlanBackward;
 #endif
 
-    void init (const int idFilter, int idFilterMethod, double dBandwidth, double dSignalIncrement, int nSignalPoints, double dFilterParam, const int idDomain, int idFilterGeneration, const int iZeropad, const int iPreinterpolationFactor);
+    void init (const int idFilter, int idFilterMethod, double dBandwidth, double dSignalIncrement, int nSignalPoints, double dFilterParam, const int idDomain, int idFilterGeneration, const int iZeropad, const int iPreinterpolationFactor, const int iTraceLevel, const int iGeometry, double dFocalLength, SGP* pSGP);
 
     // transforms that use precalculated trig tables, therefore don't 
     // require number of data points (n) as an argument
-    void finiteFourierTransform (const double input[], complex<double> output[], const int direction) const;
-    void finiteFourierTransform (const complex<double> input[], complex<double> output[], const int direction) const;
-    void finiteFourierTransform (const complex<double> input[], double output[], const int direction) const;
+    void finiteFourierTransform (const double input[], std::complex<double> output[], const int direction) const;
+    void finiteFourierTransform (const std::complex<double> input[], std::complex<double> output[], const int direction) const;
+    void finiteFourierTransform (const std::complex<double> input[], double output[], const int direction) const;
 
+    double convolve (const double func[], const double filter[], const double dx, const int n, const int np) const;
     double convolve (const double f[], const double dx, const int n, const int np) const;
     double convolve (const float f[], const double dx, const int n, const int np) const;