From 545b2b281376be1e45f72f24570bd842e945eac3 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 19 Nov 2012 17:16:31 +0000 Subject: [PATCH] Correct the frequency-selection logic in decoder.f90. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2750 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/decoder.f90 | 9 ++++----- lib/redsync.f90 | 1 - mainwindow.cpp | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/decoder.f90 b/lib/decoder.f90 index 0293155d2..dd6ee198a 100644 --- a/lib/decoder.f90 +++ b/lib/decoder.f90 @@ -98,7 +98,7 @@ subroutine decoder(ntrSeconds,ndepth,nRxLog,c00) ii=maxloc(ccfred(ia:ib)) i=ii(1) + ia - 1 f=(i-1)*df3 - + print*,ipk,i,ccfred(i),f,abs(f-fgood) if((i.eq.ipk .or. ccfred(i).ge.3.0) .and. abs(f-fgood).gt.10.0*df8) then call timer('spec9 ',0) call spec9(c0,npts8,nsps,f,fpk,xdt,snr,i1SoftSymbols) @@ -127,12 +127,11 @@ subroutine decoder(ntrSeconds,ndepth,nRxLog,c00) fgood=f nsynced=1 ndecoded=1 + ccfred(max(ia,i):min(ib,i+8))=0. endif endif - i1=max(ia,i-10) - i2=min(ib,i+10) - ccfred(i1:i2)=0. - if(maxval(ccfred(ia:ib)).gt.3.0) go to 10 + ccfred(i)=0. + if(maxval(ccfred(ia:ib)).gt.3.0) go to 10 if(fgood.eq.0.0) then write(13,1020) line diff --git a/lib/redsync.f90 b/lib/redsync.f90 index 53eac4c8a..dbcee7529 100644 --- a/lib/redsync.f90 +++ b/lib/redsync.f90 @@ -30,7 +30,6 @@ subroutine redsync(ss,ntrperiod,ihsym,iz,red) red=red/xmed smax=0. do i=1,iz -! red(i)=0.3*db(red(i)) red(i)=2.0*sqrt(red(i)) smax=max(smax,red(i)) enddo diff --git a/mainwindow.cpp b/mainwindow.cpp index 4816b8ae3..70e24caf3 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//-------------------------------------------------------------- MainWindow +//--------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"