From c9b2a3d2cd246c1a7453ef694c12b70be1952816 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Fri, 30 Apr 2021 08:31:45 -0400
Subject: [PATCH] If no 'hiscall', don't try for a q3 decode.

---
 lib/q65_decode.f90    | 6 +++---
 lib/qra/q65/q65.f90   | 6 ------
 map65/libm65/q65b.f90 | 3 ---
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index b1469c896..d0c8904ba 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -132,7 +132,9 @@ contains
        ibwb=min(10,ibwb+1)
        maxiters=100
     endif
-! Generate codewords for full-AP list decoding    
+! Generate codewords for full-AP list decoding
+    if(ichar(hiscall(1:1)).eq.0) hiscall=' '
+    if(ichar(hisgrid(1:1)).eq.0) hisgrid=' '
     call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) 
     dgen=0
     call q65_enc(dgen,codewords)         !Initialize the Q65 codec
@@ -143,7 +145,6 @@ contains
 ! Call top-level routine in q65 module: establish sync and try for a q3 decode.
     call q65_dec0(iavg,nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave,  &
          emedelay,xdt,f0,snr1,width,dat4,snr2,idec)
-!    idec=-1   !### TEMPORARY ###
     call timer('q65_dec0',1)
 
     if(idec.ge.0) then
@@ -299,7 +300,6 @@ contains
           call timer('q65loops',0)
           call q65_loops(c00,npts/2,nsps/2,nsubmode,ndepth,jpk0,   &
                xdt,f0,iaptype,xdt1,f1,snr2,dat4,idec)
-!       idec=-1   !### TEMPORARY ###
           call timer('q65loops',1)
           if(idec.ge.0) then
              dtdec=xdt1
diff --git a/lib/qra/q65/q65.f90 b/lib/qra/q65/q65.f90
index c3ddf682a..91c07510a 100644
--- a/lib/qra/q65/q65.f90
+++ b/lib/qra/q65/q65.f90
@@ -693,12 +693,6 @@ subroutine q65_snr(dat4,dtdec,f0dec,mode_q65,nused,snr2)
   if(nused.eq.3) snr2=snr2 - 2.9
   if(nused.ge.4) snr2=snr2 - 3.5
 
-!  do i=ia,ib
-!     write(71,3071) i*df,spec(i),db(spec(i))
-!3071 format(3f10.3)
-!  enddo
-!  flush(71)
-
   return
 end subroutine q65_snr
 
diff --git a/map65/libm65/q65b.f90 b/map65/libm65/q65b.f90
index 0aa4b39f5..387d0353d 100644
--- a/map65/libm65/q65b.f90
+++ b/map65/libm65/q65b.f90
@@ -27,9 +27,6 @@ subroutine q65b(nutc,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol,  &
   read(9,'(a)') wsjtx_dir
   close(9)
 
-  mycall='K1JT'
-  hiscall='IV3NWV'
-  grid4='AA00'
   if(mycall0(1:1).ne.' ') mycall=mycall0
   if(hiscall0(1:1).ne.' ') hiscall=hiscall0
   if(hisgrid(1:4).ne.'    ') grid4=hisgrid(1:4)