Simplify/unify determination of navgd.

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

lib/msk144spd.f90

@@ -1,4 +1,4 @@
-subroutine msk144spd(cbig,n,ntol,nsuccess,msgreceived,fc,fret,tret,iavg_decoded)
+subroutine msk144spd(cbig,n,ntol,nsuccess,msgreceived,fc,fret,tret,navg)
 ! MSK144 short-ping-decoder
 
   use timer_module, only: timer
@@ -182,7 +182,7 @@ subroutine msk144spd(cbig,n,ntol,nsuccess,msgreceived,fc,fret,tret,iavg_decoded)
           if( ndecodesuccess .gt. 0 ) then
             tret=(nstart(icand)+NSPM/2)/fs
             fret=fest
-            iavg_decoded=iav
+            navg=sum(navmask)
             nsuccess=1
             return
           endif 

lib/msk40spd.f90

@@ -1,4 +1,4 @@
-subroutine msk40spd(cbig,n,ntol,mycall,hiscall,nsuccess,msgreceived,fc,fret,tret)
+subroutine msk40spd(cbig,n,ntol,mycall,hiscall,nsuccess,msgreceived,fc,fret,tret,navg)
 ! msk40 short-ping-decoder
 
   use timer_module, only: timer
@@ -182,6 +182,7 @@ subroutine msk40spd(cbig,n,ntol,mycall,hiscall,nsuccess,msgreceived,fc,fret,tret
           if( ndecodesuccess .gt. 0 ) then
             tret=(nstart(icand)+NSPM/2)/fs
             fret=fest
+            navg=sum(navmask)
 !write(*,*) icand, iav, ipk, is, tret, fret, msgreceived
             nsuccess=1
             return

lib/mskrtd.f90

@@ -24,7 +24,6 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,line)
   integer iavmask(8)
   integer iavpatterns(8,NPATTERNS)
   integer npkloc(10)
-  integer navgd(10)
 
   real d(NFFT1)
   real pow(8)
@@ -37,7 +36,6 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,line)
        1,1,1,1,1,0,0,0, &
        1,1,1,1,1,1,1,0/
   data xmc/2.0,4.5,2.5,3.5/ !Used to label decode with time at center of averaging mask
-  data navgd/1,1,1,2,2,3,4,4,5,7/
 !###### TEMPORARY
   data mycall/'K9AN'/
   data hiscall/'K1JT'/
@@ -91,12 +89,12 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,line)
 ! center a 3-frame analysis window and attempts to decode each of the 
 ! 3 frames along with 2- and 3-frame averages. 
   np=8*NSPM
-  call msk144spd(cdat,np,ntol,nsuccess,msgreceived,fc,fest,tdec,iavg_decoded)
+  call msk144spd(cdat,np,ntol,nsuccess,msgreceived,fc,fest,tdec,navg)
 
 !############################################################
 !##### hardwired for testing - need to bring in Sh box status
   if( nsuccess .eq. 0 .and. .false. ) then
-    call msk40spd(cdat,np,ntol,mycall,hiscall,nsuccess,msgreceived,fc,fest,tdec)
+    call msk40spd(cdat,np,ntol,mycall,hiscall,nsuccess,msgreceived,fc,fest,tdec,navg)
   endif
 
   if( nsuccess .eq. 1 ) then
@@ -112,7 +110,6 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,line)
 ! Normal - try 4-frame averages
 ! Deep - try 4-, 5- and 7-frame averages. 
   npat=NPATTERNS
-  iavg_decoded=0
   if( ndepth .eq. 1 ) npat=0
   if( ndepth .eq. 2 ) npat=2
   do iavg=1,npat
@@ -134,7 +131,6 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,line)
            if(ndecodesuccess .gt. 0) then
               tdec=tsec+xmc(iavg)*tframe
               decsym=' & '
-              iavg_decoded=iavg+6
               goto 900
            endif
         enddo                         !Slicer dither
@@ -170,7 +166,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,line)
      if( nsnr .lt. -8 ) nsnr=-8
      if( nsnr .gt. 24 ) nsnr=24
      write(line,1020) nutc0,nsnr,tdec,nint(fest),decsym,msgreceived,    &
-          navgd(iavg_decoded),char(0)
+          navg,char(0)
 1020 format(i6.6,i4,f5.1,i5,a3,a22,i2,a1)
   endif
 999 tsec0=tsec