From ba453131ebc4b1a4dec056cf2ac0a5ba97175b13 Mon Sep 17 00:00:00 2001 From: Joe Taylor <joe@princeton.edu> Date: Tue, 17 Oct 2023 13:59:08 -0400 Subject: [PATCH] Protect against wacky settings of nfa, nfb, in Q65 mode. --- lib/qra/q65/q65.f90 | 2 +- widgets/mainwindow.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/qra/q65/q65.f90 b/lib/qra/q65/q65.f90 index fea1fe8a6..f93fca509 100644 --- a/lib/qra/q65/q65.f90 +++ b/lib/qra/q65/q65.f90 @@ -490,12 +490,12 @@ subroutine q65_ccf_22(s1,iz,jz,nfqso,ntol,iavg,ipk,jpk, & ia=max(nint(100/df),nint((nfqso-ntol)/df)) ib=min(nint(4900/df),nint((nfqso+ntol)/df)) endif + if(ia.ge.ib) ia=ib-ntol/df !Protect against wacky settings do i=ia,ib s1avg(i)=sum(s1(i,1:jz)) enddo - call pctile(s1avg(ia:ib),ib-ia+1,40,base0) ccfbest=0. ibest=0 lagpk=0 diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp index 419f05f45..0cbb446f7 100644 --- a/widgets/mainwindow.cpp +++ b/widgets/mainwindow.cpp @@ -1683,6 +1683,7 @@ void MainWindow::dataSink(qint64 frames) int idir=-1; save_echo_params_(&nDopTotal,&nDop,&nfrit,&f1,&width,dec_data.d2,&idir); } + qDebug() << "aa" << k << frames << m_ihsym << m_hsymStop; avecho_(dec_data.d2,&nDop,&nfrit,&nauto,&navg,&nqual,&f1,&xlevel,&sigdb, &dBerr,&dfreq,&width,&m_diskData); //Don't restart Monitor after an Echo transmission