From f833825d1643f24cf4e574a525ee384415fe36d9 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 8 Dec 2016 20:47:13 +0000 Subject: [PATCH] Correct a constant in badmsg; correct nfreq when sync fails. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7372 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- lib/badmsg.f90 | 2 +- lib/qra64a.f90 | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/badmsg.f90 b/lib/badmsg.f90 index 578270dce..1ebc12510 100644 --- a/lib/badmsg.f90 +++ b/lib/badmsg.f90 @@ -20,7 +20,7 @@ subroutine badmsg(irc,dat,nc1,nc2,ng2) ig=ishft(iand(dat(10),15),12) + ishft(dat(11),6) + dat(12) ! Test for blank, -01 to -30, R-01 to R-30, RO, RRR, 73 - if(ig.ge.32401 .and. ig.le.32461) return + if(ig.ge.32401 .and. ig.le.32464) return if(ig.ge.14220 .and. ig.le.14229) return !-41 to -50 if(ig.ge.14040 .and. ig.le.14049) return !-31 to -40 diff --git a/lib/qra64a.f90 b/lib/qra64a.f90 index c654c26a8..442f92d2f 100644 --- a/lib/qra64a.f90 +++ b/lib/qra64a.f90 @@ -62,10 +62,10 @@ subroutine qra64a(dd,npts,nutc,nf1,nf2,nfqso,ntol,mode64,minsync,ndepth, & call timer('sync64 ',0) call sync64(dd,npts,nf1,nf2,nfqso,ntol,mode64,maxf1,dtx,f0,jpk0,kpk,sync,c00) call timer('sync64 ',1) + nfreq=nint(f0) if((sync-3.4).lt.float(minsync)) go to 900 a=0. a(1)=-f0 - nfreq=nint(f0) npts2=npts/2 call twkfreq(c00,c0,npts2,6000.0,a) @@ -96,7 +96,6 @@ subroutine qra64a(dd,npts,nutc,nf1,nf2,nfqso,ntol,mode64,minsync,ndepth, & call qra64_dec(s3,nc1,nc2,ng2,naptype,0,nSubmode,b90, & nFadingModel,dat4,snr2,irc) call timer('qra64_de',1) -! if(abs(snr2).gt.30.) snr2=-30.0 if(irc.eq.0) go to 10 if(irc.gt.0) call badmsg(irc,dat4,nc1,nc2,ng2) iirc=max(0,min(irc,11))