From d4ed6785fbbe2c890d8d34caf776293a70d6bf55 Mon Sep 17 00:00:00 2001
From: Joe Taylor <joe@princeton.edu>
Date: Thu, 28 Jul 2022 08:55:19 -0400
Subject: [PATCH] WIP toward processing Echo-mode data read from disk.

---
 lib/avecho.f90         | 4 +++-
 widgets/mainwindow.cpp | 7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/avecho.f90 b/lib/avecho.f90
index 04b80df65..4be682bfa 100644
--- a/lib/avecho.f90
+++ b/lib/avecho.f90
@@ -1,5 +1,5 @@
 subroutine avecho(id2,ndop,nfrit,nauto,nqual,f1,xlevel,snrdb,db_err,  &
-     dfreq,width)
+     dfreq,width,bDiskData)
 
   integer TXLENGTH
   parameter (TXLENGTH=27648)           !27*1024
@@ -15,6 +15,7 @@ subroutine avecho(id2,ndop,nfrit,nauto,nqual,f1,xlevel,snrdb,db_err,  &
   real x(NFFT)
   integer ipkv(1)
   logical ex
+  logical*1 bDiskData
   complex c(0:NH)
   equivalence (x,c),(ipk,ipkv)
   common/echocom/nclearave,nsum,blue(NZ),red(NZ)
@@ -22,6 +23,7 @@ subroutine avecho(id2,ndop,nfrit,nauto,nqual,f1,xlevel,snrdb,db_err,  &
   save dop0,sa,sb
 
   fspread=fspread_dx                !### Use the predicted Doppler spread ###
+  if(bDiskData) fspread=width
   if(nauto.eq.1) fspread=fspread_self
   inquire(file='fspread.txt',exist=ex)
   if(ex) then
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index 4b0b1a13b..199c792ff 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -157,7 +157,7 @@ extern "C" {
 
   void avecho_( short id2[], int* dop, int* nfrit, int* nauto, int* nqual, float* f1,
                 float* level, float* sigdb, float* snr, float* dfreq,
-                float* width);
+                float* width, bool* bDiskData);
 
   void fast_decode_(short id2[], int narg[], double * trperiod,
                     char msg[], char mycall[], char hiscall[],
@@ -1605,10 +1605,11 @@ void MainWindow::dataSink(qint64 frames)
       if(m_diskData) {
         int idir=-1;
         save_echo_params_(&nDop,&nfrit,&f1,&m_fSpread,dec_data.d2,&idir);
+        width=m_fSpread;
       }
-      qDebug() << "bb" << m_s6 << f1 << nfrit << nDop;
       avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&nqual,&f1,&xlevel,&sigdb,
-          &dBerr,&dfreq,&width);
+          &dBerr,&dfreq,&width,&m_diskData);
+      qDebug() << "bb" << m_s6 << f1 << nfrit << nDop << width;
       QString t;
       t = t.asprintf("%3d %7.1f %7.1f %7.1f %7.1f %7.1f %3d",echocom_.nsum,xlevel,sigdb,
                 dBerr,dfreq,width,nqual);