From a085b5e3909c3b6621a291733a08669bef5df053 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Wed, 21 Dec 2022 16:02:39 -0500
Subject: [PATCH] another few tweaks, a few more decodes.  :-)

---
 q65w/libq65/q65wa.f90 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/q65w/libq65/q65wa.f90 b/q65w/libq65/q65wa.f90
index 5b00625f6..0a949fc1b 100644
--- a/q65w/libq65/q65wa.f90
+++ b/q65w/libq65/q65wa.f90
@@ -107,20 +107,21 @@ subroutine getcand2(ss,savg0,nts_q65,cand,ncand)
      savg(ja:jb)=savg(ja:jb)/(1.015*base)
      savg0(ja:jb)=savg0(ja:jb)/(1.015*base)
   enddo
-  
+
   df=96000.0/NFFT
   bw=65*nts_q65*1.666666667
   nbw=bw/df + 1
+  nb0=2*nts_q65
   smin=1.4
   nguard=5
 
   j=0
   sync(1:NFFT)%ccfmax=0.
 
-  do i=1,NFFT-2*nbw
+  do i=1,NFFT-nbw-nguard
      if(savg(i).lt.smin) cycle
-     spk=maxval(savg(i:i+nbw))
-     ipk1=maxloc(savg(i:i+nbw))
+     spk=maxval(savg(i:i+nb0))
+     ipk1=maxloc(savg(i:i+nb0))
      i0=ipk1(1) + i - 1
      fpk=0.001*i0*df
 ! Check to see if sync tone is present.
@@ -130,10 +131,10 @@ subroutine getcand2(ss,savg0,nts_q65,cand,ncand)
 !     write(73,3073) j,fpk+32.0-2.270,snr_sync,xdt
 !3073 format(i3,3f10.3)
      cand(j)%f=fpk
-     cand(j)%xdt=2.8
-     cand(j)%snr=spk
+     cand(j)%xdt=xdt
+     cand(j)%snr=snr_sync
      cand(j)%iflip=0
-     sync(i0)%ccfmax=spk
+     sync(i0)%ccfmax=snr_sync
      ia=min(i,i0-nguard)
      ib=i0+nbw+nguard
      savg(ia:ib)=0.