w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove obsolete references to nqd.eq.2.

Browse Source
This commit is contained in:
Joe Taylor 2021-05-14 19:41:44 -04:00
parent 51dd025a8b
commit 857fe04e00
1 changed files with 46 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
map65/libm65/map65a.f90
View File

@ -86,10 +86,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
nutc0=nutc nutc0=nutc
do nqd=1,0,-1 do nqd=1,0,-1
if(nqd.eq.2) then if(nqd.eq.1) then !Quick decode, at fQSO
fa=1000.0*fqso
fb=1000.0*fqso
else if(nqd.eq.1) then !Quick decode, at fQSO
fa=1000.0*(fqso+0.001*mousedf) - ntol fa=1000.0*(fqso+0.001*mousedf) - ntol
fb=1000.0*(fqso+0.001*mousedf) + ntol + 4*53.8330078 fb=1000.0*(fqso+0.001*mousedf) + ntol + 4*53.8330078
else !Wideband decode at all freqs else !Wideband decode at all freqs
@ -143,71 +140,69 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
enddo enddo
if(smax.gt.1.1 .or. ia.eq.ib) then if(smax.gt.1.1 .or. ia.eq.ib) then
if(nqd.lt.2) then
! Look for JT65 sync patterns and shorthand square-wave patterns. ! Look for JT65 sync patterns and shorthand square-wave patterns.
call timer('ccf65 ',0) call timer('ccf65 ',0)
! ssmax=smax ! ssmax=smax
ssmax=1.e30 ssmax=1.e30
call ccf65(ss(1,1,i),nhsym,ssmax,sync1,ipol,jpz,dt, & call ccf65(ss(1,1,i),nhsym,ssmax,sync1,ipol,jpz,dt, &
flipk,syncshort,snr2,ipol2,dt2) flipk,syncshort,snr2,ipol2,dt2)
call timer('ccf65 ',1) call timer('ccf65 ',1)
! ########################### Search for Shorthand Messages ################# ! ########################### Search for Shorthand Messages #################
! Is there a shorthand tone above threshold? ! Is there a shorthand tone above threshold?
thresh0=1.0 thresh0=1.0
! Use lower thresh0 at fQSO ! Use lower thresh0 at fQSO
if(nqd.eq.1 .and. ntol.le.100) thresh0=0. if(nqd.eq.1 .and. ntol.le.100) thresh0=0.
if(syncshort.gt.thresh0) then if(syncshort.gt.thresh0) then
! ### Do shorthand AFC here (or maybe after finding a pair?) ### ! ### Do shorthand AFC here (or maybe after finding a pair?) ###
short(1,i)=syncshort short(1,i)=syncshort
short(2,i)=dt2 short(2,i)=dt2
short(3,i)=ipol2 short(3,i)=ipol2
! Check to see if lower tone of shorthand pair was found. ! Check to see if lower tone of shorthand pair was found.
do j=2,4 do j=2,4
i0=i-nint(j*mode65*10.0*(11025.0/4096.0)/df) i0=i-nint(j*mode65*10.0*(11025.0/4096.0)/df)
! Should this be i0 +/- 1, or just i0? ! Should this be i0 +/- 1, or just i0?
! Should we also insist that difference in DT be either 1.5 or -1.5 s? ! Should we also insist that difference in DT be either 1.5 or -1.5 s?
if(short(1,i0).gt.thresh0) then if(short(1,i0).gt.thresh0) then
fshort=0.001*(i0-16385)*df fshort=0.001*(i0-16385)*df
noffset=0 noffset=0
if(nqd.eq.1) noffset=nint(1000.0*(fshort-fqso)-mousedf) if(nqd.eq.1) noffset=nint(1000.0*(fshort-fqso)-mousedf)
if(abs(noffset).le.ntol) then if(abs(noffset).le.ntol) then
! Keep only the best candidate within ftol. ! Keep only the best candidate within ftol.
!### NB: sync2 was not defined here! !### NB: sync2 was not defined here!
! sync2=syncshort !### try this ??? ! sync2=syncshort !### try this ???
if(fshort-fshort0.le.ftol .and. & if(fshort-fshort0.le.ftol .and. &
syncshort.gt.syncshort0 .and. nkm.eq.2) km=km-1 syncshort.gt.syncshort0 .and. nkm.eq.2) km=km-1
if(fshort-fshort0.gt.ftol .or. & if(fshort-fshort0.gt.ftol .or. &
syncshort.gt.syncshort0) then syncshort.gt.syncshort0) then
if(km.lt.MAXMSG) km=km+1 if(km.lt.MAXMSG) km=km+1
sig(km,1)=nfile sig(km,1)=nfile
sig(km,2)=nutc sig(km,2)=nutc
sig(km,3)=fshort + 0.5*(nfa+nfb) sig(km,3)=fshort + 0.5*(nfa+nfb)
sig(km,4)=syncshort sig(km,4)=syncshort
sig(km,5)=dt2 sig(km,5)=dt2
sig(km,6)=45*(ipol2-1)/57.2957795 sig(km,6)=45*(ipol2-1)/57.2957795
sig(km,7)=0 sig(km,7)=0
sig(km,8)=snr2 sig(km,8)=snr2
sig(km,9)=0 sig(km,9)=0
sig(km,10)=0 sig(km,10)=0
! sig(km,11)=rms0 ! sig(km,11)=rms0
sig(km,12)=savg(ipol2,i) sig(km,12)=savg(ipol2,i)
sig(km,13)=0 sig(km,13)=0
sig(km,14)=0 sig(km,14)=0
sig(km,15)=0 sig(km,15)=0
sig(km,16)=0 sig(km,16)=0
! sig(km,17)=0 ! sig(km,17)=0
sig(km,18)=0 sig(km,18)=0
msg(km)=shmsg0(j) msg(km)=shmsg0(j)
fshort0=fshort fshort0=fshort
syncshort0=syncshort syncshort0=syncshort
nkm=2 nkm=2
endif
endif endif
endif endif
enddo endif
endif enddo
endif endif
! ########################### Search for Normal Messages ########### ! ########################### Search for Normal Messages ###########