From 2a2f9eb76d2abc2b16dc603054f3a2576246c83e Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 13 May 2021 10:40:24 -0400 Subject: [PATCH] More work toward wideband decoding. --- map65/libm65/map65a.f90 | 17 +++++++++++------ map65/libm65/wideband2_sync.f90 | 9 ++++++--- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/map65/libm65/map65a.f90 b/map65/libm65/map65a.f90 index ed079bf5e..c03323ad9 100644 --- a/map65/libm65/map65a.f90 +++ b/map65/libm65/map65a.f90 @@ -41,14 +41,19 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & mfb=nfb-nkhz_center+48 nts_jt65=2 nts_q65=1 - call timer('get_cand',0) - call get_candidates(ss,savg,mfa,mfb,nts_jt65,nts_q65,cand,ncand) - call timer('get_cand',1) -!### + ncand=0 + if(nagain.eq.0) then + call timer('get_cand',0) + call get_candidates(ss,savg,mfa,mfb,nts_jt65,nts_q65,cand,ncand) + call timer('get_cand',1) + endif + !### +! print*,'=',nagain ! do k=1,ncand -! write(*,3010) k,cand(k)%snr,cand(k)%f,cand(k)%f+77,cand(k)%xdt, & +! freq=cand(k)%f+77.0-1.27046 +! write(*,3010) nutc,k,cand(k)%snr,cand(k)%f,freq,cand(k)%xdt, & ! cand(k)%ipol,cand(k)%iflip -!3010 format(i3,4f10.3,2i3) +!3010 format('= ',i4.4,i5,f10.1,3f10.3,2i3) ! enddo ! print*,'AAA',nfa,nfb,ncand diff --git a/map65/libm65/wideband2_sync.f90 b/map65/libm65/wideband2_sync.f90 index b1593587f..f5f79debb 100644 --- a/map65/libm65/wideband2_sync.f90 +++ b/map65/libm65/wideband2_sync.f90 @@ -56,7 +56,8 @@ call wb2_sync(ss,savg,jz,nfa,nfb) n=indx(iz+1-i) + ia - 1 f0=0.001*(n-1)*df3 snr1=sync(n)%ccfmax - if(snr1.lt.5.0) exit +! print*,'=',f0,snr1 + if(snr1.lt.4.5) exit flip=sync(n)%iflip if(flip.ne.0.0 .and. nts_jt65.eq.0) cycle if(flip.eq.0.0 .and. nts_q65.eq.0) cycle @@ -83,8 +84,10 @@ call wb2_sync(ss,savg,jz,nfa,nfb) do m=1,k !Skip false syncs within signal bw diffhz=1000.0*(f0-cand(m)%f) bw=nts_q65*108.0 - if(cand(m)%iflip.ne.0) bw=nts_jt65*177.0 - if(diffhz.gt.-10.0 .and. diffhz.lt.bw) skip=.true. + if(cand(m)%iflip.ne.0) bw=nts_jt65*178.0 + if(diffhz.gt.-20.0 .and. diffhz.lt.bw) skip=.true. +! write(*,3301) i,k,m,f0,cand(m)%f,diffhz,snr1,skip +!3301 format('=',3i5,f10.1,3f10.3,L3) enddo if(skip) cycle k=k+1