Further work on ft8sim and ft8d.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7723 ab8295b8-cf94-4d9e-aec4-7959e3be5d79

lib/fsk4hf/ft8_params.f90

@@ -4,7 +4,6 @@ parameter (ND=58)                     !Data symbols
 parameter (NS=21)                     !Sync symbols (3 @ Costas 7x7)
 parameter (NN=NS+ND)                  !Total channel symbols (79)
 parameter (NSPS=2048)                 !Samples per symbol at 12000 S/s
-parameter (N7=7*NSPS)                 !Samples in Costas 7x7 array (14,336)
 parameter (NZ=NSPS*NN)                !Samples in full 15 s waveform (161,792)
 parameter (NMAX=15*12000)             !Samples in iwave (180,000)
 parameter (NFFT1=2*NSPS, NH1=NFFT1/2) !Length of FFTs for symbol spectra

lib/fsk4hf/ft8d.f90

@@ -12,7 +12,7 @@ program ft8d
 
   include 'ft8_params.f90'
   parameter(NRECENT=10)
-  character*12 recent_calls(NRECENT)
+  character*12 recent_calls(NRECENT),arg
   character message*22,infile*80,datetime*13
   real s(NH1,NHSYM)
   real s1(0:7,ND)
@@ -21,13 +21,20 @@ program ft8d
   integer ihdr(11)
   integer*2 iwave(NMAX)                 !Generated full-length waveform  
 !  integer*1 idat(7)
-  integer*1 decoded(KK),apmask(ND),cw(ND)
+  integer*1 decoded(KK),apmask(3*ND),cw(3*ND)
-
+  integer*8 count0,count1,clkfreq
+  
   nargs=iargc()
-  if(nargs.lt.1) then
+  if(nargs.lt.3) then
-     print*,'Usage:   ft8d file1 [file2 ...]'
+     print*,'Usage:   ft8d MaxIt Norder file1 [file2 ...]'
+     print*,'Example  ft8d   40     2   *.wav'
      go to 999
   endif
+  call getarg(1,arg)
+  read(arg,*) max_iterations
+  call getarg(2,arg)
+  read(arg,*) norder
+  nfiles=nargs-2
 
   twopi=8.0*atan(1.0)
   fs=12000.0                             !Sample rate
@@ -36,15 +43,22 @@ program ft8d
   ts=2*NSPS*dt                           !Duration of OQPSK symbols (s)
   baud=1.0/tt                            !Keying rate (baud)
   txt=NZ*dt                              !Transmission length (s)
+  nsync=0
+  ngood=0
+  nbad=0
+  tsec=0.
 
-  do ifile=1,nargs
+  do ifile=1,nfiles
-     call getarg(ifile,infile)
+     call getarg(ifile+2,infile)
      open(10,file=infile,status='old',access='stream')
      read(10,end=999) ihdr,iwave
      close(10)
      j2=index(infile,'.wav')
      read(infile(j2-6:j2-1),*) nutc
      datetime=infile(j2-13:j2-1)
+     call system_clock(count0,clkfreq)
+
+!     call ft8filbig(iwave,NN*NSPS)
      call sync8(iwave,xdt,f1,s)
 
      xsnr=0.
@@ -85,28 +99,30 @@ program ft8d
      ss=0.84
      llr=2.0*rxdata/(ss*ss)
      apmask=0
-     max_iterations=40
-     ifer=0
      call bpdecode174(llr,apmask,max_iterations,decoded,niterations)
-     if(niterations.lt.0) then
+     if(niterations.lt.0) call osd174(llr,norder,decoded,nharderrors,cw)
-        write(41,*) llr,apmask,max_iterations,decoded,niterations
-        call osd174(llr,2,decoded,niterations,cw)
-        write(42,*) llr,apmask,max_iterations,decoded,niterations
-!        if(niterations.lt.0) stop
-     endif
      nbadcrc=0
-     if(niterations.ge.0) call chkcrc12a(decoded,nbadcrc)
+     call chkcrc12a(decoded,nbadcrc)
-     if(niterations.lt.0 .or. nbadcrc.ne.0) ifer=1
 
      message='                      '
-     if(ifer.eq.0) then
+     if(nbadcrc.eq.0) then
         call extractmessage174(decoded,message,ncrcflag,recent_calls,nrecent)
      endif
      nsnr=nint(xsnr)
-     write(13,1110) datetime,0,nsnr,xdt,freq,message,nfdot
+     write(13,1110) datetime,0,nsnr,xdt,f1,niterations,nharderrors,message
-1110 format(a11,2i4,f6.2,f12.7,2x,a22,i3)
+1110 format(a13,2i4,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)
-  enddo                                   ! ifile loop
+     if(abs(xdt).le.0.1 .or. abs(f1-1500).le.2.93) nsync=nsync+1
+     if(message.eq.'K1ABC W9XYZ EN37      ') ngood=ngood+1
+     if(message.ne.'K1ABC W9XYZ EN37      ' .and.                      &
+        message.ne.'                      ') nbad=nbad+1
+     call system_clock(count1,clkfreq)
+     tsec=tsec+float(count1-count0)/float(clkfreq)
+  enddo   ! ifile loop
+
+  write(*,1100) max_iterations,norder,float(nsync)/nfiles,float(ngood)/nfiles,  &
+       float(nbad)/nfiles,tsec/nfiles
+1100 format(2i5,3f8.4,f9.3)
 
 999 end program ft8d

lib/fsk4hf/ft8sim.f90

@@ -50,7 +50,6 @@ program ft8sim
   write(*,1000) f0,xdt,txt,snrdb,bw,msgsent
 1000 format('f0:',f9.3,'   DT:',f6.2,'   TxT:',f6.1,'   SNR:',f6.1,    &
           '  BW:',f4.1,2x,a22)
-
   phi=0.0
   c0=0.
   k=-1 + nint(xdt/dt)

lib/pctile.f90

@@ -1,6 +1,6 @@
 subroutine pctile(x,npts,npct,xpct)
 
-  parameter (NMAX=100000)
+  parameter (NMAX=128*1024)
   real*4 x(npts)
   real*4 tmp(NMAX)