diff options
| author | John Glover <glover.john@gmail.com> | 2010-11-04 14:50:08 +0000 |
|---|---|---|
| committer | John Glover <glover.john@gmail.com> | 2010-11-04 14:50:08 +0000 |
| commit | c741f6ce7bb43b115d08e190b93e0ce090ae3475 (patch) | |
| tree | 9ad817d457a0b5595a4de802b069f149745295ac /sms/sms.i | |
| parent | 82ae0ec4aa684dbe6285b265bc6a07c6f555d90d (diff) | |
| download | simpl-c741f6ce7bb43b115d08e190b93e0ce090ae3475.tar.gz simpl-c741f6ce7bb43b115d08e190b93e0ce090ae3475.tar.bz2 simpl-c741f6ce7bb43b115d08e190b93e0ce090ae3475.zip | |
Fixed a couple of SMSPeakDetection bugs and updated the unit tests
Diffstat (limited to 'sms/sms.i')
| -rw-r--r-- | sms/sms.i | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -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, |