w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-05-24 10:22:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Catch up msk144d.f90 with recent changes. Implement FTol in detectmsk144 (but not in detectmsk32 yet).

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6899 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Steven Franke 2016-07-09 00:07:07 +00:00
parent 46ff34a04a
commit d39dfe3d87
2 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
lib/detectmsk144.f90
View File

@ -1,7 +1,7 @@
subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol) subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
use timer_module, only: timer use timer_module, only: timer
parameter (NSPM=864, NPTS=3*NSPM, MAXSTEPS=1700, NFFT=NSPM, MAXCAND=20) parameter (NSPM=864, NPTS=3*NSPM, MAXSTEPS=1700, NFFT=NSPM, MAXCAND=12)
character*22 msgreceived,allmessages(20) character*22 msgreceived,allmessages(20)
character*80 lines(100) character*80 lines(100)
character*512 pchk_file,gen_file character*512 pchk_file,gen_file
@ -29,7 +29,6 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
real cbi(42),cbq(42) real cbi(42),cbq(42)
real detmet(-2:MAXSTEPS+3) real detmet(-2:MAXSTEPS+3)
real detfer(MAXSTEPS) real detfer(MAXSTEPS)
real hannwindow(NPTS)
real rcw(12) real rcw(12)
real dd(NPTS) real dd(NPTS)
real ddr(NPTS) real ddr(NPTS)
@ -46,7 +45,7 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
data first/.true./ data first/.true./
data s8/0,1,1,1,0,0,1,0/ data s8/0,1,1,1,0,0,1,0/
data s8r/1,0,1,1,0,0,0,1/ data s8r/1,0,1,1,0,0,0,1/
save df,first,cb,fs,pi,twopi,dt,s8,rcw,pp,hannwindow,nmatchedfilter save df,first,cb,fs,pi,twopi,dt,s8,rcw,pp,nmatchedfilter
if(first) then if(first) then
nmatchedfilter=1 nmatchedfilter=1
@ -66,10 +65,6 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
rcw(i)=(1-cos(angle))/2 rcw(i)=(1-cos(angle))/2
enddo enddo
do i=1,NPTS
hannwindow(i)=0.5*(1-cos(twopi*(i-1)/NPTS))
enddo
! define the sync word waveforms ! define the sync word waveforms
s8=2*s8-1 s8=2*s8-1
cbq(1:6)=pp(7:12)*s8(1) cbq(1:6)=pp(7:12)*s8(1)
@ -114,22 +109,21 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
ctmp=ctmp**2 ctmp=ctmp**2
ctmp(1:12)=ctmp(1:12)*rcw ctmp(1:12)=ctmp(1:12)*rcw
ctmp(NSPM-11:NSPM)=ctmp(NSPM-11:NSPM)*rcw(12:1:-1) ctmp(NSPM-11:NSPM)=ctmp(NSPM-11:NSPM)*rcw(12:1:-1)
! ctmp(1:NSPM)=ctmp(1:NSPM)*hannwindow
call four2a(ctmp,NFFT,1,-1,1) call four2a(ctmp,NFFT,1,-1,1)
tonespec=abs(ctmp)**2 tonespec=abs(ctmp)**2
i3800=3800/df+1 ihlo=(4000-2*ntol)/df+1
i4200=4200/df+1 ihhi=(4000+2*ntol)/df+1
ismask=.false. ismask=.false.
ismask(i3800:i4200)=.true. ! high tone search window ismask(ihlo:ihhi)=.true. ! high tone search window
iloc=maxloc(tonespec,ismask) iloc=maxloc(tonespec,ismask)
ihpk=iloc(1) ihpk=iloc(1)
deltah=-real( (ctmp(ihpk-1)-ctmp(ihpk+1)) / (2*ctmp(ihpk)-ctmp(ihpk-1)-ctmp(ihpk+1)) ) deltah=-real( (ctmp(ihpk-1)-ctmp(ihpk+1)) / (2*ctmp(ihpk)-ctmp(ihpk-1)-ctmp(ihpk+1)) )
ah=tonespec(ihpk) ah=tonespec(ihpk)
i1800=1800/df+1 illo=(2000-2*ntol)/df+1
i2200=2200/df+1 ilhi=(2000+2*ntol)/df+1
ismask=.false. ismask=.false.
ismask(i1800:i2200)=.true. ! window for low tone ismask(illo:ilhi)=.true. ! window for low tone
iloc=maxloc(tonespec,ismask) iloc=maxloc(tonespec,ismask)
ilpk=iloc(1) ilpk=iloc(1)
deltal=-real( (ctmp(ilpk-1)-ctmp(ilpk+1)) / (2*ctmp(ilpk)-ctmp(ilpk-1)-ctmp(ilpk+1)) ) deltal=-real( (ctmp(ilpk-1)-ctmp(ilpk+1)) / (2*ctmp(ilpk)-ctmp(ilpk-1)-ctmp(ilpk+1)) )
@ -149,34 +143,29 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
enddo ! end of detection-metric and frequency error estimation loop enddo ! end of detection-metric and frequency error estimation loop
call indexx(detmet(1:nstep),nstep,indices) !find median of detection metric vector call indexx(detmet(1:nstep),nstep,indices) !find median of detection metric vector
! xmed=detmet(indices(nstep/2))
xmed=detmet(indices(nstep/4)) xmed=detmet(indices(nstep/4))
detmet=detmet/xmed ! noise floor of detection metric is 1.0 detmet=detmet/xmed ! noise floor of detection metric is 1.0
ndet=0 ndet=0
do ip=1,MAXCAND ! use something like the "clean" algorithm to find candidates do ip=1,MAXCAND ! Find candidates
iloc=maxloc(detmet(1:nstep)) iloc=maxloc(detmet(1:nstep))
il=iloc(1) il=iloc(1)
if( (detmet(il) .lt. 3.5) ) exit if( (detmet(il) .lt. 3.5) ) exit
if( abs(detfer(il)) .le. 100.0 ) then if( abs(detfer(il)) .le. ntol ) then
ndet=ndet+1 ndet=ndet+1
times(ndet)=((il-1)*216+NSPM/2)*dt times(ndet)=((il-1)*216+NSPM/2)*dt
ferrs(ndet)=detfer(il) ferrs(ndet)=detfer(il)
snrs(ndet)=12.0*log10(detmet(il))/2-9.0 snrs(ndet)=12.0*log10(detmet(il))/2-9.0
endif endif
! detmet(max(1,il-3):min(nstep,il+3))=0.0 ! detmet(max(1,il-2):min(nstep,il+2))=0.0
detmet(il)=0.0 detmet(il)=0.0
enddo enddo
! do ip=1,ndet
! write(*,*) ip,times(ip),snrs(ip),ferrs(ip)
! enddo
nmessages=0 nmessages=0
allmessages=char(0) allmessages=char(0)
lines=char(0) lines=char(0)
do ip=1,ndet !run through the candidates and try to sync/demod/decode do ip=1,ndet ! Try to sync/demod/decode each candidate.
imid=times(ip)*fs imid=times(ip)*fs
if( imid .lt. NPTS/2 ) imid=NPTS/2 if( imid .lt. NPTS/2 ) imid=NPTS/2
if( imid .gt. n-NPTS/2 ) imid=n-NPTS/2 if( imid .gt. n-NPTS/2 ) imid=n-NPTS/2
@ -219,11 +208,11 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
ic1=iloc(1) ic1=iloc(1)
iloc=maxloc(dd) iloc=maxloc(dd)
ic2=iloc(1) ic2=iloc(1)
! ipeaks(ipk)=ic2 ipeaks(ipk)=ic2
! dd(max(1,ic2-7):min(NPTS-56*6-41,ic2+7))=0.0 dd(max(1,ic2-7):min(NPTS-56*6-41,ic2+7))=0.0
ipeaks(ipk)=ic1 ! ipeaks(ipk)=ic1
cc(max(1,ic1-7):min(NPTS-56*6-41,ic1+7))=0.0 ! cc(max(1,ic1-7):min(NPTS-56*6-41,ic1+7))=0.0
!write(*,*) ipk,ic1 !write(*,*) ipk,ic2
enddo enddo
do ipk=1,6 do ipk=1,6
@ -246,7 +235,7 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
if( ibb .le. 3 ) ibb=ibb-1 if( ibb .le. 3 ) ibb=ibb-1
if( ibb .gt. 3 ) ibb=ibb-7 if( ibb .gt. 3 ) ibb=ibb-7
do id=1,3 ! slicer dither. bb is very good - may be able to remove this. do id=1,3 ! Slicer dither.
if( id .eq. 1 ) is=0 if( id .eq. 1 ) is=0
if( id .eq. 2 ) is=-1 if( id .eq. 2 ) is=-1
if( id .eq. 3 ) is=1 if( id .eq. 3 ) is=1
@ -271,13 +260,13 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
! Final estimate of the carrier frequency - returned to the calling program ! Final estimate of the carrier frequency - returned to the calling program
fest=1500+ferr+ferr2 fest=1500+ferr+ferr2
do idf=0,10 ! frequency jitter do idf=0,6 ! frequency jitter
if( idf .eq. 0 ) then if( idf .eq. 0 ) then
deltaf=0.0 deltaf=0.0
elseif( mod(idf,2) .eq. 0 ) then elseif( mod(idf,2) .eq. 0 ) then
deltaf=idf/2.0 deltaf=idf
else else
deltaf=-(idf+1)/2.0 deltaf=-(idf+1)
endif endif
! Remove fine frequency error ! Remove fine frequency error
@ -314,9 +303,9 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
ffin=atan2(imag(cfac),real(cfac))/(twopi*56*6*dt) ffin=atan2(imag(cfac),real(cfac))/(twopi*56*6*dt)
phase0=atan2(imag(cca+ccb),real(cca+ccb)) phase0=atan2(imag(cca+ccb),real(cca+ccb))
do ipha=1,3 do ipha=1,1
if( ipha.eq.2 ) phase0=phase0+20*pi/180.0 if( ipha.eq.2 ) phase0=phase0+30*pi/180.0
if( ipha.eq.3 ) phase0=phase0-20*pi/180.0 if( ipha.eq.3 ) phase0=phase0-30*pi/180.0
! Remove phase error - want constellation rotated so that sample points lie on I/Q axes ! Remove phase error - want constellation rotated so that sample points lie on I/Q axes
cfac=cmplx(cos(phase0),sin(phase0)) cfac=cmplx(cos(phase0),sin(phase0))
@ -388,7 +377,7 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
else else
msgreceived=' ' msgreceived=' '
ndither=-99 ! -99 is bad hash flag ndither=-99 ! -99 is bad hash flag
! write(78,1001) nutc,t0,nsnr,ic,ipk,is,idf,iav,ipha,deltaf,fest,ferr,ferr2, & ! write(78,1001) nutc,t0,nsnr,ip,ipk,is,idf,iav,ipha,deltaf,fest,ferr,ferr2, &
! ffin,bba,bbp,nbadsync1,nbadsync2, & ! ffin,bba,bbp,nbadsync1,nbadsync2, &
! phase0,niterations,ndither,msgreceived ! phase0,niterations,ndither,msgreceived
endif endif
@ -403,11 +392,11 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol)
ndither=-98 ndither=-98
999 continue 999 continue
if( nmessages .ge. 1 ) then if( nmessages .ge. 1 ) then
! write(78,1001) nutc,t0,nsnr,ic,ipk,is,idf,iav,ipha,deltaf,fest,ferr,ferr2, & ! write(78,1001) nutc,t0,nsnr,ip,ipk,is,idf,iav,ipha,deltaf,fest,ferr,ferr2, &
! ffin,bba,bbp,nbadsync1,nbadsync2, & ! ffin,bba,bbp,nbadsync1,nbadsync2, &
! phase0,niterations,ndither,msgreceived ! phase0,niterations,ndither,msgreceived
! call flush(78) ! call flush(78)
!1001 format(i6.6,f8.2,i5,i5,i5,i5,i5,i5,i5,f8.2,f8.2,f8.2,f8.2,f8.2,f10.2,f8.2,i5,i5,f8.2,i5,i5,2x,a22) !1001 format(i6.6,f8.2,i5,i5,i5,i5,i5,i5,i5,f6.2,f8.2,f8.2,f8.2,f8.2,f11.1,f8.2,i5,i5,f8.2,i5,i5,2x,a22)
exit exit
endif endif
enddo enddo

