From c741f6ce7bb43b115d08e190b93e0ce090ae3475 Mon Sep 17 00:00:00 2001
From: John Glover <glover.john@gmail.com>
Date: Thu, 4 Nov 2010 14:50:08 +0000
Subject: Fixed a couple of SMSPeakDetection bugs and updated the unit tests
---
sms/sms.i | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'sms/sms.i')
diff --git a/sms/sms.i b/sms/sms.i
index 5474d80..e091312 100644
--- a/sms/sms.i
+++ b/sms/sms.i
@@ -83,19 +83,19 @@
fLambda, iSamplingRate);
}
int simplsms_detectPeaks(int sizeMag, sfloat *pMag, int sizePhase, sfloat *pPhase,
- SMS_SpectralPeaks *pPeakStruct, SMS_PeakParams *pPeakParams)
+ SMS_SpectralPeaks *pPeakStruct, SMS_AnalParams *pAnalParams)
{
if(sizeMag != sizePhase)
{
sms_error("sizeMag != sizePhase");
return 0;
}
- if(pPeakStruct->nPeaks < pPeakParams->iMaxPeaks)
+ if(pPeakStruct->nPeaks < pAnalParams->maxPeaks)
{
- sms_error("nPeaks in SMS_SpectralPeaks is not large enough (less than SMS_PeakParams.iMaxPeaks)");
+ sms_error("nPeaks in SMS_SpectralPeaks is not large enough (less than SMS_AnalParams.maxPeaks)");
return 0;
}
- pPeakStruct->nPeaksFound = sms_detectPeaks(sizeMag, pMag, pPhase, pPeakStruct->pSpectralPeaks, pPeakParams);
+ pPeakStruct->nPeaksFound = sms_detectPeaks(sizeMag, pMag, pPhase, pPeakStruct->pSpectralPeaks, pAnalParams);
return pPeakStruct->nPeaksFound;
}
int simplsms_spectrum( int sizeWaveform, sfloat *pWaveform, int sizeWindow, sfloat *pWindow,
--
cgit v1.2.3