From ca5bc0e86bb2a6f43ad077feeef90612f69577b5 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Wed, 7 Feb 2024 14:24:05 -0500
Subject: [PATCH] WIP on sfoxtest.

---
 lib/superfox/hard_symbols.f90 |  2 +-
 lib/superfox/rs_sf.c          | 16 +++---------
 lib/superfox/sfoxtest.f90     | 48 ++++++++++++++++-------------------
 3 files changed, 26 insertions(+), 40 deletions(-)

diff --git a/lib/superfox/hard_symbols.f90 b/lib/superfox/hard_symbols.f90
index 1ba7d7ca9..ad800866f 100644
--- a/lib/superfox/hard_symbols.f90
+++ b/lib/superfox/hard_symbols.f90
@@ -28,7 +28,7 @@ subroutine hard_symbols(crcvd,f,t,jdat)
         jdat(n)=ipk(1)+256-64
      endif
   enddo
-  jdat(NN-1:nn)=0
+!  jdat(NN-1:nn)=0
 
   return
 end subroutine hard_symbols
diff --git a/lib/superfox/rs_sf.c b/lib/superfox/rs_sf.c
index 7634f62e4..3a8fd81bf 100644
--- a/lib/superfox/rs_sf.c
+++ b/lib/superfox/rs_sf.c
@@ -21,20 +21,10 @@ void rs_init_sf_(int *mm, int *nq, int *nn0, int *kk0, int *nfz)
   first=0;
 }
 
-void rs_encode_sf_(int *dgen, int *sent)
-// Encode the information symbols dgen[KK], producing channel symbols sent[NN].
+void rs_encode_sf_(int *msg, int *parsym)
+// Encode information symbols msg[KK], producing parity symbols parsym[nroots].
 {
-  int b[256];                    //These are the parity symbols
-  encode_rs_sf(rs_sf,dgen,b);    //Compute the parity symbols
-
-// Copy parity symbols into sent[] array, followed by information symbols
-  for (int i=0; i< nn; i++) {
-    if(i<nroots) {
-      sent[i]=b[i];
-    } else {
-      sent[i]=dgen[i-nroots];
-    }
-  }
+  encode_rs_sf(rs_sf,msg,parsym);    //Compute the parity symbols
 }
 
 void rs_decode_sf_(int *recd, int *era_pos, int *numera, int *nerr)
diff --git a/lib/superfox/sfoxtest.f90 b/lib/superfox/sfoxtest.f90
index 64a8294aa..bafe20d69 100644
--- a/lib/superfox/sfoxtest.f90
+++ b/lib/superfox/sfoxtest.f90
@@ -12,13 +12,15 @@ program sfoxtest
   complex clo(NMAX)                      !Complex Local Oscillator
   complex cnoise(NMAX)                   !Complex noise
   complex crcvd(NMAX)                    !Signal as received
-  integer imsg(KK)                       !Information symbols
-  integer jmsg(KK)                       !Decoded information
-  integer*1 imsg1(7*KK)                  !Copy of imsg in 1-bit i*1 format
-  integer idat(NN)                       !Encoded data, 7-bit integers
-  integer jdat(NN)                       !Recovered hard-decision symbols
+  integer msg0(KK)                       !Information symbols
+!  integer msg(KK)                        !Decoded information
+  integer parsym(NN-KK)                  !Parity symbols
+!  integer*1 msg1(MM*KK)                  !Copy of msg0 in 1-bit i*1 format
+  integer chansym0(NN)                   !Encoded data, 7-bit integers
+  integer chansym(NN)                    !Recovered hard-decision symbols
+  integer iera(NN)
   character fname*17,arg*12
-  character c357*357,c14*14 !,chkmsg*15
+!  character c357*357,c14*14 !,chkmsg*15
   
   nargs=iargc()
   if(nargs.ne.8) then
@@ -51,23 +53,19 @@ program sfoxtest
   bandwidth_ratio=2500.0/6000.0
 
 ! Generate a message
+  msg0=0
   do i=1,KK-2
-     imsg(i)=i
+     msg0(i)=i
   enddo
-
-! Append a 14-bit CRC
-  imsg(KK-1:KK)=0
-  write(c357,'(51b7.7)') imsg(1:KK)
-  read(c357,'(357i1)') imsg1
-  call get_crc14(imsg1,7*KK,ncrc0)
-  write(c14,'(b14.14)') ncrc0
-  read(c14,'(2b7.7)') imsg(KK-1:KK)
+! Append a CRC here ...
 
   call rs_init_sf(MM,NQ,NN,KK,NFZ)          !Initialize the Karn codec
-  call rs_encode_sf(imsg,idat)              !Encode imsg into idat
-  
+  call rs_encode_sf(msg0,parsym)            !Compute parity symbols
+  chansym0(1:kk)=msg0(1:kk)
+  chansym0(kk+1:nn)=parsym(1:nn-kk)
+
 ! Generate cdat (SuperFox waveform) and clo (LO for sync detection)
-  call gen_sfox(idat,f0,fsample,syncwidth,cdat,clo)
+  call gen_sfox(chansym0,f0,fsample,syncwidth,cdat,clo)
 
   do isnr=0,-30,-1
      snr=isnr
@@ -95,7 +93,7 @@ program sfoxtest
         if(f0.eq.0.0) then
            f1=1500.0 + 200.0*(ran1(idummy)-0.5)
            xdt=2.0*(ran1(idummy)-0.5)
-           call gen_sfox(idat,f1,fsample,syncwidth,cdat,clo)
+           call gen_sfox(chansym0,f1,fsample,syncwidth,cdat,clo)
         endif
         
         crcvd=0.
@@ -115,16 +113,13 @@ program sfoxtest
         terr=t-xdt
         if(abs(ferr).lt.5.0 .and. abs(terr).lt.0.01) ngoodsync=ngoodsync+1
 
-        call hard_symbols(crcvd,f,t,jdat)           !Get hard symbol values
+        call hard_symbols(crcvd,f,t,chansym)           !Get hard symbol values
         nera=0
-        call rs_decode_sf(idat,iera,nera,jmsg,nfixed)  !Call the decoder
-        write(c357,'(51b7.7)') jmsg(1:KK)
-        read(c357,'(357i1)') imsg11
-        call get_crc14(imsg1,7*KK,ncrc)
-
-        nharderr=count(jdat.ne.idat)                !Count hard errors
+        chansym=mod(chansym,nq)                        !Enforce 0 to nq-1
+        nharderr=count(chansym.ne.chansym0)            !Count hard errors
         ntot=ntot+nharderr
         nworst=max(nworst,nharderr)
+        call rs_decode_sf(chansym,iera,nera,nfixed)    !Call the decoder
   
         if(snrdb.ne.0) then
            fname='000000_000001.wav'
@@ -146,6 +141,7 @@ program sfoxtest
 !        write(13,1200) ifile,snr,ferr,terr,nharderr
 !1200    format(i5,3f10.3,i5)
      enddo  ! ifile
+!     print*,'D'
      fgoodsync=float(ngoodsync)/nfiles
      fgood=float(ngood)/nfiles
      if(isnr.eq.0) write(*,1300)