Work in progress on message averaging: save current status.

lib/q65.f90

@@ -5,7 +5,7 @@ module q65
   integer iutc(MAXAVE)
   integer iseq(MAXAVE)
   integer listutc(10)
-  real    fsave(MAXAVE)
+  real    f0save(MAXAVE)
   real    xdtsave(MAXAVE)
   real    snr1save(MAXAVE)
   real,allocatable :: s3save(:,:,:)

lib/q65_avg.f90

@@ -1,22 +1,29 @@
-subroutine q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,xdt,f0,snr1,s3)
+subroutine q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,   &
+     baud,nsubmode,ibwa,ibwb,codewords,ncw,xdt,f0,snr1,s3)
 
-! Accumulate and decode averaged Q65 data
+! Accumulate Q65 spectra s3(LL,63) and associated parameters for
+! message averaging.
 
   use q65
-!  class(q65_decoder), intent(inout) :: this
+  use packjt77
+  parameter (PLOG_MIN=-240.0)            !List decoding threshold
   character*37 avemsg
   character*1 csync,cused(MAXAVE)
   character*6 cutc
-  real s3(-64:LL-65,63)
+  character*77 c77
+  real s3(-64:LL-65,63)                  !Symbol spectra
+  real s3prob(0:63,63)                   !Symbol-value probabilities
   integer iused(MAXAVE)
-  logical first,lclearave
+  integer dat4(13)
+  integer codewords(63,206)
+  logical first,lclearave,unpk77_success
   data first/.true./
   save
 
   if(first .or. LL.ne.LL0 .or.lclearave) then
      iutc=-1
      iseq=-1
-     fsave=0.0
+     f0save=0.0
      dtdiff=0.2
      nsave=0
      LL0=LL
@@ -25,10 +32,24 @@ subroutine q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,xdt,f0,snr1,s
      if(allocated(s3avg)) deallocate(s3avg)
      allocate(s3save(-64:LL-65,63,MAXAVE))
      allocate(s3avg(-64:LL-65,63))
+     s3save=0.
+     s3avg=0.
+  endif
+
+  if(ntrperiod.eq.15) then
+     dtdiff=0.038
+  else if(ntrperiod.eq.30) then
+     dtdiff=0.08
+  else if(ntrperiod.eq.60) then
+     dtdiff=0.16
+  else if(ntrperiod.eq.120) then
+     dtdiff=0.4
+  else if(ntrperiod.eq.300) then
+     dtdiff=0.9
   endif
 
   do i=1,MAXAVE       !Don't save info more than once for same UTC and freq
-     if(nutc.eq.iutc(i) .and. abs(nfreq-fsave(i)).le.ntol) go to 10
+     if(nutc.eq.iutc(i) .and. abs(nfreq-f0save(i)).le.ntol) go to 10
   enddo
 
 ! Save data for message averaging
@@ -38,36 +59,45 @@ subroutine q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,xdt,f0,snr1,s
   write(cutc,'(i6.6)') n
   read(cutc,'(3i2)') ih,im,is
   nsec=3600*ih + 60*im + is
-  iseq(nsave)=mod(nsec/ntrperiod,2)
+  iseq(nsave)=mod(nsec/ntrperiod,2)         !T/R sequence: 0 (even) or 1 (odd)
-  iutc(nsave)=nutc
+  iutc(nsave)=nutc                          !UTC, hhmm or hhmmss
-  snr1save(nsave)=snr1
+  snr1save(nsave)=snr1                      !SNR from sync
-  xdtsave(nsave)=xdt
+  xdtsave(nsave)=xdt                        !DT
-  fsave(nsave)=f0
+  f0save(nsave)=f0                           !f0
-  s3save(:,:,nsave)=s3(:,:)
+  s3save(:,:,nsave)=s3(:,:)                 !Symbol spectra
-!  write(*,3001) nutc,iseq(nsave),nsave,ntrperiod,LL,nfqso,ntol,xdt,f0,snr1
-!3001 format(i6,i2,5i5,3f7.1)
 
