X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=libctsim%2Fprocsignal.cpp;h=e38fae239f0095e9b499425599526cfe0460de54;hp=8156252777e5d3aa0e280a8d52b5d46665f725da;hb=6bfb747f8163381d94a02c03a0351e9ca6815d22;hpb=1e88cf0f7fa4f690ea9f110e8ed3f2b5338d0a10

diff --git a/libctsim/procsignal.cpp b/libctsim/procsignal.cpp
index 8156252..e38fae2 100644
--- 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.3 2000/08/25 15:59:13 kevin Exp $
+**  $Id: procsignal.cpp,v 1.4 2000/08/27 20:32:55 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
@@ -77,7 +77,7 @@ const int ProcessSignal::s_iFilterGenerationCount = sizeof(s_aszFilterGeneration
 // CLASS IDENTIFICATION
 //   ProcessSignal
 //
-ProcessSignal::ProcessSignal (const char* szFilterName, const char* szFilterMethodName, double dBandwidth, double dSignalIncrement, int nSignalPoints, double dFilterParam, const char* szDomainName, const char* szFilterGenerationName, int iZeropad, int iPreinterpolationFactor, int iTraceLevel)
+ProcessSignal::ProcessSignal (const char* szFilterName, const char* szFilterMethodName, double dBandwidth, double dSignalIncrement, int nSignalPoints, double dFilterParam, const char* szDomainName, const char* szFilterGenerationName, int iZeropad, int iPreinterpolationFactor, int iTraceLevel, int iGeometry)
     : m_adFourierCosTable(NULL), m_adFourierSinTable(NULL), m_adFilter(NULL), m_fail(false)
 {
   m_idFilterMethod = convertFilterMethodNameToID (szFilterMethodName);
@@ -109,17 +109,19 @@ ProcessSignal::ProcessSignal (const char* szFilterName, const char* szFilterMeth
     return;
   }
 
-  init (m_idFilter, m_idFilterMethod, dBandwidth, dSignalIncrement, nSignalPoints, dFilterParam, m_idDomain, m_idFilterGeneration, iZeropad, iPreinterpolationFactor, iTraceLevel);
+  init (m_idFilter, m_idFilterMethod, dBandwidth, dSignalIncrement, nSignalPoints, dFilterParam, m_idDomain, m_idFilterGeneration, iZeropad, iPreinterpolationFactor, iTraceLevel, iGeometry);
 }
 
 
 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)
