Merge branch 'master' of github.com:ess-dmsc/daquiri

ess-dmsc · Feb 23, 2022 · fe4fd2f · fe4fd2f
2 parents bb230ef + 25dce41
commit fe4fd2f
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 19 deletions.
diff --git a/source/daqlite/ESSConsumer.cpp b/source/daqlite/ESSConsumer.cpp
@@ -83,15 +83,16 @@ uint32_t ESSConsumer::processEV42Data(RdKafka::Message *Msg) {
       // printf("Error: invalid pixel id: %d, min: %d, max: %d\n",
       //        Pixel, mMinPixel, mMaxPixel);
       // exit(0);
-      PixelDiscard++;
+      EventDiscard++;
     } else {
+      EventAccept++;
       Pixel = Pixel - mConfig.Geometry.Offset;
       mHistogram[Pixel]++;
       Tof = std::min(Tof, mConfig.TOF.MaxValue);
       mHistogramTof[Tof * mConfig.TOF.BinSize / mConfig.TOF.MaxValue]++;
     }
   }
-  PixelCount += PixelIds->size();
+  EventCount += PixelIds->size();
   return PixelIds->size();
 }
 

diff --git a/source/daqlite/ESSConsumer.h b/source/daqlite/ESSConsumer.h
@@ -40,8 +40,12 @@ class ESSConsumer {
   std::vector<uint32_t> mHistogram;
   std::vector<uint32_t> mHistogramTofPlot;
   std::vector<uint32_t> mHistogramTof;
-  uint64_t PixelCount{0};
-  uint64_t PixelDiscard{0};
+
+  uint64_t EventCount{0};
+  uint64_t EventAccept{0};
+  uint64_t EventDiscard{0};
+
+
 
 private:
   RdKafka::Conf *mConf;

diff --git a/source/daqlite/MainWindow.cpp b/source/daqlite/MainWindow.cpp
@@ -66,21 +66,30 @@ void MainWindow::startKafkaConsumerThread() {
 }
 
 // SLOT
-void MainWindow::handleKafkaData(int EventRate) {
+void MainWindow::handleKafkaData(uint64_t ElapsedCountMS) {
+  auto Consumer = KafkaConsumerThread->consumer();
+
+  uint64_t EventRate = Consumer->EventCount * 1000ULL/ElapsedCountMS;
+  uint64_t EventAccept = Consumer->EventAccept * 1000ULL/ElapsedCountMS;
+  uint64_t EventDiscardRate = Consumer->EventDiscard * 1000ULL/ElapsedCountMS;
+
   ui->lblEventRateText->setText(QString::number(EventRate));
-  ui->lblDiscardedPixelsText->setText(
-      QString::number(KafkaConsumerThread->consumer()->PixelDiscard));
+  ui->lblAcceptRateText->setText(QString::number(EventAccept));
+  ui->lblDiscardedPixelsText->setText(QString::number(EventDiscardRate));
 
   KafkaConsumerThread->mutex.lock();
   if (!TOF) {
-    Plot2DXY->addData(KafkaConsumerThread->consumer()->mHistogramPlot);
+    Plot2DXY->addData(Consumer->mHistogramPlot);
     if (mConfig.Geometry.ZDim > 1) {
-      Plot2DXZ->addData(KafkaConsumerThread->consumer()->mHistogramPlot);
-      Plot2DYZ->addData(KafkaConsumerThread->consumer()->mHistogramPlot);
+      Plot2DXZ->addData(Consumer->mHistogramPlot);
+      Plot2DYZ->addData(Consumer->mHistogramPlot);
     }
   } else {
-    PlotTOF->addData(KafkaConsumerThread->consumer()->mHistogramTofPlot);
+    PlotTOF->addData(Consumer->mHistogramTofPlot);
   }
+  Consumer->EventCount = 0;
+  Consumer->EventAccept = 0;
+  Consumer->EventDiscard = 0;
   KafkaConsumerThread->mutex.unlock();
 }
 

diff --git a/source/daqlite/MainWindow.h b/source/daqlite/MainWindow.h
@@ -43,7 +43,7 @@ public slots:
   void handleGradientButton();
   void handleInvertButton();
   void handleAutoScaleButton();
-  void handleKafkaData(int EventRate);
+  void handleKafkaData(uint64_t ElapsedCountNS);
 
 private:
   Ui::MainWindow *ui;

diff --git a/source/daqlite/MainWindow.ui b/source/daqlite/MainWindow.ui
@@ -85,7 +85,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>Event rate:</string>
+         <string>Evts/s:</string>
         </property>
        </widget>
       </item>
@@ -102,6 +102,32 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QLabel" name="lblAcceptRate">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Accept/s:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="lblAcceptRateText">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="lblDiscardedPixels">
         <property name="sizePolicy">
@@ -111,7 +137,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-         <string>Discarded:</string>
+         <string>Discard/s:</string>
         </property>
        </widget>
       </item>

diff --git a/source/daqlite/WorkerThread.cpp b/source/daqlite/WorkerThread.cpp
@@ -15,7 +15,6 @@ void WorkerThread::run() {
   while (1) {
     auto Msg = Consumer->consume();
 
-    /// \todo return counts so we can calculate count rates
     Consumer->handleMessage(Msg);
 
     t2 = std::chrono::high_resolution_clock::now();
@@ -26,11 +25,9 @@ void WorkerThread::run() {
       Consumer->mHistogramTofPlot = Consumer->mHistogramTof;
       mutex.unlock();
 
-      uint64_t Rate =
-          (uint64_t)((Consumer->PixelCount * 1000000000ULL) / elapsed.count());
-      emit resultReady(Rate);
+      uint64_t ElapsedCountMS = elapsed.count()/1000000;
+      emit resultReady(ElapsedCountMS);
 
-      Consumer->PixelCount = 0;
       std::fill(Consumer->mHistogram.begin(), Consumer->mHistogram.end(), 0);
       std::fill(Consumer->mHistogramTof.begin(), Consumer->mHistogramTof.end(),
                 0);