From cbb939453f09db5167d67d394fd467ca744ba689 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 14 Jan 2021 15:19:33 -0500 Subject: [PATCH] Code cleanup. --- lib/q65_decode.f90 | 10 ++++++++-- lib/qra/q65/q65.f90 | 6 +++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90 index 0447eaa62..189984c1e 100644 --- a/lib/q65_decode.f90 +++ b/lib/q65_decode.f90 @@ -166,11 +166,17 @@ contains enddo if(iand(ndepth,16).eq.16) then -! There was no single-transmission decode. Try for an average decode. +! There was no single-transmission decode. Try for an average 'q3n' decode. call timer('list_avg',0) call q65_q3a(xdt,f0,nfqso,nsps,snr2,dat4,idec,decoded) call timer('list_avg',1) - nused=navg + if(idec.ge.0) then + nused=navg + go to 100 + endif + +! There was no 'q3n' decode. Try for a 'q[012]n' decode. +! call q65_q012a() endif 100 decoded=' ' diff --git a/lib/qra/q65/q65.f90 b/lib/qra/q65/q65.f90 index bfd596d4d..ee8a71292 100644 --- a/lib/qra/q65/q65.f90 +++ b/lib/qra/q65/q65.f90 @@ -60,7 +60,7 @@ subroutine q65_dec0(nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, & if(nutc+ndepth.eq.-999) stop !Silence compiler warnings -! Set seom parameters and allocate storage for large arrays +! Set some parameters and allocate storage for large arrays irc=-2 idec=-1 snr1=0. @@ -104,10 +104,10 @@ subroutine q65_dec0(nutc,iwave,ntrperiod,nfqso,ntol,ndepth,lclearave, & if(nsps.ge.7200) j0=1.0/dtstep !Nominal start-signal index s3=0. - call timer('s1 ',0) + call timer('q65_syms',0) ! Compute symbol spectra with NSTEP time bins per symbol call q65_symspec(iwave,ntrperiod*12000,iz,jz,s1) - call timer('s1 ',1) + call timer('q65_syms',1) i0=nint(nfqso/df) !Target QSO frequency if(i0-64.lt.1 .or. i0-65+LL.gt.iz) go to 900 !Frequency out of range