diff --git a/qmap/libqmap/q65_sync.f90 b/qmap/libqmap/q65_sync.f90 index 5acb3118c..f693ab89b 100644 --- a/qmap/libqmap/q65_sync.f90 +++ b/qmap/libqmap/q65_sync.f90 @@ -30,11 +30,11 @@ subroutine q65_sync(ss,i0,nts_q65,ntrperiod,iseq,sync_ok,snr,xdt) do lag=0,LAGMAX !Search over range of DT do j=1,22 !Test for Q65 sync k=isync(j) + lag + iseq*200 + if(k.ge.400) cycle if(ntrperiod.eq.60) then ccf(lag)=ccf(lag) + sum(ss(k,i1:i2)) + sum(ss(k+1,i1:i2)) & + sum(ss(k+2,i1:i2)) + sum(ss(k+3,i1:i2)) else - if(k.ge.372) cycle ccf(lag)=ccf(lag) + sum(ss(k,i1:i2)) + sum(ss(k+1,i1:i2)) endif ! Q: Should we use weighted sums, perhaps a Lorentzian peak? diff --git a/qmap/libqmap/q65b.f90 b/qmap/libqmap/q65b.f90 index 69ca1c9c5..797f3686e 100644 --- a/qmap/libqmap/q65b.f90 +++ b/qmap/libqmap/q65b.f90 @@ -92,8 +92,8 @@ subroutine q65b(nutc,nqd,fcenter,nfcal,nfsample,ikhz,mousedf,ntol, & nsnr0=-99 !Default snr for no decode !### - nfa=800 - nfb=1200 +! nfa=800 +! nfb=1200 ! write(*,4001) f0,f0+31.847,nfa,nfb,ntol,ntrperiod,iseq,mode_q65 !4001 format('b',2f10.3,6i6) if(iseq.eq.1) iwave(1:360000)=iwave(360001:720000) diff --git a/qmap/mainwindow.cpp b/qmap/mainwindow.cpp index b23f54b14..1db3911bd 100644 --- a/qmap/mainwindow.cpp +++ b/qmap/mainwindow.cpp @@ -406,7 +406,7 @@ void MainWindow::dataSink(int k) // qDebug() << "aa" << m_hsymStop << ihsym << m_decode_called << k << ntrz; if(ihsym >= m_hsymStop and !m_decode_called) { //Decode at t=56 s (for Q65 and data from disk) m_decode_called=true; - qDebug() << "bb" << m_hsymStop << ihsym << m_decode_called << k << ntrz; datcom_.newdat=1; +// qDebug() << "bb" << m_hsymStop << ihsym << m_decode_called << k << ntrz; datcom_.newdat=1; datcom_.nagain=0; datcom_.nhsym=ihsym; QDateTime t = QDateTime::currentDateTimeUtc(); diff --git a/qmap/mainwindow.h b/qmap/mainwindow.h index bb65ac27e..80a95ed8e 100644 --- a/qmap/mainwindow.h +++ b/qmap/mainwindow.h @@ -114,7 +114,7 @@ private: qint32 m_dB; qint32 m_fetched=0; // qint32 m_hsymStop=371; - qint32 m_hsymStop=373; //390*0.15 = 58.5 s + qint32 m_hsymStop=390; //390*0.15 = 58.5 s qint32 m_nTransmitted=0; qint32 m_nDoubleClicked=0;