19
lib/msk144d.f90
View File

@ -11,29 +11,36 @@ program msk144d
character*80 line(100) character*80 line(100)
character*512 pchk_file character*512 pchk_file
logical :: display_help=.false. logical :: display_help=.false.
logical*1 bShMsgs
type(wav_header) :: wav type(wav_header) :: wav
integer*2 id2(30*12000) integer*2 id2(30*12000)
character*500 infile character*500 infile
character*12 mycall,hiscall character*12 mycall,hiscall
character(len=500) optarg character(len=500) optarg
type (option) :: long_options(3) = [ & type (option) :: long_options(4) = [ &
option ('help',.false.,'h','Display this help message',''), & option ('help',.false.,'h','Display this help message',''), &
option ('mycall',.true.,'c','mycall',''), & option ('mycall',.true.,'c','mycall',''), &
option ('nftol',.true.,'n','nftol',''), &
option ('hiscall',.true.,'x','hiscall','') & option ('hiscall',.true.,'x','hiscall','') &
] ]
ntol=100
mycall=''
hiscall=''
do do
call getopt('c:hx:',long_options,c,optarg,narglen,nstat,noffset,nremain,.true.) call getopt('c:hn:x:',long_options,c,optarg,narglen,nstat,noffset,nremain,.true.)
if( nstat .ne. 0 ) then if( nstat .ne. 0 ) then
exit exit
end if end if
select case (c) select case (c)
case ('h') case ('h')
display_help = .true. display_help = .true.
case ('n')
read (optarg(:narglen), *) ntrials
case ('c') case ('c')
read (optarg(:narglen), *) mycall read (optarg(:narglen), *) mycall
case ('n')
read (optarg(:narglen), *) ntol
case ('x') case ('x')
read (optarg(:narglen), *) hiscall read (optarg(:narglen), *) hiscall
end select end select
@ -55,7 +62,7 @@ program msk144d
call init_timer ('timer.out') call init_timer ('timer.out')
call timer('jt65 ',0) call timer('jt65 ',0)
bShMsgs=.true.
pchk_file='./peg-128-80-reg3.pchk' pchk_file='./peg-128-80-reg3.pchk'
ndecoded=0 ndecoded=0
do ifile=noffset+1,noffset+nremain do ifile=noffset+1,noffset+nremain
@ -71,7 +78,7 @@ program msk144d
read(unit=wav%lun) id2(1:npts) read(unit=wav%lun) id2(1:npts)
close(unit=wav%lun) close(unit=wav%lun)
call timer('read ',1) call timer('read ',1)
call msk144_decode(id2,npts,nutc,1,pchk_file,mycall,hiscall,line) call msk144_decode(id2,npts,nutc,1,pchk_file,mycall,hiscall,bShMsgs,ntol,line)
enddo enddo
call timer('msk144 ',1) call timer('msk144 ',1)