+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)
 {
   m_idFilter = idFilter;
   m_idDomain = idDomain;
   m_idFilterMethod = idFilterMethod;
   m_idFilterGeneration = idFilterGeneration;
+  m_idGeometry = iGeometry;
+
   if (m_idFilter == SignalFilter::FILTER_INVALID || m_idDomain == SignalFilter::DOMAIN_INVALID || m_idFilterMethod == FILTER_METHOD_INVALID || m_idFilterGeneration == FILTER_GENERATION_INVALID) {
     m_fail = true;
     return;
@@ -168,7 +170,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	m_adFilter = new double[ m_nFilterPoints ];
 	double adFrequencyFilter [m_nFilterPoints];
 	filter.copyFilterData (adFrequencyFilter, 0, m_nFilterPoints);
-	if (m_traceLevel >= TRACE_PLOT) {
+	if (m_traceLevel >= Trace::TRACE_PLOT) {
 	  SGPDriver sgpDriver ("Frequency Filter: Natural Order");
 	  SGP sgp (sgpDriver);
 	  EZPlot ezplot (sgp);
@@ -181,7 +183,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	}
 	    
 	shuffleNaturalToFourierOrder (adFrequencyFilter, m_nFilterPoints);
-	if (m_traceLevel >= TRACE_PLOT) {
+	if (m_traceLevel >= Trace::TRACE_PLOT) {
 	  SGPDriver sgpDriver ("Frequency Filter: Fourier Order");
 	  SGP sgp (sgpDriver);
 	  EZPlot ezplot (sgp);
@@ -193,7 +195,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	  cio_kb_getc ();
 	}
 	ProcessSignal::finiteFourierTransform (adFrequencyFilter, m_adFilter, m_nFilterPoints, -1);
-	if (m_traceLevel >= TRACE_PLOT) {
+	if (m_traceLevel >= Trace::TRACE_PLOT) {
 	  SGPDriver sgpDriver ("Inverse Fourier Frequency: Fourier Order");
 	  SGP sgp (sgpDriver);
 	  EZPlot ezplot (sgp);
@@ -205,7 +207,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	  cio_kb_getc ();
 	}
 	shuffleFourierToNaturalOrder (m_adFilter, m_nFilterPoints);
-	if (m_traceLevel >= TRACE_PLOT) {
+	if (m_traceLevel >= Trace::TRACE_PLOT) {
 	  SGPDriver sgpDriver ("Inverse Fourier Frequency: Natural Order");
 	  SGP sgp (sgpDriver);
 	  EZPlot ezplot (sgp);
@@ -235,7 +237,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	  nextPowerOf2++;
 	nextPowerOf2 += (m_iZeropad - 1);
 	m_nFilterPoints = 1 << nextPowerOf2;
-	if (m_traceLevel >= TRACE_TEXT)
+	if (m_traceLevel >= Trace::TRACE_CONSOLE)
 	cout << "nFilterPoints = " << m_nFilterPoints << endl;
       }
       m_nOutputPoints = m_nFilterPoints * m_iPreinterpolationFactor;
@@ -254,7 +256,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
       SignalFilter filter (m_idFilter, m_dFilterMin, m_dFilterMax, m_nFilterPoints, m_dBandwidth, m_dFilterParam, SignalFilter::DOMAIN_FREQUENCY);
       m_adFilter = new double [m_nFilterPoints];
       filter.copyFilterData (m_adFilter, 0, m_nFilterPoints);
-      if (m_traceLevel >= TRACE_PLOT) {
+      if (m_traceLevel >= Trace::TRACE_PLOT) {
 	SGPDriver sgpDriver ("Frequency Filter: Natural Order");
 	SGP sgp (sgpDriver);
 	EZPlot ezplot (sgp);
@@ -266,7 +268,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	  cio_kb_getc ();
       }
       shuffleNaturalToFourierOrder (m_adFilter, m_nFilterPoints);
-	if (m_traceLevel >= TRACE_PLOT) {
+	if (m_traceLevel >= Trace::TRACE_PLOT) {
 	  SGPDriver sgpDriver ("Frequency Filter: Fourier Order");
 	  SGP sgp (sgpDriver);
 	  EZPlot ezplot (sgp);
@@ -293,12 +295,12 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
 	m_nFilterPoints = 1 << nextPowerOf2;
       }
       m_nOutputPoints = m_nFilterPoints * m_iPreinterpolationFactor;
-      if (m_traceLevel >= TRACE_TEXT)
+      if (m_traceLevel >= Trace::TRACE_CONSOLE)
 	cout << "nFilterPoints = " << m_nFilterPoints << endl;
       double adSpatialFilter [m_nFilterPoints];
       SignalFilter filter (m_idFilter, m_dFilterMin, m_dFilterMax, nSpatialPoints, m_dBandwidth, m_dFilterParam, SignalFilter::DOMAIN_SPATIAL);
       filter.copyFilterData (adSpatialFilter, 0, nSpatialPoints);
-      if (m_traceLevel >= TRACE_PLOT) {
+      if (m_traceLevel >= Trace::TRACE_PLOT) {
 	SGPDriver sgpDriver ("Spatial Filter: Natural Order");
 	SGP sgp (sgpDriver);
 	EZPlot ezplot (sgp);
@@ -317,7 +319,7 @@ ProcessSignal::init (const int idFilter, const int idFilterMethod, double dBandw
       finiteFourierTransform (adSpatialFilter, acInverseFilter, m_nFilterPoints, 1);
       for (int i = 0; i < m_nFilterPoints; i++)
 	m_adFilter[i] = abs(acInverseFilter[i]) * m_dSignalInc;
-      if (m_traceLevel >= TRACE_PLOT) {
+      if (m_traceLevel >= Trace::TRACE_PLOT) {
 	SGPDriver sgpDriver ("Spatial Filter: Inverse");
 	SGP sgp (sgpDriver);
 	EZPlot ezplot (sgp);
@@ -468,7 +470,7 @@ ProcessSignal::convertFilterGenerationIDToTitle (const int fgID)
 }
 
 void
-ProcessSignal::filterSignal (const float input[], double output[]) const
+ProcessSignal::filterSignal (const float input[], double output[], int iView) const
 {
   if (m_idFilterMethod == FILTER_METHOD_CONVOLUTION) {
     for (int i = 0; i < m_nSignalPoints; i++)