mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-12 23:26:15 -05:00
Don't call q65b if "No Q65" is selected.
This commit is contained in:
parent
6b5d85e9e2
commit
acbfc8840e
@ -352,19 +352,19 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
|
|||||||
endif
|
endif
|
||||||
enddo ! k=1,km
|
enddo ! k=1,km
|
||||||
|
|
||||||
do icand=1,ncand
|
if(mode_q65.ge.1) then
|
||||||
if(cand(icand)%iflip.ne.0) cycle
|
do icand=1,ncand
|
||||||
freq=cand(icand)%f+nkhz_center-48.0-1.27046
|
if(cand(icand)%iflip.ne.0) cycle
|
||||||
if(nqd.eq.1 .and. abs(freq-mousefqso).gt.0.001*ntol) cycle
|
freq=cand(icand)%f+nkhz_center-48.0-1.27046
|
||||||
ikhz=nint(freq)
|
if(nqd.eq.1 .and. abs(freq-mousefqso).gt.0.001*ntol) cycle
|
||||||
! write(*,3201) nqd,freq,mousefqso,mousedf,ntol,mycall,hiscall,hisgrid
|
ikhz=nint(freq)
|
||||||
!3201 format('=A',i3,f10.3,3i5,2a12,a6)
|
call timer('q65b ',0)
|
||||||
call timer('q65b ',0)
|
call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, &
|
||||||
call q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, &
|
mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65,idec)
|
||||||
mousedf,ntol,xpol,mycall,hiscall,hisgrid,mode_q65,idec)
|
call timer('q65b ',1)
|
||||||
call timer('q65b ',1)
|
if(idec.ge.0) candec(icand)=.true.
|
||||||
if(idec.ge.0) candec(icand)=.true.
|
enddo
|
||||||
enddo
|
endif
|
||||||
|
|
||||||
if(nwrite.eq.0 .and. nwrite_q65.eq.0) then
|
if(nwrite.eq.0 .and. nwrite_q65.eq.0) then
|
||||||
write(*,1012) mousefqso,nutc
|
write(*,1012) mousefqso,nutc
|
||||||
@ -385,7 +385,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
|
|||||||
endif
|
endif
|
||||||
if(nqd.eq.1 .and. nagain.eq.1) go to 900
|
if(nqd.eq.1 .and. nagain.eq.1) go to 900
|
||||||
|
|
||||||
if(nqd.eq.0) then
|
if(nqd.eq.0 .and. mode_q65.ge.1) then
|
||||||
do icand=1,ncand
|
do icand=1,ncand
|
||||||
if(cand(icand)%iflip.ne.0) cycle
|
if(cand(icand)%iflip.ne.0) cycle
|
||||||
if(candec(icand)) cycle
|
if(candec(icand)) cycle
|
||||||
|
Loading…
Reference in New Issue
Block a user