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

Don't fit pol'n angle when solving for dphi.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2538 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2012-08-29 14:42:59 +00:00
parent 3c6ba78445
commit 92478063f7
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libm65/afc65b.f
View File

@ -1,5 +1,5 @@
subroutine afc65b(cx,cy,npts,fsample,nflip,ipol,xpol,a, subroutine afc65b(cx,cy,npts,fsample,nflip,ipol,xpol,ndphi,iloop,
+ ccfbest,dtbest) + a,ccfbest,dtbest)
logical xpol logical xpol
complex cx(npts) complex cx(npts)
@ -17,9 +17,12 @@
deltaa(5)=0.05 deltaa(5)=0.05
nterms=3 nterms=3
if(xpol) nterms=4 if(xpol) nterms=4
chisqr=0.
C Start the iteration ! Don't fit polarization when solving for dphi
if(ndphi.ne.0) nterms=3
! Start the iteration
chisqr=0.
chisqr0=1.e6 chisqr0=1.e6
do iter=1,3 !One iteration is enough? do iter=1,3 !One iteration is enough?
do j=1,nterms do j=1,nterms

6
libm65/decode1a.f
View File

@ -1,5 +1,5 @@
subroutine decode1a(dd,newdat,f0,nflip,mode65,nfsample,xpol, subroutine decode1a(dd,newdat,f0,nflip,mode65,nfsample,xpol,
+ mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi, + mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi,iloop,
+ nutc,nkhz,ndf,ipol,sync2,a,dt,pol,nkv,nhist,qual,decoded) + nutc,nkhz,ndf,ipol,sync2,a,dt,pol,nkv,nhist,qual,decoded)
! Apply AFC corrections to a candidate JT65 signal, then decode it. ! Apply AFC corrections to a candidate JT65 signal, then decode it.
@ -70,8 +70,8 @@
! factor of 1/8, say? Should be a significant execution speed-up. ! factor of 1/8, say? Should be a significant execution speed-up.
call timer('afc65b ',0) call timer('afc65b ',0)
! Best fit for DF, f1, f2, pol ! Best fit for DF, f1, f2, pol
call afc65b(c5x(i0),c5y(i0),nz,fsample,nflip,ipol,xpol,a, call afc65b(c5x(i0),c5y(i0),nz,fsample,nflip,ipol,xpol,
+ ccfbest,dtbest) + ndphi,iloop,a,ccfbest,dtbest)
call timer('afc65b ',1) call timer('afc65b ',1)
pol=a(4)/57.2957795 pol=a(4)/57.2957795

5
libm65/map65a.f90
View File

@ -204,8 +204,9 @@ subroutine map65a(dd,ss,savg,newdat,nutc,fcenter,ntol,idphi,nfa,nfb, &
ikHz=nint(freq+0.5*(nfa+nfb)-foffset)-nfshift ikHz=nint(freq+0.5*(nfa+nfb)-foffset)-nfshift
idf=nint(1000.0*(freq+0.5*(nfa+nfb)-foffset-(ikHz+nfshift))) idf=nint(1000.0*(freq+0.5*(nfa+nfb)-foffset-(ikHz+nfshift)))
call decode1a(dd,newdat,f00,nflip,mode65,nfsample,xpol, & call decode1a(dd,newdat,f00,nflip,mode65,nfsample,xpol, &
mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi, & mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi, &
nutc,ikHz,idf,ipol,sync2,a,dt,pol,nkv,nhist,qual,decoded) iloop,nutc,ikHz,idf,ipol,sync2,a,dt,pol,nkv,nhist, &
qual,decoded)
dt=dt+0.8 !### empirical tweak dt=dt+0.8 !### empirical tweak
call timer('decode1a',1) call timer('decode1a',1)

2
mainwindow.cpp
View File

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