From 0765a1cc06a93e6e3d22c95d9da34c4134bfc957 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Tue, 23 Feb 2021 11:32:38 -0500
Subject: [PATCH] Working on tweaks to the Fast/Normal/Deep decoding options.

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

diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index f2fa08233..6b4ce922a 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -241,13 +241,13 @@ contains
           if(c6.eq.'      ') c6='<b>   '
           c4=hisgrid(1:4)
           if(c4.eq.'    ') c4='<b> '
-          fmt='(i6.4,1x,a4,5i2,4i3,f6.2,f7.1,f7.2,f6.1,f6.2,'//   &
+          fmt='(i6.4,1x,a4,5i2,5i3,f6.2,f7.1,f7.2,f6.1,f6.2,'//   &
                '1x,a6,1x,a6,1x,a4,1x,a)'
           if(ntrperiod.le.30) fmt(5:5)='6'
           if(idec.eq.3) nrc=0
-          write(22,fmt) nutc,cmode,nQSOprogress,idec,idf,idt,ibw,nused,    &
-               icand,ncand,nrc,xdt,f0,db(snr1),snr2,tdecode,mycall(1:6),   &
-               c6,c4,trim(decoded)
+          write(22,fmt) nutc,cmode,nQSOprogress,idec,ndist,idf,idt,ibw,    &
+               nused,icand,ncand,nrc,xdt,f0,db(snr1),snr2,tdecode,         &
+               mycall(1:6),c6,c4,trim(decoded)
           close(22)
        endif
 !    else
@@ -323,13 +323,14 @@ contains
              if(c6.eq.'      ') c6='<b>   '
              c4=hisgrid(1:4)
              if(c4.eq.'    ') c4='<b> '
-             fmt='(i6.4,1x,a4,5i2,4i3,f6.2,f7.1,f7.2,f6.1,f6.2,'//   &
+             fmt='(i6.4,1x,a4,5i2,5i3,f6.2,f7.1,f7.2,f6.1,f6.2,'//   &
                   '1x,a6,1x,a6,1x,a4,1x,a)'
+
              if(ntrperiod.le.30) fmt(5:5)='6'
              if(idec.eq.3) nrc=0
-             write(22,fmt) nutc,cmode,nQSOprogress,idec,idf,idt,ibw,nused,    &
-                  icand,ncand,nrc,xdt,f0,db(snr1),snr2,tdecode,mycall(1:6),   &
-                  c6,c4,trim(decoded)
+             write(22,fmt) nutc,cmode,nQSOprogress,idec,ndist,idf,idt,ibw,    &
+                  nused,icand,ncand,nrc,xdt,f0,db(snr1),snr2,tdecode,         &
+                  mycall(1:6),c6,c4,trim(decoded)
              close(22)
           endif
        endif
diff --git a/lib/qra/q65/q65.f90 b/lib/qra/q65/q65.f90
index b020ed55d..51830ec8f 100644
--- a/lib/qra/q65/q65.f90
+++ b/lib/qra/q65/q65.f90
@@ -11,7 +11,7 @@ module q65
                                      38,46,50,55,60,62,66,69,74,76,85/)
   integer codewords(63,206)
   integer ibwa,ibwb,ncw,nsps,mode_q65,nfa,nfb
-  integer idf,idt,ibw
+  integer idf,idt,ibw,ndist
   integer istep,nsmo,lag1,lag2,npasses,nused,iseq,ncand,nrc
   integer i0,j0
   integer navg(0:1)
diff --git a/lib/qra/q65/q65_loops.f90 b/lib/qra/q65/q65_loops.f90
index 6d9e24122..1028a8e44 100644
--- a/lib/qra/q65/q65_loops.f90
+++ b/lib/qra/q65/q65_loops.f90
@@ -26,13 +26,13 @@ subroutine q65_loops(c00,npts2,nsps2,nsubmode,ndepth,jpk0,    &
   idfmax=3
   idtmax=3
   ibw0=(ibwa+ibwb)/2
-  maxdist=5
+  maxdist=2
   if(iand(ndepth,3).ge.2) then
      idfmax=5
      idtmax=5
-     maxdist=10
+     maxdist=3
   endif
-  if(iand(ndepth,3).eq.3) maxdist=15
+  if(iand(ndepth,3).eq.3) maxdist=4
 
   LL=64*(mode_q65+2)
   napmin=99
@@ -58,7 +58,7 @@ subroutine q65_loops(c00,npts2,nsps2,nsubmode,ndepth,jpk0,    &
         where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim
         call q65_bzap(s3,LL)                   !Zap birdies
         do ibw=ibwa,ibwb
-           ndist=ndf**2 + ndt**2 + (ibw-ibw0)**2
+           ndist=sqrt(float(ndf**2 + ndt**2 + (ibw-ibw0)**2))
            if(ndist.gt.maxdist) cycle
            b90=1.72**ibw
            if(b90.gt.345.0) cycle