From 865d52d5147b167602d5fa5dc538bcec0b2ddb22 Mon Sep 17 00:00:00 2001
From: Steven Franke <s.j.franke@icloud.com>
Date: Mon, 15 Jun 2015 01:34:32 +0000
Subject: [PATCH] More progress on signal subtraction.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5614 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
---
 lib/wsprd/wsprd_exp.c     | 32 +++++++++++++++++++++++++-------
 lib/wsprd/wsprsim_utils.c |  2 +-
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/wsprd/wsprd_exp.c b/lib/wsprd/wsprd_exp.c
index 02fb3e10b..ed7e982d2 100644
--- a/lib/wsprd/wsprd_exp.c
+++ b/lib/wsprd/wsprd_exp.c
@@ -334,13 +334,12 @@ void subtract_signal(double *id, double *qd, long np,
     int i, j, k;
     double pi=4.*atan(1.0),twopidt, fp;
     
-    double i0[162],q0[162];
+    double i0,q0;
     double c0[256],s0[256];
     double dphi, cdphi, sdphi;
     
     twopidt=2*pi*dt;
     
-    printf("subtract_signal f0: %f shift0: %d drift0: %f\n",f0,shift0,drift0);
     for (i=0; i<162; i++) {
         fp = f0 + ((float)drift0/2.0)*((float)i-81.0)/81.0;
         
@@ -355,17 +354,36 @@ void subtract_signal(double *id, double *qd, long np,
                 s0[j]=c0[j-1]*sdphi + s0[j-1]*cdphi;
             }
         
-        i0[i]=0.0; q0[i]=0.0;
+        i0=0.0; q0=0.0;
         
         for (j=0; j<256; j++) {
             k=shift0+i*256+j;
             if( (k>0) & (k<np) ) {
-                i0[i]=i0[i] + id[k]*c0[j] + qd[k]*s0[j];
-                q0[i]=q0[i] - id[k]*s0[j] + qd[k]*c0[j];
+                i0=i0 + id[k]*c0[j] + qd[k]*s0[j];
+                q0=q0 - id[k]*s0[j] + qd[k]*c0[j];
             }
         }
 
-// subtract the signal here.
+        // subtract the signal here.
+
+        i0=i0/256.0;
+        q0=q0/256.0;
+        double p0=i0*i0+q0*q0;
+        double is=0, qs=0;
+        
+        for (j=0; j<256; j++) {
+            k=shift0+i*256+j;
+            if( (k>0) & (k<np) ) {
+                id[k]=id[k]- (i0*c0[j] - q0*s0[j]);
+                qd[k]=qd[k]- (q0*c0[j] + i0*s0[j]);
+                is=is+id[k];
+                qs=qs+qd[k];
+            }
+        }
+        is=is/256.0;
+        qs=qs/256.0;
+        double p1=is*is+qs*qs;
+//        printf("symbol %d i0: %f q0: %f is: %f qs: %f\n",i,i0,q0,is,qs);
         
     }
     
@@ -1015,7 +1033,7 @@ int main(int argc, char *argv[])
     }
     
     char c2filename[15];
-    double carrierfreq=10.1387;
+    double carrierfreq=dialfreq;
     int wsprtype=2;
     strcpy(c2filename,"000000_0001.c2");
     printf("Writing %s\n",c2filename);
diff --git a/lib/wsprd/wsprsim_utils.c b/lib/wsprd/wsprsim_utils.c
index 366ce1703..19c8de766 100644
--- a/lib/wsprd/wsprsim_utils.c
+++ b/lib/wsprd/wsprsim_utils.c
@@ -297,7 +297,7 @@ int get_wspr_channel_symbols(char* rawmessage, unsigned char* symbols) {
     signed char check_data[11];
     memcpy(check_data,data,sizeof(char)*11);
     unpk_(check_data,hashtab,check_call_loc_pow,check_callsign);
-    printf("Will decode as: %s\n",check_call_loc_pow);
+//    printf("Will decode as: %s\n",check_call_loc_pow);
     
     unsigned int nbytes=11; // The message with tail is packed into 11 bytes.
     unsigned int nencoded=162;