From 2ab31a663a77eabc5093f2535802c6043bf4c2b5 Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Wed, 19 Sep 2018 14:27:28 -0400
Subject: [PATCH] Updated costas to actually be a costas array. See 7x7 array
 enumeration here: http://jameskbeard.com/jameskbeard/Files.html#CostasArrays

---
 lib/ft8/foxgen.f90 | 2 +-
 lib/ft8/ft8b.f90   | 2 +-
 lib/ft8/genft8.f90 | 2 +-
 lib/ft8/sync8.f90  | 2 +-
 lib/ft8/sync8d.f90 | 2 +-
 lib/sync64.f90     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90
index 7f1e92c..a43547a 100644
--- a/lib/ft8/foxgen.f90
+++ b/lib/ft8/foxgen.f90
@@ -34,7 +34,7 @@ subroutine foxgen()
   common/foxcom/wave(NWAVE),nslots,nfreq,i3bit(5),cmsg(5),mycall(12)
   common/foxcom2/itone2(NN),msgbits2(KK)
   equivalence (x,cx),(y,cy)
-  data icos7/2,5,6,0,4,1,3/                   !Costas 7x7 tone pattern
+  data icos7/4,2,5,6,1,3,0/                   !Costas 7x7 tone pattern
 
   bcontest=.false.
   fstep=60.d0
diff --git a/lib/ft8/ft8b.f90 b/lib/ft8/ft8b.f90
index 151f75f..15a0415 100644
--- a/lib/ft8/ft8b.f90
+++ b/lib/ft8/ft8b.f90
@@ -33,7 +33,7 @@ subroutine ft8b(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly,   &
   complex csymb(32)
   logical first,newdat,lsubtract,lapon,lapcqonly,nagain
   equivalence (s1,s1sort)
-  data icos7/2,5,6,0,4,1,3/
+  data icos7/4,2,5,6,1,3,0/
   data mcq/1,1,1,1,1,0,1,0,0,0,0,0,1,0,0,0,0,0,1,1,0,0,0,1,1,0,0,1/
   data mrrr/0,1,1,1,1,1,1,0,1,1,0,0,1,1,1,1/
   data m73/0,1,1,1,1,1,1,0,1,1,0,1,0,0,0,0/
diff --git a/lib/ft8/genft8.f90 b/lib/ft8/genft8.f90
index 52dfcc9..d2e999e 100644
--- a/lib/ft8/genft8.f90
+++ b/lib/ft8/genft8.f90
@@ -15,7 +15,7 @@ subroutine genft8(msg,mygrid,bcontest,i3bit,msgsent,msgbits,itone)
   integer*1, target:: i1Msg8BitBytes(11)
   integer itone(NN)
   integer icos7(0:6)
-  data icos7/2,5,6,0,4,1,3/                   !Costas 7x7 tone pattern
+  data icos7/4,2,5,6,1,3,0/                   !Costas 7x7 tone pattern
 
   alphabet='0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-+/?.'
   
diff --git a/lib/ft8/sync8.f90 b/lib/ft8/sync8.f90
index 30f6de1..75c5ec4 100644
--- a/lib/ft8/sync8.f90
+++ b/lib/ft8/sync8.f90
@@ -17,7 +17,7 @@ subroutine sync8(dd,nfa,nfb,syncmin,nfqso,s,candidate,ncand,sbase)
   integer indx(NH1)
   integer ii(1)
   integer icos7(0:6)
-  data icos7/2,5,6,0,4,1,3/                   !Costas 7x7 tone pattern
+  data icos7/4,2,5,6,1,3,0/                   !Costas 7x7 tone pattern
   equivalence (x,cx)
 
 ! Compute symbol spectra, stepping by NSTEP steps.  
diff --git a/lib/ft8/sync8d.f90 b/lib/ft8/sync8d.f90
index d0d1c63..0cf2069 100644
--- a/lib/ft8/sync8d.f90
+++ b/lib/ft8/sync8d.f90
@@ -10,7 +10,7 @@ subroutine sync8d(cd0,i0,ctwk,itwk,sync)
   complex z1,z2,z3
   logical first
   integer icos7(0:6)
-  data icos7/2,5,6,0,4,1,3/
+  data icos7/4,2,5,6,1,3,0/
   data first/.true./
   save first,twopi,fs2,dt2,taus,baud,csync
 
diff --git a/lib/sync64.f90 b/lib/sync64.f90
index d927af9..7ed9cf8 100644
--- a/lib/sync64.f90
+++ b/lib/sync64.f90
@@ -20,7 +20,7 @@ subroutine sync64(c0,nf1,nf2,nfqso,ntol,mode64,emedelay,dtx,f0,jpk,sync,  &
   complex c1(0:NSPC-1)                       !Complex spectrum of Costas 1
   complex c2(0:NSPC-1)                       !Complex spectrum of Costas 2
   complex c3(0:NSPC-1)                       !Complex spectrum of Costas 3
-  data icos7/2,5,6,0,4,1,3/                  !Costas 7x7 tone pattern
+  data icos7/4,2,5,6,1,3,0/                  !Costas 7x7 tone pattern
   data mode64z/-1/
   save