From 3662a76de7ca70db55240562da1eda5729ce5488 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 19 Nov 2020 15:41:15 -0500 Subject: [PATCH] More Q65 test program tweaks. --- lib/qra/q65/q65_ap.f90 | 2 +- lib/test_q65.f90 | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/qra/q65/q65_ap.f90 b/lib/qra/q65/q65_ap.f90 index c30314b1a..b335153c3 100644 --- a/lib/qra/q65/q65_ap.f90 +++ b/lib/qra/q65/q65_ap.f90 @@ -147,7 +147,7 @@ subroutine q65_ap(nQSOprogress,ipass,ncontest,lapcqonly,iaptype, & apmask=0 if(ncontest.le.5 .or. (ncontest.eq.7.and.iaptype.eq.6)) then apmask(1:78)=1 !MyCall, HisCall, RRR|73|RR73 - apmask(59:63)=0 !Reduce the rate of false decodes + apmask(59:66)=0 !Reduce the rate of false decodes apsymbols(1:58)=apsym0 if(iaptype.eq.4) apsymbols(59:77)=mrrr if(iaptype.eq.5) apsymbols(59:77)=m73 diff --git a/lib/test_q65.f90 b/lib/test_q65.f90 index 66caca99a..4aa452458 100644 --- a/lib/test_q65.f90 +++ b/lib/test_q65.f90 @@ -91,7 +91,7 @@ program test_q65 write(*,1010) (j,j=0,6) write(12,1010) (j,j=0,6) -1010 format(' SNR d Dop Sync DecN Dec1 Bad',i6,6i4,' tdec'/68('-')) +1010 format(' SNR Mode d Dop Sync DecN Dec1 Bad',i6,6i4,' tdec'/73('-')) dterr=tsym/4.0 nferr=max(1,nint(0.5*baud),nint(fdop/3.0)) @@ -138,11 +138,11 @@ program test_q65 10 close(10) xdt_avg=0. xdt_rms=0. - write(*,1100) snr1,ndepth,fDop,nsync,ndecn,ndec1,nfalse,naptype, & - tdec/nfiles - write(12,1100) snr1,ndepth,fDop,nsync,ndecn,ndec1,nfalse,naptype, & - tdec/nfiles -1100 format(f5.1,i3,f5.1,3i5,i4,i6,6i4,f6.2) + write(*,1100) snr1,ntrperiod,csubmode,ndepth,fDop,nsync,ndecn, & + ndec1,nfalse,naptype,tdec/nfiles + write(12,1100) snr1,ntrperiod,csubmode,ndepth,fDop,nsync,ndecn, & + ndec1,nfalse,naptype,tdec/nfiles +1100 format(f5.1,i4,a1,i3,f5.1,3i5,i4,i6,6i4,f6.2) if(ndec1.lt.nfiles/2 .and. ndec10.ge.nfiles/2) then snr_thresh=snr1 + float(nfiles/2 - ndec1)/(ndec10-ndec1) open(13,file='snr_thresh.out',status='unknown',position='append')