From 4d739a31ca9f4b8a5075ede6458f5a1bc754c4b4 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Tue, 27 Oct 2020 13:22:02 -0400
Subject: [PATCH] Minor cleanup of Q65 decoder sequence.  Much more needed!

---
 lib/q65_decode.f90        | 16 ++--------------
 lib/qra/q65/q65_loops.f90 |  4 +---
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index 3daf8c4c3..062952c84 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -53,8 +53,7 @@ contains
     character*77 c77
     integer*2 iwave(NMAX)                 !Raw data
     real, allocatable :: dd(:)            !Raw data
-    integer dat4(12)                      !Decoded message as 12 6-bit integers
-    integer dat4a(13)
+    integer dat4(13)                      !Decoded message as 12 6-bit integers
     logical ltext
     logical unpk77_success
     complex, allocatable :: c00(:)        !Analytic signal, 6000 Sa/s
@@ -138,20 +137,9 @@ contains
     endif
     decoded='                                     '
     if(irc.ge.0) then
-       dat4a(1:12)=dat4
-       dat4a(13)=9
-       write(74,3074) dat4a,1
-3074   format(13i3,i6)
-       write(c77,1000) dat4a
+       write(c77,1000) dat4
 1000   format(12b6.6,b5.5)
        call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent
-!       call unpackmsg(dat4,decoded)               !Unpack the user message
-!       call fmtmsg(decoded,iz)
-       if(index(decoded,"000AAA ").ge.1) then
-! Suppress a certain type of garbage decode.
-          decoded='                      '
-          irc=-1
-       endif
        nsnr=nint(snr2)
        call this%callback(nutc,sync,nsnr,xdt,f0,decoded,              &
             irc,qual,ntrperiod,fmid,w50)
diff --git a/lib/qra/q65/q65_loops.f90 b/lib/qra/q65/q65_loops.f90
index c0dbf59c1..d49af9632 100644
--- a/lib/qra/q65/q65_loops.f90
+++ b/lib/qra/q65/q65_loops.f90
@@ -65,7 +65,7 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel,   &
               if(ndist.gt.maxdist) cycle
               b90=1.728**ibw
               if(b90.gt.230.0) cycle
-              if(b90.lt.0.15*width) exit
+!              if(b90.lt.0.15*width) exit
               ncall=ncall+1
               call timer('qra64_de',0)
 !###
@@ -75,8 +75,6 @@ subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel,   &
               APsymbols=0
               call s3fix(s3,s3tmp)
               call q65_dec(s3tmp,APmask,APsymbols,s3prob,snr2,dat4,irc)
-              write(74,3074) dat4,0
-3074          format(13i3,i6)
 !###
               call timer('qra64_de',1)
               if(irc.eq.0) go to 200