mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-02-03 09:44:24 -05:00
Restore full sensitivity of msk40.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6984 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
58de27e65c
commit
3cc473c494
@ -393,11 +393,11 @@ subroutine detectmsk144(cbig,n,pchk_file,lines,nmessages,nutc,ntol,t00)
|
||||
ndither=-98
|
||||
999 continue
|
||||
if( nmessages .ge. 1 ) then
|
||||
! write(78,1001) nutc,t0,nsnr,ip,ipk,is,idf,iav,ipha,deltaf,fest,ferr,ferr2, &
|
||||
! ffin,bba,bbp,nbadsync1,nbadsync2, &
|
||||
! phase0,niterations,ndither,msgreceived
|
||||
! call flush(78)
|
||||
!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)
|
||||
write(78,1001) nutc,t0,nsnr,ip,ipk,is,idf,iav,ipha,deltaf,fest,ferr,ferr2, &
|
||||
ffin,bba,bbp,nbadsync1,nbadsync2, &
|
||||
phase0,niterations,ndither,msgreceived
|
||||
call flush(78)
|
||||
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
|
||||
endif
|
||||
enddo
|
||||
|
@ -363,7 +363,7 @@ subroutine detectmsk40(cbig,n,pchk_file,mycall,hiscall,lines,nmessages, &
|
||||
softbits=softbits/ssig
|
||||
|
||||
sigma=0.75
|
||||
if( xsnr .lt. -4.0 ) sigma=1.1
|
||||
! if( xsnr .lt. -4.0 ) sigma=0.8
|
||||
lratio(1:32)=exp(2.0*softbits(9:40)/(sigma*sigma))
|
||||
|
||||
max_iterations=5
|
||||
|
@ -5,11 +5,12 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file)
|
||||
character*32 cwstring
|
||||
character*2 cwstrbit
|
||||
character*4 crpt,rpt(0:63)
|
||||
character*16 messagestr
|
||||
character*512 pchk_file,gen_file
|
||||
character*512 pchk_file40,gen_file40
|
||||
logical first
|
||||
integer itone(144)
|
||||
integer*1 message(16),codeword(32),bitseq(40)
|
||||
integer*1 message(16),codeword(32),bitseq(40),codeword2(32)
|
||||
integer*1 s8r(8)
|
||||
data s8r/1,0,1,1,0,0,0,1/
|
||||
data first/.true./
|
||||
@ -61,15 +62,20 @@ subroutine genmsk40(msg,msgsent,ichk,itone,itype,pchk_file)
|
||||
do i=1,16
|
||||
message(i)=iand(1,ishft(ig,1-i))
|
||||
enddo
|
||||
call ldpc_encode(message,codeword)
|
||||
|
||||
write(17,'(16i1)') message
|
||||
call system('./encode peg-32-16-reg3.pchk peg-32-16-reg3.gen fort.17 fort.18')
|
||||
read(18,'(32i1)') codeword
|
||||
|
||||
! call ldpc_encode(message,codeword)
|
||||
|
||||
cwstring=" "
|
||||
do i=1,32
|
||||
write(cwstrbit,'(i2)') codeword(i)
|
||||
cwstring=cwstring//cwstrbit
|
||||
enddo
|
||||
! write(*,'(a6,i6,2x,a6,i6,2x,a6,i6)') ' msg: ',ig,'rprt: ',irpt,'hash: ',ihash
|
||||
! write(*,'(a6,32i1)') ' cw: ',codeword
|
||||
write(*,'(a6,i6,2x,a6,i6,2x,a6,i6)') ' msg: ',ig,'rprt: ',irpt,'hash: ',ihash
|
||||
write(*,'(a6,32i1)') ' cw: ',codeword
|
||||
|
||||
bitseq(1:8)=s8r
|
||||
bitseq(9:40)=codeword
|
||||
|
Loading…
Reference in New Issue
Block a user