Another tweak to message averaging.

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

libm65/decode1a.f

@@ -136,7 +136,7 @@
          nhz=1000*nkhz + ndf
          ihzdiff=min(500,ntol)
          if(nutc.ne.nutc0 .or. abs(nhz-nhz0).ge.ihzdiff) syncbest=0.
-         if(sync2.gt.syncbest) then
+         if(sync2.gt.0.99999*syncbest) then
             nsave=nsave+1
             nsave=mod(nsave-1,64)+1
             npol=nint(57.296*pol)

libm65/s3avg.f90

@@ -25,7 +25,7 @@ subroutine s3avg(nsave,mode65,nutc,nhz,xdt,npol,ntol,s3,nsum,nkv,decoded)
   do i=1,64
      if(nutc.eq.iutc(i) .and. abs(nhz-ihz(i)).lt.ihzdiff) then
         nsave=mod(nsave-1+64,64)+1
-        go to 900
+        go to 10
      endif
   enddo
   
@@ -35,7 +35,7 @@ subroutine s3avg(nsave,mode65,nutc,nhz,xdt,npol,ntol,s3,nsum,nkv,decoded)
   dt(nsave)=xdt                             !Save DT
   s3a(1:64,1:63,nsave)=s3                   !Save the spectra
 
-  s3b=0.
+10 s3b=0.
   do i=1,64                                 !Accumulate avg spectra
      if(iutc(i).lt.0) cycle
      if(mod(iutc(i),2).ne.mod(nutc,2)) cycle !Use only same sequence
@@ -45,8 +45,8 @@ subroutine s3avg(nsave,mode65,nutc,nhz,xdt,npol,ntol,s3,nsum,nkv,decoded)
      nsum=nsum+1
   enddo
 
-!  write(71,3001) nutc,nsave,nhz,npol,xdt
+!  write(71,3001) nutc,nsum,nsave,nhz,npol,xdt
-!3001 format(4i8,1f8.1)
+!3001 format(5i8,1f8.1)
 !  flush(71)
  
   decoded='                      '
@@ -60,5 +60,5 @@ subroutine s3avg(nsave,mode65,nutc,nhz,xdt,npol,ntol,s3,nsum,nkv,decoded)
      endif
   endif
 
-900 return
+  return
 end subroutine s3avg

mainwindow.cpp

@@ -1,4 +1,4 @@
-//--------------------------------------------------------------- MainWindow
+//-------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"