mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-05-29 21:02:26 -04:00
Improved calculation of reference level in deep65.F.
Incremented version to 5.9.5. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/trunk@199 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
cb77c96b21
commit
229fbd60fc
41
deep65.F
41
deep65.F
@ -3,6 +3,7 @@
|
|||||||
|
|
||||||
parameter (MAXCALLS=7000,MAXRPT=63)
|
parameter (MAXCALLS=7000,MAXRPT=63)
|
||||||
real s3(64,63)
|
real s3(64,63)
|
||||||
|
real pp(2*MAXCALLS + 2 + MAXRPT)
|
||||||
character callsign*12,grid*4,message*22,hisgrid*6,c*1,ceme*3
|
character callsign*12,grid*4,message*22,hisgrid*6,c*1,ceme*3
|
||||||
character*12 mycall,hiscall
|
character*12 mycall,hiscall
|
||||||
character*22 decoded,deepmsg
|
character*22 decoded,deepmsg
|
||||||
@ -72,7 +73,7 @@
|
|||||||
callgrid(icall)=callsign(1:j2)
|
callgrid(icall)=callsign(1:j2)
|
||||||
|
|
||||||
mz=1
|
mz=1
|
||||||
if(n.eq.1) mz=MAXRPT+1
|
if(n.eq.1 .and. j3.lt.1 .and. j4.lt.1) mz=MAXRPT+1
|
||||||
do m=1,mz
|
do m=1,mz
|
||||||
if(m.gt.1) grid=rpt(m-1)
|
if(m.gt.1) grid=rpt(m-1)
|
||||||
if(j3.lt.1 .and.j4.lt.1)
|
if(j3.lt.1 .and.j4.lt.1)
|
||||||
@ -100,6 +101,7 @@
|
|||||||
|
|
||||||
p1=-1.e30
|
p1=-1.e30
|
||||||
ip1=0
|
ip1=0
|
||||||
|
n=0
|
||||||
do k=1,ntot
|
do k=1,ntot
|
||||||
C If sync=OOO, no CQ messages
|
C If sync=OOO, no CQ messages
|
||||||
if(flip.lt.0.0 .and. testmsg(k)(1:3).eq.'CQ ') go to 30
|
if(flip.lt.0.0 .and. testmsg(k)(1:3).eq.'CQ ') go to 30
|
||||||
@ -114,27 +116,46 @@ C If sync=OOO, no CQ messages
|
|||||||
nhard=nhard+1
|
nhard=nhard+1
|
||||||
endif
|
endif
|
||||||
enddo
|
enddo
|
||||||
sum=sum/ref
|
p=sum/ref
|
||||||
if(sum.gt.p1) then
|
! p=sum/ref0
|
||||||
p1=sum
|
n=n+1
|
||||||
|
pp(n)=p
|
||||||
|
if(p.gt.p1) then
|
||||||
|
p1=p
|
||||||
ip1=k
|
ip1=k
|
||||||
|
sum1=sum
|
||||||
ref1=ref
|
ref1=ref
|
||||||
nhard1=nhard
|
nhard1=nhard
|
||||||
endif
|
endif
|
||||||
30 enddo
|
30 enddo
|
||||||
|
|
||||||
qual=100.0*(p1-0.405)
|
ntot=n
|
||||||
if(mode65.eq.1) qual=100.0*(p1-0.335)
|
call sort(ntot,pp)
|
||||||
if(mode65.eq.4) qual=100.0*(p1-0.505)
|
do i=1,100
|
||||||
if(qual.lt.0.) qual=0.
|
if(pp(ntot-i).ne.pp(ntot)) go to 40
|
||||||
if(qual.gt.10.) qual=10.
|
enddo
|
||||||
|
40 iref=min(ntot-i,nint(0.68*ntot))
|
||||||
|
pbias=1.04*pp(ntot-i)
|
||||||
|
! pbias=1.40*pp(iref)
|
||||||
|
qual=50.0*(p1-pbias)
|
||||||
|
! if(mode65.eq.1) qual=100.0*(p1-0.335)
|
||||||
|
! if(mode65.eq.4) qual=100.0*(p1-0.505)
|
||||||
decoded=' '
|
decoded=' '
|
||||||
c=' '
|
c=' '
|
||||||
if(qual.gt.0.0) then
|
|
||||||
|
if(qual.gt.1.0) then
|
||||||
if(qual.lt.4.0) c='?'
|
if(qual.lt.4.0) c='?'
|
||||||
decoded=testmsg(ip1)
|
decoded=testmsg(ip1)
|
||||||
endif
|
endif
|
||||||
decoded(22:22)=c
|
decoded(22:22)=c
|
||||||
|
|
||||||
|
! write(71,1010) mycall,qual,nhard1,p1,p1/pp(ntot-i),
|
||||||
|
! + p1/pp(iref),nint(sum1),nint(ref0),nint(ref1),i,decoded
|
||||||
|
! write(*,1010) mycall,qual,nhard1,p1,p1/pp(ntot-i),
|
||||||
|
! + p1/pp(iref),nint(sum1),nint(ref0),nint(ref1),i,decoded
|
||||||
|
! 1010 format(a6,f6.1,i3,f6.3,2f6.2,4i5,1x,a22)
|
||||||
|
if(qual.lt.0.) qual=0.
|
||||||
|
if(qual.gt.10.) qual=10.
|
||||||
|
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
4
wsjt.py
4
wsjt.py
@ -1,4 +1,4 @@
|
|||||||
#------------------------------------------------------------------- WSJT
|
#------------------------------------------------------------------ WSJT
|
||||||
from Tkinter import *
|
from Tkinter import *
|
||||||
from tkFileDialog import *
|
from tkFileDialog import *
|
||||||
import Pmw
|
import Pmw
|
||||||
@ -15,7 +15,7 @@ from types import *
|
|||||||
import array
|
import array
|
||||||
|
|
||||||
root = Tk()
|
root = Tk()
|
||||||
Version="5.9.4 r" + "$Rev$"[6:-1]
|
Version="5.9.5 r" + "$Rev$"[6:-1]
|
||||||
print "******************************************************************"
|
print "******************************************************************"
|
||||||
print "WSJT Version " + Version + ", by K1JT"
|
print "WSJT Version " + Version + ", by K1JT"
|
||||||
print "Revision date: " + \
|
print "Revision date: " + \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user