From 92478063f799b43a821032af3d860fc37e60de81 Mon Sep 17 00:00:00 2001
From: Joe Taylor <k1jt@arrl.org>
Date: Wed, 29 Aug 2012 14:42:59 +0000
Subject: [PATCH] Don't fit pol'n angle when solving for dphi.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2538 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 libm65/afc65b.f   | 11 +++++++----
 libm65/decode1a.f |  6 +++---
 libm65/map65a.f90 |  5 +++--
 mainwindow.cpp    |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/libm65/afc65b.f b/libm65/afc65b.f
index d2e3a0823..7bf9c1d31 100644
--- a/libm65/afc65b.f
+++ b/libm65/afc65b.f
@@ -1,5 +1,5 @@
-      subroutine afc65b(cx,cy,npts,fsample,nflip,ipol,xpol,a,
-     +  ccfbest,dtbest)
+      subroutine afc65b(cx,cy,npts,fsample,nflip,ipol,xpol,ndphi,iloop,
+     +  a,ccfbest,dtbest)
 
       logical xpol
       complex cx(npts)
@@ -17,9 +17,12 @@
       deltaa(5)=0.05
       nterms=3
       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
       do iter=1,3                               !One iteration is enough?
          do j=1,nterms
diff --git a/libm65/decode1a.f b/libm65/decode1a.f
index 5102a7a7c..c4c235bcc 100644
--- a/libm65/decode1a.f
+++ b/libm65/decode1a.f
@@ -1,5 +1,5 @@
       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)
 
 !  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.
       call timer('afc65b  ',0)
 ! Best fit for DF, f1, f2, pol
-      call afc65b(c5x(i0),c5y(i0),nz,fsample,nflip,ipol,xpol,a,
-     +     ccfbest,dtbest)
+      call afc65b(c5x(i0),c5y(i0),nz,fsample,nflip,ipol,xpol,
+     +     ndphi,iloop,a,ccfbest,dtbest)
       call timer('afc65b  ',1)
 
       pol=a(4)/57.2957795
diff --git a/libm65/map65a.f90 b/libm65/map65a.f90
index 282b65836..da7a9d2e8 100644
--- a/libm65/map65a.f90
+++ b/libm65/map65a.f90
@@ -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
                  idf=nint(1000.0*(freq+0.5*(nfa+nfb)-foffset-(ikHz+nfshift)))
                  call decode1a(dd,newdat,f00,nflip,mode65,nfsample,xpol,  &
-                      mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,        &
-                      nutc,ikHz,idf,ipol,sync2,a,dt,pol,nkv,nhist,qual,decoded)
+                      mycall,hiscall,hisgrid,neme,ndepth,nqd,dphi,ndphi,  &
+                      iloop,nutc,ikHz,idf,ipol,sync2,a,dt,pol,nkv,nhist,  &
+                      qual,decoded)
                  dt=dt+0.8                           !### empirical tweak
                  call timer('decode1a',1)
 
diff --git a/mainwindow.cpp b/mainwindow.cpp
index ce8ddc3bf..ff9918212 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,4 +1,4 @@
-//--------------------------------------------------------------- MainWindow
+//-------------------------------------------------------------- MainWindow
 #include "mainwindow.h"
 #include "ui_mainwindow.h"
 #include "devsetup.h"