Merge branch 'develop' of bitbucket.org:k1jt/wsjtx into develop

lib/fsk4hf/wspr4d.f90

@@ -32,7 +32,7 @@ program wspr4d
 
    nargs=iargc()
    if(nargs.lt.1) then
-      print*,'Usage:   wspr4d [-a <data_dir>] [-f fMHz] [-c ncoh] [-h h] file1 [file2 ...]'
+      print*,'Usage:   wspr4d [-a <data_dir>] [-f fMHz] file1 [file2 ...]'
       go to 999
    endif
    iarg=1
@@ -48,12 +48,6 @@ program wspr4d
       read(arg,*) fMHz
       iarg=iarg+2
    endif
-   ncoh=1
-   if(arg(1:2).eq.'-h') then
-      call getarg(iarg+1,arg)
-      read(arg,*) h
-      iarg=iarg+2
-   endif
 
    open(13,file=trim(data_dir)//'/ALL_WSPR.TXT',status='unknown',   &
       position='append')
@@ -105,12 +99,14 @@ program wspr4d
                endif
             enddo
          enddo
-write(*,*) -1.50*(fs/416),fc1,fc2,isbest
+         write(*,*) ifile,icand,-1.50*(fs/416),fc1,fc2,isbest,smax
          istart=isbest
          fcest=fc2
-!genie sync
+!
+!******** genie sync
 !         istart=375
 !         fcest=0.0-1.50*(fs/416)
+!
          cframe=c2(istart:istart+103*416-1)
          call downsample4(cframe,fcest,cd)
          s2=sum(cd*conjg(cd))/(16*103)