mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2025-09-03 13:47:51 -04:00
First decodes of Q65 from within wsjtx.
This commit is contained in:
Joe Taylor
parent
5a2f9e4f3f
commit
2dad27f1ad
@ -497,6 +497,7 @@ set (wsjt_FSRCS
|
|||||||
lib/ps4.f90
|
lib/ps4.f90
|
||||||
lib/qra64a.f90
|
lib/qra64a.f90
|
||||||
lib/qra_loops.f90
|
lib/qra_loops.f90
|
||||||
|
lib/qra/q65/q65_loops.f90
|
||||||
lib/refspectrum.f90
|
lib/refspectrum.f90
|
||||||
lib/savec2.f90
|
lib/savec2.f90
|
||||||
lib/sec0.f90
|
lib/sec0.f90
|
||||||
|
|||||||
@ -42,7 +42,7 @@ contains
|
|||||||
! Output: sent to the callback routine for display to user
|
! Output: sent to the callback routine for display to user
|
||||||
|
|
||||||
use timer_module, only: timer
|
use timer_module, only: timer
|
||||||
use packjt
|
use packjt77
|
||||||
use, intrinsic :: iso_c_binding
|
use, intrinsic :: iso_c_binding
|
||||||
parameter (NMAX=300*12000) !Max TRperiod is 300 s
|
parameter (NMAX=300*12000) !Max TRperiod is 300 s
|
||||||
class(q65_decoder), intent(inout) :: this
|
class(q65_decoder), intent(inout) :: this
|
||||||
@ -50,10 +50,13 @@ contains
|
|||||||
character(len=12) :: mycall, hiscall !Used for AP decoding
|
character(len=12) :: mycall, hiscall !Used for AP decoding
|
||||||
character(len=6) :: hisgrid
|
character(len=6) :: hisgrid
|
||||||
character*37 decoded !Decoded message
|
character*37 decoded !Decoded message
|
||||||
|
character*77 c77
|
||||||
integer*2 iwave(NMAX) !Raw data
|
integer*2 iwave(NMAX) !Raw data
|
||||||
real, allocatable :: dd(:) !Raw data
|
real, allocatable :: dd(:) !Raw data
|
||||||
integer dat4(12) !Decoded message as 12 6-bit integers
|
integer dat4(12) !Decoded message as 12 6-bit integers
|
||||||
|
integer dat4a(13)
|
||||||
logical ltext
|
logical ltext
|
||||||
|
logical unpk77_success
|
||||||
complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s
|
complex, allocatable :: c00(:) !Analytic signal, 6000 Sa/s
|
||||||
complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s
|
complex, allocatable :: c0(:) !Analytic signal, 6000 Sa/s
|
||||||
data nc1z/-1/,nc2z/-1/,ng2z/-1/,maxaptypez/-1/,nsubmodez/-1/
|
data nc1z/-1/,nc2z/-1/,ng2z/-1/,maxaptypez/-1/,nsubmodez/-1/
|
||||||
@ -86,9 +89,9 @@ contains
|
|||||||
if(nutc.eq.-999) print*,lapdx,nfa,nfb,nfqso !Silence warning
|
if(nutc.eq.-999) print*,lapdx,nfa,nfb,nfqso !Silence warning
|
||||||
|
|
||||||
! Prime the QRA decoder for possible use of AP
|
! Prime the QRA decoder for possible use of AP
|
||||||
call packcall(mycall(1:6),nc1,ltext)
|
! call packcall(mycall(1:6),nc1,ltext)
|
||||||
call packcall(hiscall(1:6),nc2,ltext)
|
! call packcall(hiscall(1:6),nc2,ltext)
|
||||||
call packgrid(hisgrid(1:4),ng2,ltext)
|
! call packgrid(hisgrid(1:4),ng2,ltext)
|
||||||
b90=20.0 !8 to 25 is OK; not very critical
|
b90=20.0 !8 to 25 is OK; not very critical
|
||||||
nFadingModel=1
|
nFadingModel=1
|
||||||
|
|
||||||
@ -100,18 +103,18 @@ contains
|
|||||||
minsync=-2
|
minsync=-2
|
||||||
call qra_params(ndepth,maxaptype,idfmax,idtmax,ibwmin,ibwmax,maxdist)
|
call qra_params(ndepth,maxaptype,idfmax,idtmax,ibwmin,ibwmax,maxdist)
|
||||||
|
|
||||||
if(nc1.ne.nc1z .or. nc2.ne.nc2z .or. ng2.ne.ng2z .or. &
|
! if(nc1.ne.nc1z .or. nc2.ne.nc2z .or. ng2.ne.ng2z .or. &
|
||||||
maxaptype.ne.maxaptypez) then
|
! maxaptype.ne.maxaptypez) then
|
||||||
do naptype=0,maxaptype
|
! do naptype=0,maxaptype
|
||||||
if(naptype.eq.2 .and. maxaptype.eq.4) cycle
|
! if(naptype.eq.2 .and. maxaptype.eq.4) cycle
|
||||||
call qra64_dec(s3dummy,nc1,nc2,ng2,naptype,1,nSubmode,b90, &
|
! call qra64_dec(s3dummy,nc1,nc2,ng2,naptype,1,nSubmode,b90, &
|
||||||
nFadingModel,dat4,snr2,irc)
|
! nFadingModel,dat4,snr2,irc)
|
||||||
enddo
|
! enddo
|
||||||
nc1z=nc1
|
! nc1z=nc1
|
||||||
nc2z=nc2
|
! nc2z=nc2
|
||||||
ng2z=ng2
|
! ng2z=ng2
|
||||||
maxaptypez=maxaptype
|
! maxaptypez=maxaptype
|
||||||
endif
|
! endif
|
||||||
naptype=maxaptype
|
naptype=maxaptype
|
||||||
|
|
||||||
call timer('sync_q65',0)
|
call timer('sync_q65',0)
|
||||||
@ -127,16 +130,23 @@ contains
|
|||||||
dd=fac*iwave
|
dd=fac*iwave
|
||||||
nmode=65
|
nmode=65
|
||||||
call ana64(dd,npts,c00)
|
call ana64(dd,npts,c00)
|
||||||
call timer('qraloops',0)
|
call timer('q65loops',0)
|
||||||
call qra_loops(c00,npts/2,nsps/2,nmode,mode65,nsubmode,nFadingModel, &
|
call q65_loops(c00,npts/2,nsps/2,nmode,mode65,nsubmode,nFadingModel, &
|
||||||
ndepth,nc1,nc2,ng2,naptype,jpk0,xdt,f0,width,snr2,irc,dat4)
|
ndepth,nc1,nc2,ng2,naptype,jpk0,xdt,f0,width,snr2,irc,dat4)
|
||||||
call timer('qraloops',1)
|
call timer('q65loops',1)
|
||||||
snr2=snr2 + db(6912.0/nsps)
|
snr2=snr2 + db(6912.0/nsps)
|
||||||
endif
|
endif
|
||||||
decoded=' '
|
decoded=' '
|
||||||
if(irc.ge.0) then
|
if(irc.ge.0) then
|
||||||
call unpackmsg(dat4,decoded) !Unpack the user message
|
dat4a(1:12)=dat4
|
||||||
call fmtmsg(decoded,iz)
|
dat4a(13)=9
|
||||||
|
write(74,3074) dat4a,1
|
||||||
|
3074 format(13i3,i6)
|
||||||
|
write(c77,1000) dat4a
|
||||||
|
1000 format(12b6.6,b5.5)
|
||||||
|
call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent
|
||||||
|
! call unpackmsg(dat4,decoded) !Unpack the user message
|
||||||
|
! call fmtmsg(decoded,iz)
|
||||||
if(index(decoded,"000AAA ").ge.1) then
|
if(index(decoded,"000AAA ").ge.1) then
|
||||||
! Suppress a certain type of garbage decode.
|
! Suppress a certain type of garbage decode.
|
||||||
decoded=' '
|
decoded=' '
|
||||||
|
|||||||
175
lib/qra/q65/q65_loops.f90
Normal file
175
lib/qra/q65/q65_loops.f90
Normal file
@ -0,0 +1,175 @@
|
|||||||
|
subroutine q65_loops(c00,npts2,nsps,mode,mode64,nsubmode,nFadingModel, &
|
||||||
|
ndepth,nc1,nc2,ng2,naptype,jpk0,xdt,f0,width,snr2,irc,dat4)
|
||||||
|
|
||||||
|
use packjt77
|
||||||
|
use timer_module, only: timer
|
||||||
|
parameter (LN=2176*63) !LN=LL*NN; LL = 64*(mode64+2)
|
||||||
|
character*37 decoded
|
||||||
|
character*77 c77
|
||||||
|
complex c00(0:npts2-1) !Analytic representation of dd(), 6000 Hz
|
||||||
|
complex ,allocatable :: c0(:) !Ditto, with freq shift
|
||||||
|
real a(3) !twkfreq params f,f1,f2
|
||||||
|
real s3(LN) !Symbol spectra
|
||||||
|
real s3avg(LN) !Averaged symbol spectra
|
||||||
|
real s3prob(LN) !Symbol-value probabilities
|
||||||
|
real s3tmp(4032)
|
||||||
|
logical unpk77_success
|
||||||
|
integer APmask(13)
|
||||||
|
integer APsymbols(13)
|
||||||
|
integer dat4(13),dat4x(13) !Decoded message (as 13 six-bit integers)
|
||||||
|
integer nap(0:11) !AP return codes
|
||||||
|
data nap/0,2,3,2,3,4,2,3,6,4,6,6/,nsave/0/
|
||||||
|
save nsave,s3avg
|
||||||
|
|
||||||
|
allocate(c0(0:npts2-1))
|
||||||
|
irc=-99
|
||||||
|
s3lim=20.
|
||||||
|
ibwmax=11
|
||||||
|
if(mode64.le.4) ibwmax=9
|
||||||
|
ibwmin=ibwmax
|
||||||
|
idtmax=3
|
||||||
|
call qra_params(ndepth,maxaptype,idfmax,idtmax,ibwmin,ibwmax,maxdist)
|
||||||
|
LL=64*(mode64+2)
|
||||||
|
NN=63
|
||||||
|
napmin=99
|
||||||
|
ncall=0
|
||||||
|
|
||||||
|
do iavg=0,1
|
||||||
|
if(iavg.eq.1) then
|
||||||
|
idfmax=1
|
||||||
|
idtmax=1
|
||||||
|
endif
|
||||||
|
do idf=1,idfmax
|
||||||
|
ndf=idf/2
|
||||||
|
if(mod(idf,2).eq.0) ndf=-ndf
|
||||||
|
a=0.
|
||||||
|
a(1)=-(f0+0.4*ndf)
|
||||||
|
call twkfreq(c00,c0,npts2,6000.0,a)
|
||||||
|
do idt=1,idtmax
|
||||||
|
ndt=idt/2
|
||||||
|
if(iavg.eq.0) then
|
||||||
|
if(mod(idt,2).eq.0) ndt=-ndt
|
||||||
|
jpk=jpk0 + 240*ndt !240/6000 = 0.04 s = tsym/32
|
||||||
|
if(jpk.lt.0) jpk=0
|
||||||
|
call timer('spec64 ',0)
|
||||||
|
call spec64(c0,nsps,mode,mode64,jpk,s3,LL,NN)
|
||||||
|
call timer('spec64 ',1)
|
||||||
|
call pctile(s3,LL*NN,40,base)
|
||||||
|
s3=s3/base
|
||||||
|
where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim
|
||||||
|
else
|
||||||
|
s3(1:LL*NN)=s3avg(1:LL*NN)
|
||||||
|
endif
|
||||||
|
do ibw=ibwmax,ibwmin,-2
|
||||||
|
ndist=ndf**2 + ndt**2 + ((ibwmax-ibw)/2)**2
|
||||||
|
if(ndist.gt.maxdist) cycle
|
||||||
|
b90=1.728**ibw
|
||||||
|
if(b90.gt.230.0) cycle
|
||||||
|
if(b90.lt.0.15*width) exit
|
||||||
|
ncall=ncall+1
|
||||||
|
call timer('qra64_de',0)
|
||||||
|
!###
|
||||||
|
! call qra64_dec(s3,nc1,nc2,ng2,naptype,0,nSubmode,b90, &
|
||||||
|
! nFadingModel,dat4,snr2,irc)
|
||||||
|
APmask=0
|
||||||
|
APsymbols=0
|
||||||
|
call s3fix(s3,s3tmp)
|
||||||
|
call q65_dec(s3tmp,APmask,APsymbols,s3prob,snr2,dat4,irc)
|
||||||
|
write(74,3074) dat4,0
|
||||||
|
3074 format(13i3,i6)
|
||||||
|
!###
|
||||||
|
call timer('qra64_de',1)
|
||||||
|
if(irc.eq.0) go to 200
|
||||||
|
! if(irc.gt.0) call badmsg(irc,dat4,nc1,nc2,ng2)
|
||||||
|
iirc=max(0,min(irc,11))
|
||||||
|
if(irc.gt.0 .and. nap(iirc).lt.napmin) then
|
||||||
|
dat4x=dat4
|
||||||
|
b90x=b90
|
||||||
|
snr2x=snr2
|
||||||
|
napmin=nap(iirc)
|
||||||
|
irckeep=irc
|
||||||
|
xdtkeep=jpk/6000.0 - 1.0
|
||||||
|
f0keep=-a(1)
|
||||||
|
idfkeep=idf
|
||||||
|
idtkeep=idt
|
||||||
|
ibwkeep=ibw
|
||||||
|
ndistx=ndist
|
||||||
|
go to 100 !###
|
||||||
|
endif
|
||||||
|
enddo ! ibw (b90 loop)
|
||||||
|
!### if(iand(ndepth,3).lt.3 .and. irc.ge.0) go to 100
|
||||||
|
enddo ! idt (DT loop)
|
||||||
|
enddo ! idf (f0 loop)
|
||||||
|
! if(iavg.eq.0 .and. abs(jpk0-4320).le.1300) then
|
||||||
|
if(iavg.eq.0) then
|
||||||
|
a=0.
|
||||||
|
a(1)=-f0
|
||||||
|
call twkfreq(c00,c0,npts2,6000.0,a)
|
||||||
|
jpk=3000 !### These definitions need work ###
|
||||||
|
! if(nsps.ge.3600) jpk=4080 !###
|
||||||
|
if(nsps.ge.3600) jpk=6000 !###
|
||||||
|
call spec64(c0,nsps,mode,mode64,jpk,s3,LL,NN)
|
||||||
|
call pctile(s3,LL*NN,40,base)
|
||||||
|
s3=s3/base
|
||||||
|
where(s3(1:LL*NN)>s3lim) s3(1:LL*NN)=s3lim
|
||||||
|
s3avg(1:LL*NN)=s3avg(1:LL*NN)+s3(1:LL*NN)
|
||||||
|
nsave=nsave+1
|
||||||
|
endif
|
||||||
|
if(iavg.eq.0 .and. nsave.lt.2) exit
|
||||||
|
enddo ! iavg
|
||||||
|
|
||||||
|
100 if(napmin.ne.99) then
|
||||||
|
dat4=dat4x
|
||||||
|
b90=b90x
|
||||||
|
snr2=snr2x
|
||||||
|
irc=irckeep
|
||||||
|
xdt=xdtkeep
|
||||||
|
f0=f0keep
|
||||||
|
idt=idtkeep
|
||||||
|
idf=idfkeep
|
||||||
|
ibw=ibwkeep
|
||||||
|
ndist=ndistx
|
||||||
|
endif
|
||||||
|
|
||||||
|
200 if(mode.eq.65 .and. nsps.eq.7200/2) xdt=xdt+0.4 !### Empirical -- WHY ??? ###
|
||||||
|
|
||||||
|
if(irc.ge.0) then
|
||||||
|
navg=nsave
|
||||||
|
if(iavg.eq.0) navg=0
|
||||||
|
!### For tests only:
|
||||||
|
open(53,file='fort.53',status='unknown',position='append')
|
||||||
|
write(c77,1200) dat4
|
||||||
|
1200 format(12b6.6,b5.5)
|
||||||
|
call unpack77(c77,0,decoded,unpk77_success) !Unpack to get msgsent
|
||||||
|
! call unpackmsg(dat4,decoded) !Unpack the user message
|
||||||
|
write(53,3053) idf,idt,ibw,b90,xdt,f0,snr2,ndist,irc,navg,decoded(1:22)
|
||||||
|
3053 format(3i5,f7.1,f7.2,2f7.1,3i4,2x,a22)
|
||||||
|
close(53)
|
||||||
|
!###
|
||||||
|
nsave=0
|
||||||
|
s3avg=0.
|
||||||
|
irc=irc + 100*navg
|
||||||
|
endif
|
||||||
|
return
|
||||||
|
end subroutine q65_loops
|
||||||
|
|
||||||
|
subroutine s3fix(s3,s3tmp)
|
||||||
|
real s3(0:191,63)
|
||||||
|
real s3tmp(0:63,63)
|
||||||
|
integer ipk1(1)
|
||||||
|
integer y(63)
|
||||||
|
|
||||||
|
do j=1,63
|
||||||
|
s3tmp(0:63,j)=s3(64:127,j)
|
||||||
|
! s3tmp(y(j),j)=1.0
|
||||||
|
ipk1=maxloc(s3(0:191,j))
|
||||||
|
m=ipk1(1)-65
|
||||||
|
ipk1=maxloc(s3tmp(0:63,j))
|
||||||
|
mtmp=ipk1(1)-1
|
||||||
|
write(72,3072) j,y(j),m,m-y(j),mtmp,mtmp-y(j)
|
||||||
|
3072 format(6i7)
|
||||||
|
enddo
|
||||||
|
write(70) s3tmp
|
||||||
|
|
||||||
|
return
|
||||||
|
end subroutine s3fix
|
||||||
Loading…
x
Reference in New Issue
Block a user