diff --git a/map65/libm65/map65a.f90 b/map65/libm65/map65a.f90 index efa1da34b..c59d4daa7 100644 --- a/map65/libm65/map65a.f90 +++ b/map65/libm65/map65a.f90 @@ -47,7 +47,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & xpol=(nxpol.ne.0) nts_jt65=2**(mode65-1) !JT65 tone separation factor - nts_q65=2**(mode_q65) !Q65 tone separation factor + nts_q65=2**(mode_q65-1) !Q65 tone separation factor if(nagain.eq.0) then call timer('get_cand',0) call get_candidates(ss,savg,xpol,mfa,mfb,nts_jt65,nts_q65,cand,ncand) @@ -57,9 +57,9 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, & !### ! do k=1,ncand ! freq=cand(k)%f+nkhz_center-48.0-1.27046 -! write(70,3010) nutc,k,cand(k)%snr,cand(k)%f,freq,cand(k)%xdt, & +! write(*,3010) nutc,k,db(cand(k)%snr),cand(k)%f,freq,cand(k)%xdt, & ! cand(k)%ipol,cand(k)%iflip -!3010 format(i4.4,i5,f10.1,3f10.3,2i3) +!3010 format('=a',i5.4,i5,f8.2,3f10.3,2i3) ! enddo !### diff --git a/map65/libm65/wideband_sync.f90 b/map65/libm65/wideband_sync.f90 index ee582549d..d60444bbe 100644 --- a/map65/libm65/wideband_sync.f90 +++ b/map65/libm65/wideband_sync.f90 @@ -32,7 +32,7 @@ subroutine get_candidates(ss,savg,xpol,nfa,nfb,nts_jt65,nts_q65,cand,ncand) ! spacings: 1 2 4 8 16 for A B C D E. Birdies are detected and ! excised. Candidates are returned in the structure array cand(). - parameter (MAX_PEAKS=300) + parameter (MAX_PEAKS=100) real ss(4,322,NFFT),savg(4,NFFT) real pavg(-20:20) integer indx(NFFT) @@ -87,11 +87,11 @@ subroutine get_candidates(ss,savg,xpol,nfa,nfb,nts_jt65,nts_q65,cand,ncand) diffhz=1000.0*(f0-cand(m)%f) bw=nts_q65*110.0 if(cand(m)%iflip.ne.0) bw=nts_jt65*178.0 - if(diffhz.gt.-20.0 .and. diffhz.lt.bw+20.0) skip=.true. -! write(*,3301) i,k,m,f0,cand(m)%f,diffhz,snr1,skip -!3301 format('=',3i5,f10.1,3f10.3,L3) + if(diffhz.gt.-0.03*bw .and. diffhz.lt.1.03*bw) skip=.true. enddo if(skip) cycle +! write(*,3301) i,k,m,f0,diffhz,bw,db(snr1) +!3301 format('=A',3i5,f8.3,2f8.0,f8.2) k=k+1 cand(k)%snr=snr1 cand(k)%f=f0