-10 snr1sum=0.
+10 continue
+
+!10 if(nsave.lt.2) go to 900
+
+  snr1sum=0.
   xdtsum=0.
   fsum=0.
   nsum=0
+  s3avg=0.
 
+! Find previously saved spectra that should be averaged with this one
   do i=1,MAXAVE
-     cused(i)='.'
+     cused(i)='.'                                   !Flag for "not used"
      if(iutc(i).lt.0) cycle
-     if(mod(iutc(i),2).ne.mod(nutc,2)) cycle  !Use only same sequence
+     if(iseq(i).ne.iseq(nsave)) cycle               !Sequence must match
-     if(abs(dtxx-xdtsave(i)).gt.dtdiff) cycle  !DT must match
+!     write(*,3000) i,iseq(i),nutc,iutc(i),xdt-xdtsave(i),f0-f0save(i)
-     if(abs(nfreq-fsave(i)).gt.ntol) cycle   !Freq must match
+!3000 format(2i2,2i5,2f7.2)
-!     sym(1:207,1:7)=sym(1:207,1:7) +  ppsave(1:207,1:7,i)
+     if(abs(xdt-xdtsave(i)).gt.dtdiff) cycle        !DT must be close
+     if(abs(f0-f0save(i)).gt.float(ntol)) cycle   !Freq must match
+!     write(*,3001) 'a',i,nsave,iseq(i),snr1,xdt,f0
+!3001 format(a1,3i4,3f8.2)
+     cused(i)='$'                                   !Flag for "use this one"
+     s3avg=s3avg + s3save(:,:,i)                    !Add this spectrum
      snr1sum=snr1sum + snr1save(i)
      xdtsum=xdtsum + xdtsave(i)
-     fsum=fsum + fsave(i)
+     fsum=fsum + f0save(i)
-     cused(i)='$'
      nsum=nsum+1
      iused(nsum)=i
   enddo
   if(nsum.lt.MAXAVE) iused(nsum+1)=0
 
+! Find averages of snr1, xdt, and f0 used in this decoding attempt.
   snr1ave=0.
   xdtave=0.
   fave=0.
@@ -77,18 +107,18 @@ subroutine q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,xdt,f0,snr1,s
      fave=fsum/nsum
   endif
 
+! Write parameters for display to User in the Message Averaging window.
   do i=1,nsave
-     csync=' '
-!     if(nflipsave(i).gt.0.0) csync='*'
      if(ntrperiod.le.30) write(14,1000) cused(i),iutc(i),snr1save(i),    &
-          xdtsave(i),fsave(i),csync
+          xdtsave(i),f0save(i)
-1000 format(a1,i7.6,f6.1,f6.2,f7.1,1x,a1)
+1000 format(a1,i7.6,f6.1,f6.2,f7.1)
      if(ntrperiod.ge.60) write(14,1001) cused(i),iutc(i),snr1save(i),    &
-          xdtsave(i),fsave(i),csync
+          xdtsave(i),f0save(i)
-1001 format(a1,i5.4,f6.1,f6.2,f7.1,1x,a1)
+1001 format(a1,i5.4,f6.1,f6.2,f7.1)
   enddo
-  if(nsum.lt.2) go to 900
+!  if(nsum.lt.2) go to 900                  !Must have at least 2
 
+! Find rms scatter of DT and f0 values
   sqt=0.
   sqf=0.
   do j=1,MAXAVE
@@ -96,7 +126,7 @@ subroutine q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,xdt,f0,snr1,s
      if(i.eq.0) exit
      csync='*'
      sqt=sqt + (xdtsave(i)-dtave)**2
-     sqf=sqf + (fsave(i)-fave)**2
+     sqf=sqf + (f0save(i)-fave)**2
   enddo
   rmst=0.
   rmsf=0.
@@ -105,5 +135,27 @@ subroutine q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,xdt,f0,snr1,s
      rmsf=sqrt(sqf/(nsum-1))
   endif
 
