w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-26 14:18:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use different values for nfft1, nfft2 when sample rate 95238 is used.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@7554 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-01-25 19:43:01 +00:00
parent a5d592e44e
commit 291f648405
3 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libm65/map65a.f90
View File

@ -223,7 +223,7 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
call timer('decode1a',1)
if(nqd.eq.2) then
call timer('qra64 ',0)
call qra64b(nutc,nqd,fcenter,nfcal,ikhz, &
call qra64b(nutc,nqd,fcenter,nfcal,nfsample,ikhz, &
mousedf,ntol,xpol,mycall,hiscall,hisgrid, &
mode64,nwrite_qra64)
call timer('qra64 ',1)

50
libm65/qra64b.f90
View File

@ -1,10 +1,10 @@
subroutine qra64b(nutc,nqd,fcenter,nfcal,ikhz,mousedf,ntol,xpol, &
subroutine qra64b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol,xpol, &
mycall_12,hiscall_12,hisgrid_6,mode64,nwrite_qra64)
parameter (NFFT1=5376000) !56*96000
parameter (NFFT2=336000) !56*6000 (downsampled by 1/16)
complex ca(NFFT1),cb(NFFT1) !FFTs of raw x,y data
complex cx(0:NFFT2-1),cy(0:NFFT2-1)
parameter (MAXFFT1=5376000) !56*96000
parameter (MAXFFT2=336000) !56*6000 (downsampled by 1/16)
complex ca(MAXFFT1),cb(MAXFFT1) !FFTs of raw x,y data
complex cx(0:MAXFFT2-1),cy(0:MAXFFT2-1)
logical xpol
real*8 fcenter
character*12 mycall_12,hiscall_12
@ -13,20 +13,40 @@ subroutine qra64b(nutc,nqd,fcenter,nfcal,ikhz,mousedf,ntol,xpol, &
data nzap/3/
open(17,file='red.dat',status='unknown')
nfft1=MAXNFFT1
nfft2=MAXNFFT2
df=96000.0/NFFT1
if(nfsample.eq.95238) then
nfft1=5120000
nfft2=322560
df=96000.0/nfft1
endif
nh=nfft2/2
ikhz0=nint(1000.0*(fcenter-int(fcenter)))
k0=((ikhz-ikhz0+48.0+1.27)*1000.0+nfcal)/df
nh=nfft2/2
if(k0.lt.nh .or. k0.gt.NFFT1-nh) go to 900
if(k0.lt.nh .or. k0.gt.nfft1-nh) go to 900
fac=1.0/NFFT2
fac=1.0/nfft2
cx(0:nh)=ca(k0:k0+nh)
cx(nh+1:NFFT2-1)=ca(k0-nh+1:k0-1)
cx(nh+1:nfft2-1)=ca(k0-nh+1:k0-1)
cx=fac*cx
cy(0:nh)=cb(k0:k0+nh)
cy(nh+1:NFFT2-1)=cb(k0-nh+1:k0-1)
cy=fac*cy
if(xpol) then
cy(0:nh)=cb(k0:k0+nh)
cy(nh+1:nfft2-1)=cb(k0-nh+1:k0-1)
cy=fac*cy
endif
! Here cx and cy (if xpol) are frequency-domain data around the selected
! QSO frequency, taken from the full-length FFT computed in filbig().
! Values for fsample, nfft1, nfft2, df, and the downsampled data rate
! are as follows:
! fSample nfft1 df nfft2 fDownSampled
! (Hz) (Hz) (Hz)
!----------------------------------------------------
! 96000 5376000 0.017857143 336000 6000.000
! 95238 5120000 0.018601172 322560 5999.994
! write(60) cx,cy,nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12, &
! hiscall_12,hisgrid_6
@ -34,8 +54,8 @@ subroutine qra64b(nutc,nqd,fcenter,nfcal,ikhz,mousedf,ntol,xpol, &
if(nzap.gt.0) call qra64zap(cx,cy,xpol,nzap)
! Transform back to time domain with sample rate 6000 Hz.
call four2a(cx,NFFT2,1,-1,1)
call four2a(cy,NFFT2,1,-1,1)
call four2a(cx,nfft2,1,-1,1)
call four2a(cy,nfft2,1,-1,1)
call qra64c(cx,cy,nutc,nqd,ikhz,mousedf,ntol,xpol,mycall_12, &
hiscall_12,hisgrid_6,mode64,nwrite_qra64)

2
mainwindow.cpp
View File

@ -1,4 +1,4 @@
//--------------------------------------------------------------- MainWindow
//---------------------------------------------------------------- MainWindow
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "devsetup.h"