Interferometer (2) compile

2026-07-25 11:34:09 -04:00 · 2019-09-02 00:41:41 +02:00
parent 3e70f3b966
commit 170e1f59a7
25 changed files with 2306 additions and 966 deletions
@@ -15,31 +15,133 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.          //
 ///////////////////////////////////////////////////////////////////////////////////

+#include <QDebug>
+
+#include "dsp/downchannelizer.h"
 #include "interferometersink.h"

-InterferometerSink::InterferometerSink(InterferometerCorrelator *correlator) :
-    m_processingUnit(false),
-    m_correlator(correlator)
-{}
+
+MESSAGE_CLASS_DEFINITION(InterferometerSink::MsgConfigureChannelizer, Message)
+
+InterferometerSink::InterferometerSink() :
+    m_correlator(4096),
+    m_spectrumSink(nullptr),
+    m_scopeSink(nullptr)
+{
+    for (int i = 0; i < 2; i++)
+    {
+        m_sinks[i].setStreamIndex(i);
+        m_channelizers[i] = new DownChannelizer(&m_sinks[i]);
+        QObject::connect(
+            &m_sinkBuffers[i],
+            &SampleSinkVector::dataReady,
+            this,
+            [=](){ this->handleSinkBuffer(i); },
+            Qt::QueuedConnection
+        );
+    }
+
+    connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
+}

 InterferometerSink::~InterferometerSink()
-{}
-
-void InterferometerSink::start()
-{}
-
-void InterferometerSink::stop()
-{}
-
-void InterferometerSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, bool positiveOnly)
 {
-    (void) positiveOnly;
-    (void) begin;
-    (void) end;
+    for (int i = 0; i < 2; i++)
+    {
+        delete m_channelizers[i];
+    }
+}
+
+void InterferometerSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end, unsigned int streamIndex)
+{
+    if (streamIndex > 1) {
+        return;
+    }
+
+    m_sinkBuffers[streamIndex].write(begin, end);
+}
+
+void InterferometerSink::handleSinkBuffer(unsigned int sinkIndex)
+{
+    SampleVector::iterator vbegin;
+    SampleVector::iterator vend;
+    m_sinkBuffers[sinkIndex].read(vbegin, vend);
+    m_channelizers[sinkIndex]->feed(vbegin, vend, false);
+
+    if (sinkIndex == 1) {
+        run();
+    }
+}
+
+void InterferometerSink::run()
+{
+    m_correlator.performCorr(m_sinks[0].getData(), m_sinks[1].getData());
+
+    if (m_scopeSink) {
+        m_scopeSink->feed(m_correlator.m_tcorr.begin(), m_correlator.m_tcorr.begin() + m_correlator.m_processed, false);
+    }
+
+    if (m_spectrumSink)
+    {
+        if (m_correlator.getCorrType() == InterferometerSettings::CorrelationCorrelation) {
+            m_spectrumSink->feed(m_correlator.m_scorr.begin(), m_correlator.m_scorr.begin() + m_correlator.m_processed, false);
+        } else {
+            m_spectrumSink->feed(m_correlator.m_tcorr.begin(), m_correlator.m_tcorr.begin() + m_correlator.m_processed, false);
+        }
+    }
+
+    if (m_correlator.m_remaining != 0)
+    {
+        for (int i = 0; i < 2; i++)
+        {
+            std::copy(
+                m_sinks[i].getData().begin() + m_correlator.m_processed,
+                m_sinks[i].getData().begin() + m_correlator.m_processed + m_correlator.m_remaining,
+                m_sinks[i].getData().begin()
+            );
+        }
+    }
+
+    m_sinks[0].setDataStart(m_correlator.m_remaining);
+    m_sinks[1].setDataStart(m_correlator.m_remaining);
+}
+
+void InterferometerSink::handleInputMessages()
+{
+	Message* message;
+
+	while ((message = m_inputMessageQueue.pop()) != 0)
+	{
+		if (handleMessage(*message))
+		{
+			delete message;
+		}
+	}
 }

 bool InterferometerSink::handleMessage(const Message& cmd)
 {
-    (void) cmd;
-    return false;
+    if (MsgConfigureChannelizer::match(cmd))
+    {
+        MsgConfigureChannelizer& cfg = (MsgConfigureChannelizer&) cmd;
+        int log2Decim = cfg.getLog2Decim();
+        int filterChainHash = cfg.getFilterChainHash();
+
+        qDebug() << "InterferometerSink::handleMessage: MsgConfigureChannelizer:"
+                << " log2Decim: " << log2Decim
+                << " filterChainHash: " << filterChainHash;
+
+        for (int i = 0; i < 2; i++)
+        {
+            m_channelizers[i]->set(m_channelizers[i]->getInputMessageQueue(),
+                log2Decim,
+                filterChainHash);
+        }
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
 }