+  s3avg=s3avg/nsum
+  nFadingModel=1
+  do ibw=ibwa,ibwb
+     b90=1.72**ibw
+     call q65_intrinsics_ff(s3avg,nsubmode,b90/baud,nFadingModel,s3prob)
+     call q65_dec_fullaplist(s3avg,s3prob,codewords,ncw,esnodb,dat4,plog,irc)
+     if(irc.ge.0 .and. plog.ge.PLOG_MIN) then
+        snr2=esnodb - db(2500.0/baud) + 3.0     !Empirical adjustment
+        id1=1
+        write(c77,3050) dat4(1:12),dat4(13)/2
+3050    format(12b6.6,b5.5)
+        call unpack77(c77,0,avemsg,unpk77_success) !Unpack to get msgsent
+        open(55,file='fort.55',status='unknown',position='append')
+        write(55,3055) nutc,ibw,xdt,f0,85.0*base,ccfmax,snr2,plog,   &
+             irc,trim(avemsg)
+3055    format(i6,i3,6f8.2,i5,2x,a)
+        close(55)
+        print*,'F ',avemsg
+        exit
+     endif
+  enddo
+
 900 return
 end subroutine q65_avg

lib/q65_sync.f90

@@ -195,6 +195,14 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps,nfqso,ntol,
      b90=1.72**ibw
      call q65_intrinsics_ff(s3,nsubmode,b90/baud,nFadingModel,s3prob)
      call q65_dec_fullaplist(s3,s3prob,codewords,ncw,esnodb,dat4,plog,irc)
+!###
+     write(*,3001) 'A',ibw,irc,xdt,f0,plog,sum(s3)
+3001 format(a1,2i3,f7.2,3f8.1)
+     if(irc.gt.0) then
+        s3avg=s3
+        go to 100
+     endif
+!###
      if(irc.ge.0 .and. plog.ge.PLOG_MIN) then
         snr2=esnodb - db(2500.0/baud) + 3.0     !Empirical adjustment
         id1=1
@@ -260,7 +268,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps,nfqso,ntol,
 ! Compute s3() here, then call q65_avg().
   i1=i0+ipk-64
   i2=i1+LL-1
-  if(i1.ge.1 .and. i2.le.iz) then
+  if(snr1.ge.2.8 .and. i1.ge.1 .and. i2.le.iz) then
      j=j0+jpk-7
      n=0
      do k=1,85
@@ -271,8 +279,11 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps,nfqso,ntol,
         n=n+1
         if(j.ge.1 .and. j.le.jz) s3(-64:LL-65,n)=s1(i1:i2,j)
      enddo
-     call q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,xdt,   &
+!     s3=s3avg
-          f0,snr1,s3)
+     write(*,3002) 'B',xdt,f0,sum(s3)
+3002 format(a1,f7.2,2f8.1)
+     call q65_avg(nutc,ntrperiod,mode_q65,LL,nfqso,ntol,lclearave,     &
+          baud,nsubmode,ibwa,ibwb,codewords,ncw,xdt,f0,snr1,s3)
   endif
 
 200 smax=maxval(ccf1)
@@ -290,21 +301,21 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps,nfqso,ntol,
   enddo
   close(17)
   width=df*(i2-i1)
-  if(id1.ge.1) then
+!  if(id1.ge.1) then
-     navg=0
+!     navg=0
-     s3avg=0.
+!     s3avg=0.
-     if(lavg) go to 900
+!     if(lavg) go to 900
-  elseif(iand(ndepth,16).eq.16) then
+!  elseif(iand(ndepth,16).eq.16) then
-     s3avg=s3avg+s3
+!     s3avg=s3avg+s3
-     navg=navg+1
+!     navg=navg+1
-     write(71,3071) nutc,navg,xdt,f0,snr1
+!     write(71,3071) nutc,navg,xdt,f0,snr1
-3071 format(2i5,3f10.2)
+!3071 format(2i5,3f10.2)
-     if(navg.ge.2) then
+!     if(navg.ge.2) then
-        s3=s3avg/navg
+!        s3=s3avg/navg
-        lavg=.true.
+!        lavg=.true.
-        go to 10
+!        go to 10
-     endif
+!     endif
-  endif
+!  endif
 
 900 return
 end subroutine q65_sync