w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-02-03 09:44:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

More into q65 module.

Browse Source
This commit is contained in:
Joe Taylor 2021-01-13 11:07:20 -05:00
parent 201004a47d
commit df8ad7a8d9
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/q65_decode.f90
View File

@ -101,7 +101,7 @@ contains
dgen=0 dgen=0
call q65_enc(dgen,codewords) !Initialize the Q65 codec call q65_enc(dgen,codewords) !Initialize the Q65 codec
call timer('sync_q65',0) call timer('sync_q65',0)
call q65_sync(nutc,iwave,ntrperiod,mode65,nsps, & call q65_sync(nutc,iwave,ntrperiod,mode65, &
nfqso,ntol,ndepth,lclearave,emedelay,xdt,f0,snr1,width,dat4, & nfqso,ntol,ndepth,lclearave,emedelay,xdt,f0,snr1,width,dat4, &
snr2,idec) snr2,idec)
call timer('sync_q65',1) call timer('sync_q65',1)

2
lib/qra/q65/q65.f90
View File

@ -9,7 +9,7 @@ module q65
integer,dimension(22) :: isync = (/1,9,12,13,15,22,23,26,27,33,35, & integer,dimension(22) :: isync = (/1,9,12,13,15,22,23,26,27,33,35, &
38,46,50,55,60,62,66,69,74,76,85/) 38,46,50,55,60,62,66,69,74,76,85/)
integer codewords(63,206) integer codewords(63,206)
integer navg,ibwa,ibwb,ncw integer navg,ibwa,ibwb,ncw,nsps
real,allocatable,save :: s1a(:,:) !Cumulative symbol spectra real,allocatable,save :: s1a(:,:) !Cumulative symbol spectra
real sync(85) !sync vector real sync(85) !sync vector

10
lib/qra/q65/q65_loops.f90
View File

@ -1,4 +1,4 @@
subroutine q65_loops(c00,npts2,nsps,mode_q65,nsubmode,ndepth,jpk0, & subroutine q65_loops(c00,npts2,nsps2,mode_q65,nsubmode,ndepth,jpk0, &
xdt0,f0,iaptype,xdt1,f1,snr2,dat4,idec) xdt0,f0,iaptype,xdt1,f1,snr2,dat4,idec)
use packjt77 use packjt77
@ -21,7 +21,7 @@ subroutine q65_loops(c00,npts2,nsps,mode_q65,nsubmode,ndepth,jpk0, &
allocate(c0(0:npts2-1)) allocate(c0(0:npts2-1))
irc=-99 irc=-99
s3lim=20. s3lim=20.
baud=6000.0/nsps baud=6000.0/nsps2
idfmax=3 idfmax=3
idtmax=3 idtmax=3
@ -48,10 +48,10 @@ subroutine q65_loops(c00,npts2,nsps,mode_q65,nsubmode,ndepth,jpk0, &
do idt=1,idtmax do idt=1,idtmax
ndt=idt/2 ndt=idt/2
if(mod(idt,2).eq.0) ndt=-ndt if(mod(idt,2).eq.0) ndt=-ndt
jpk=jpk0 + nsps*ndt/16 !tsym/16 jpk=jpk0 + nsps2*ndt/16 !tsym/16
if(jpk.lt.0) jpk=0 if(jpk.lt.0) jpk=0
call timer('spec64 ',0) call timer('spec64 ',0)
call spec64(c0,nsps,65,mode_q65,jpk,s3,LL,NN) call spec64(c0,nsps2,65,mode_q65,jpk,s3,LL,NN)
call timer('spec64 ',1) call timer('spec64 ',1)
call pctile(s3,LL*NN,40,base) call pctile(s3,LL*NN,40,base)
s3=s3/base s3=s3/base
@ -80,7 +80,7 @@ subroutine q65_loops(c00,npts2,nsps,mode_q65,nsubmode,ndepth,jpk0, &
!3055 format(7i4,f10.1,1x,a) !3055 format(7i4,f10.1,1x,a)
idec=iaptype+2 idec=iaptype+2
snr2=esnodb - db(2500.0/baud) snr2=esnodb - db(2500.0/baud)
xdt1=xdt0 + nsps*ndt/(16.0*6000.0) xdt1=xdt0 + nsps2*ndt/(16.0*6000.0)
f1=f0 + 0.5*baud*ndf f1=f0 + 0.5*baud*ndf
endif endif

10
lib/qra/q65/q65_sync.f90
View File

@ -1,4 +1,4 @@
subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,nsps, & subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65, &
nfqso,ntol,ndepth,lclearave,emedelay,xdt,f0,snr1,width,dat4,snr2,idec) nfqso,ntol,ndepth,lclearave,emedelay,xdt,f0,snr1,width,dat4,snr2,idec)
! Detect and align with the Q65 sync vector, returning time and frequency ! Detect and align with the Q65 sync vector, returning time and frequency
@ -73,7 +73,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,nsps, &
call timer('s1 ',0) call timer('s1 ',0)
nmax=ntrperiod*12000 nmax=ntrperiod*12000
call q65_symspec(iwave,nmax,nsps,iz,jz,istep,nsmo,s1) call q65_symspec(iwave,nmax,iz,jz,istep,nsmo,s1)
call timer('s1 ',1) call timer('s1 ',1)
i0=nint(nfqso/df) !Target QSO frequency i0=nint(nfqso/df) !Target QSO frequency
@ -102,7 +102,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,nsps, &
! Try list decoding via "Deep Likelihood". ! Try list decoding via "Deep Likelihood".
call timer('list_dec',0) call timer('list_dec',0)
call q65_dec_q3(df,s1,iz,jz,ia, & call q65_dec_q3(df,s1,iz,jz,ia, &
nsps,mode_q65,lag1,lag2,i0,j0,ccf,ccf1,ccf2,ia2,s3,LL,snr2, & mode_q65,lag1,lag2,i0,j0,ccf,ccf1,ccf2,ia2,s3,LL,snr2, &
dat4,idec,decoded) dat4,idec,decoded)
call timer('list_dec',1) call timer('list_dec',1)
endif endif
@ -178,7 +178,7 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,nsps, &
900 return 900 return
end subroutine q65_sync end subroutine q65_sync
subroutine q65_symspec(iwave,nmax,nsps,iz,jz,istep,nsmo,s1) subroutine q65_symspec(iwave,nmax,iz,jz,istep,nsmo,s1)
use q65 use q65
integer*2 iwave(0:nmax-1) !Raw data integer*2 iwave(0:nmax-1) !Raw data
@ -215,7 +215,7 @@ subroutine q65_symspec(iwave,nmax,nsps,iz,jz,istep,nsmo,s1)
end subroutine q65_symspec end subroutine q65_symspec
subroutine q65_dec_q3(df,s1,iz,jz,ia, & subroutine q65_dec_q3(df,s1,iz,jz,ia, &
nsps,mode_q65,lag1,lag2,i0,j0,ccf,ccf1,ccf2,ia2,s3,LL,snr2, & mode_q65,lag1,lag2,i0,j0,ccf,ccf1,ccf2,ia2,s3,LL,snr2, &
dat4,idec,decoded) dat4,idec,decoded)
use q65 use q65