From d684cab028b49bda90290fed3b0929767a608a34 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Fri, 16 Jun 2017 20:14:36 +0000
Subject: [PATCH] Working toward a better sync scheme.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7724 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/fsk4hf/ft8d.f90   | 9 ++++-----
 lib/fsk4hf/ft8sim.f90 | 6 +-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/fsk4hf/ft8d.f90 b/lib/fsk4hf/ft8d.f90
index f396e50ab..b2b0abd79 100644
--- a/lib/fsk4hf/ft8d.f90
+++ b/lib/fsk4hf/ft8d.f90
@@ -58,10 +58,9 @@ program ft8d
      datetime=infile(j2-13:j2-1)
      call system_clock(count0,clkfreq)
 
-!     call ft8filbig(iwave,NN*NSPS)
+     call ft8filbig(iwave,NN*NSPS,xdta,f1a,xsnr)
      call sync8(iwave,xdt,f1,s)
 
-     xsnr=0.
      tstep=0.5*NSPS/12000.0
      df=12000.0/NFFT1
      i0=nint(f1/df)
@@ -109,8 +108,8 @@ program ft8d
         call extractmessage174(decoded,message,ncrcflag,recent_calls,nrecent)
      endif
      nsnr=nint(xsnr)
-     write(13,1110) datetime,0,nsnr,xdt,f1,niterations,nharderrors,message
-1110 format(a13,2i4,f6.2,f7.1,2i4,2x,a22)
+     write(13,1110) datetime,0,nsnr,xdt,f1,xdta,f1a,niterations,nharderrors,message
+1110 format(a13,2i4,2(f6.2,f7.1),2i4,2x,a22)
      write(*,1112) datetime(8:13),nsnr,xdt,nint(f1),message
 1112 format(a6,i4,f5.1,i6,2x,a22)
      if(abs(xdt).le.0.1 .or. abs(f1-1500).le.2.93) nsync=nsync+1
@@ -121,7 +120,7 @@ program ft8d
      tsec=tsec+float(count1-count0)/float(clkfreq)
   enddo   ! ifile loop
 
-  write(*,1100) max_iterations,norder,float(nsync)/nfiles,float(ngood)/nfiles,  &
+  write(21,1100) max_iterations,norder,float(nsync)/nfiles,float(ngood)/nfiles,  &
        float(nbad)/nfiles,tsec/nfiles
 1100 format(2i5,3f8.4,f9.3)
 
diff --git a/lib/fsk4hf/ft8sim.f90 b/lib/fsk4hf/ft8sim.f90
index 97c0b23fb..42c5f775f 100644
--- a/lib/fsk4hf/ft8sim.f90
+++ b/lib/fsk4hf/ft8sim.f90
@@ -94,10 +94,6 @@ program ft8sim
      close(10)
      write(*,1110) ifile,xdt,f0,snrdb,fname
 1110 format(i4,f7.2,f8.2,f7.1,2x,a17)
-!     do i=0,NZ-1
-!        write(13,3001) i,i/12000.0,c(i),iwave(i+1)
-!3001    format(i8,f12.6,2f12.3,i8)
-!     enddo
-enddo
+  enddo
        
 999 end program ft8sim