From 4aa9181bde6781b4de7eac057af009a88bccaca1 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 11 Jun 2015 18:49:42 +0000 Subject: [PATCH] Working on message averaging for JT4 mode. Far from finished! ... but it's much better than it was. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5589 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/avg4.f90 | 1 - lib/wsjt4.f90 | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/avg4.f90 b/lib/avg4.f90 index da9c9358b..aac0d8081 100644 --- a/lib/avg4.f90 +++ b/lib/avg4.f90 @@ -127,7 +127,6 @@ subroutine avg4(nutc,snrsync,dtxx,flip,nfreq,mode4,ntol,ndepth,neme, & deepbest=deepave kbest=k ndeepave=nsum -! print*,'b',qbest,k,deepbest endif if(nch(k).ge.mode4) exit enddo diff --git a/lib/wsjt4.f90 b/lib/wsjt4.f90 index 12726ff91..93903fcae 100644 --- a/lib/wsjt4.f90 +++ b/lib/wsjt4.f90 @@ -30,7 +30,7 @@ subroutine wsjt4(dat,npts,nutc,NClearAve,minsync,ntol,emedelay,dttol, & endif zz=0. - syncmin=5.0 + minsync + syncmin=3.0 + minsync naggressive=0 if(ndepth.ge.2) naggressive=1 nq1=3 @@ -45,6 +45,8 @@ subroutine wsjt4(dat,npts,nutc,NClearAve,minsync,ntol,emedelay,dttol, & rsymbol=0. dtsave=0. syncsave=0. + nfanoave=0 + ndeepave=0 endif ! Attempt to synchronize: look for sync pattern, get DF and DT. @@ -115,6 +117,7 @@ subroutine wsjt4(dat,npts,nutc,NClearAve,minsync,ntol,emedelay,dttol, & endif endif + if(idt.ne.0) cycle ! Single-sequence Fano decode failed, so try for an average Fano decode: qave=0. ! If this is a new minute or a new frequency, call avg4