mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-15 16:42:12 -05:00
Correct a flaw introduced with changing common/test00?/ to jt65_mod.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6520 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
80873a6040
commit
ffcfe97f34
@ -93,17 +93,6 @@ contains
|
|||||||
data nutc0/-999/,nfreq0/-999/,nsave/0/
|
data nutc0/-999/,nfreq0/-999/,nsave/0/
|
||||||
save
|
save
|
||||||
|
|
||||||
! ncandidates=param(0)
|
|
||||||
nhard_min=param(1)
|
|
||||||
! nsoft_min=param(2)
|
|
||||||
! nera_best=param(3)
|
|
||||||
nrtt1000=param(4)
|
|
||||||
ntotal_min=param(5)
|
|
||||||
! ntry=param(6)
|
|
||||||
! nq1000=param(7)
|
|
||||||
! npp1=param(8)
|
|
||||||
nsmo=param(9)
|
|
||||||
|
|
||||||
this%callback => callback
|
this%callback => callback
|
||||||
first_time=newdat
|
first_time=newdat
|
||||||
robust=nrobust
|
robust=nrobust
|
||||||
@ -180,6 +169,19 @@ contains
|
|||||||
naggressive,ndepth,mycall,hiscall,hisgrid,nexp_decode, &
|
naggressive,ndepth,mycall,hiscall,hisgrid,nexp_decode, &
|
||||||
sync2,a,dtx,nft,qual,nhist,nsmo,decoded)
|
sync2,a,dtx,nft,qual,nhist,nsmo,decoded)
|
||||||
call timer('decod65a',1)
|
call timer('decod65a',1)
|
||||||
|
|
||||||
|
! ncandidates=param(0)
|
||||||
|
nhard_min=param(1)
|
||||||
|
! nsoft_min=param(2)
|
||||||
|
! nera_best=param(3)
|
||||||
|
nrtt1000=param(4)
|
||||||
|
ntotal_min=param(5)
|
||||||
|
! ntry=param(6)
|
||||||
|
! nq1000=param(7)
|
||||||
|
! npp1=param(8)
|
||||||
|
|
||||||
|
nsmo=param(9)
|
||||||
|
|
||||||
nfreq=nint(freq+a(1))
|
nfreq=nint(freq+a(1))
|
||||||
ndrift=nint(2.0*a(2))
|
ndrift=nint(2.0*a(2))
|
||||||
s2db=10.0*log10(sync2) - 35 !### empirical ###
|
s2db=10.0*log10(sync2) - 35 !### empirical ###
|
||||||
@ -211,12 +213,11 @@ contains
|
|||||||
|
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
! if(nftt.eq.1) then
|
if(nftt.eq.1) then
|
||||||
! nft=1
|
nft=1
|
||||||
! decoded=avemsg
|
decoded=avemsg
|
||||||
! go to 5
|
go to 5
|
||||||
! endif
|
endif
|
||||||
|
|
||||||
n=naggressive
|
n=naggressive
|
||||||
rtt=0.001*nrtt1000
|
rtt=0.001*nrtt1000
|
||||||
if(nft.lt.2) then
|
if(nft.lt.2) then
|
||||||
@ -226,7 +227,7 @@ contains
|
|||||||
if(rtt.gt.r0(n)) cycle
|
if(rtt.gt.r0(n)) cycle
|
||||||
endif
|
endif
|
||||||
|
|
||||||
5 if(decoded.eq.decoded0 .and. abs(freq-freq0).lt. 3.0 .and. &
|
5 if(decoded.eq.decoded0 .and. abs(freq-freq0).lt. 3.0 .and. &
|
||||||
minsync.ge.0) cycle !Don't display dupes
|
minsync.ge.0) cycle !Don't display dupes
|
||||||
|
|
||||||
if(decoded.ne.' ' .or. minsync.lt.0) then
|
if(decoded.ne.' ' .or. minsync.lt.0) then
|
||||||
@ -243,6 +244,7 @@ contains
|
|||||||
exit
|
exit
|
||||||
endif
|
endif
|
||||||
enddo
|
enddo
|
||||||
|
|
||||||
if(ndupe.ne.1 .or. minsync.lt.0) then
|
if(ndupe.ne.1 .or. minsync.lt.0) then
|
||||||
if(ipass.eq.1) n65a=n65a + 1
|
if(ipass.eq.1) n65a=n65a + 1
|
||||||
if(ipass.eq.2) n65b=n65b + 1
|
if(ipass.eq.2) n65b=n65b + 1
|
||||||
|
Loading…
Reference in New Issue
Block a user