Merge pull request #10 from tnowotny/development

Bugfixes & performance monitor

Author: tnowotny

StdpC.pro

@@ -66,7 +66,8 @@ FORMS += $$PWD/src/gui/MainWin.ui \
     $$PWD/src/gui/ComponentFactoryWidget.ui \
     $$PWD/src/gui/DaqWidget.ui \
     $$PWD/src/gui/DaqFactoryWidget.ui \
-    $$PWD/src/gui/SpikeGenDlg.ui
+    $$PWD/src/gui/SpikeGenDlg.ui \
+    $$PWD/src/gui/PerformanceMonitor.ui
 
 HEADERS += \
     $$PWD/src/include/Mainwin.h \
@@ -133,7 +134,8 @@ HEADERS += \
     $$PWD/src/include/Model.h \
     $$PWD/src/include/ModelOpts.h \
     $$PWD/src/include/ModelDlg.h \
-    $$PWD/src/include/Util.h
+    $$PWD/src/include/Util.h \
+    $$PWD/src/include/PerformanceMonitor.h
 
 SOURCES += $$PWD/src/core/Main.cpp \
     $$PWD/src/gui/MainWin.cpp \
@@ -191,7 +193,8 @@ SOURCES += $$PWD/src/core/Main.cpp \
     $$PWD/src/models/Model.cpp \
     $$PWD/src/gui/ModelOpts.cpp \
     $$PWD/src/gui/DaqOpts.cpp \
-    $$PWD/src/core/Util.cpp
+    $$PWD/src/core/Util.cpp \
+    $$PWD/src/gui/PerformanceMonitor.cpp
 
 LIBS += $$PWD/staticlib/pt_ioctl_tn.a
 

manual/manual.pdf

@@ -1543,6 +1543,16 @@ \subsection{Data display}
 but data will continue to be gathered until the clamp cycle is stopped.
 \end{myitem}
 
+\subsection{Performance monitor}
+The performance monitor is a valuable diagnostic tool which displays the
+average clamp cycle duration, as well as best and worst case markers. The performance
+monitor has two control elements; a checkbox to enable the monitor, and an input to
+set the sampling interval. Worst case, best case and mean cycle duration are all
+computed with regards to the sampling interval. \\[0.2cm]
+\parbox{\textwidth}{
+	\includegraphics[scale=0.6]{performanceMonitor}
+} \\[0.2cm]
+
 
 \section{Experiment automation} \label{scriptsect}
 

manual/manual.tex

@@ -17,7 +17,8 @@ ChannelIndex::ChannelIndex() :
     daqClass(""),
     devID(0),
     isInChn(true),
-    chanID(0)
+    chanID(0),
+    isLegacy(false)
 {
 
 }
@@ -31,7 +32,8 @@ ChannelIndex::ChannelIndex(DAQProxy *proxy, size_t devID, size_t chanID, bool is
     daqClass(proxy->daqClass()),
     devID(devID),
     isInChn(isInChn),
-    chanID(chanID)
+    chanID(chanID),
+    isLegacy(false)
 {}
 
 ChannelIndex::ChannelIndex(ModelProxy *proxy, size_t modelID) :
@@ -42,7 +44,8 @@ ChannelIndex::ChannelIndex(ModelProxy *proxy, size_t modelID) :
     modelClass(proxy->modelClass()),
     modelID(modelID),
     instID(0),
-    isAnalog(false)
+    isAnalog(false),
+    isLegacy(false)
 {}
 
 ChannelIndex::ChannelIndex(ModelProxy *proxy, size_t modelID, size_t instID) :
@@ -53,7 +56,8 @@ ChannelIndex::ChannelIndex(ModelProxy *proxy, size_t modelID, size_t instID) :
     modelClass(proxy->modelClass()),
     modelID(modelID),
     instID(instID),
-    isAnalog(false)
+    isAnalog(false),
+    isLegacy(false)
 {}
 
 ChannelIndex ChannelIndex::toInstance(size_t instID) const
@@ -128,57 +132,6 @@ std::ostream &operator<<(std::ostream &os, const ChannelIndex &dex)
     return os;
 }
 
-static void legacyRescue_0(QString str, ChannelIndex &dex)
-{
-    // Attempt legacy rescue
-    // Caveats: - inChn/outChn is unknowable; uses heuristics
-    //          - Graph channels are likely to fail
-    //          - Explicit NONE on pre-2016 collapses onto SG
-    bool ok = false;
-    int ch = str.toInt(&ok);
-    if ( !ok )
-        return;
-    DAQData *d =& DeviceManager::Register()[LEGACY_DAQ_CLASS]->param(0);
-    dex.daqClass = LEGACY_DAQ_CLASS;
-    dex.devID = 0;
-    if ( ch >= 0 && ch <= (int)(d->inChn.size()+d->outChn.size()+1) ) { // Pre-2016
-        dex.chanID = ch;
-        if ( ch < (int) d->inChn.size() && ch < (int)d->outChn.size() ) {
-            dex.isAnalog = true;
-            dex.isInChn = d->inChn.size() > d->outChn.size(); // Statistically...
-        } else if ( d->inChn.size() >= d->outChn.size() && ch < (int)d->inChn.size() ) {
-            dex.isAnalog = true;
-            dex.isInChn = true;
-        } else if ( d->inChn.size() < d->outChn.size() && ch < (int)d->outChn.size() ) {
-            dex.isAnalog = true;
-            dex.isInChn = false;
-        } else {
-            dex.isNone = true;
-        }
-        dex.isValid = true; // One hopes.
-    } else if ( ch == -1 ) { // 2016-RC1 : None
-        dex.isNone = true;
-        dex.isValid = true;
-    } else if ( ch == 1000 ) { // 2016-RC1 : SG
-        dex.isVirtual = true;
-        dex.modelClass = "SG";
-        dex.modelID = 0;
-        dex.instID = 0;
-        dex.isValid = true;
-    } else if ( ch >= 1100000000 ) { // 2016-RC1 : HH Proto
-        dex.isPrototype = true;
-        dex.modelClass = "HH";
-        dex.modelID = ((ch - 1100000000) / 100000) - 1;
-        dex.isValid = true;
-    } else if ( ch >= 100000000 ) { // 2016-RC1 : HH Inst
-        dex.isVirtual = true;
-        dex.modelClass = "HH";
-        dex.modelID = ((ch - 100000000) / 100000) - 1;
-        dex.instID = ch % 100000;
-        dex.isValid = true;
-    }
-}
-
 std::istream &operator>>(std::istream &is, ChannelIndex &dex)
 {
     ChannelIndex blank;
@@ -236,7 +189,8 @@ std::istream &operator>>(std::istream &is, ChannelIndex &dex)
         dex.instID = parts.at(3).toUInt();
         dex.isValid = true;
     } else if ( parts.size() == 1 && LOADED_PROTOCOL_VERSION == 0 ) {
-        legacyRescue_0(str, dex);
+        dex.isLegacy = true;
+        dex.chanID = parts.at(0).toInt();
     } else if ( parts.size() == 1 && LOADED_PROTOCOL_VERSION < 3 ) {
         if ( !parts.at(0).compare("SpikeGen", Qt::CaseInsensitive) ) {
             dex.isVirtual = true;
@@ -258,5 +212,6 @@ bool operator==(ChannelIndex const& a, ChannelIndex const& b)
             (!a.isPrototype || (a.modelClass==b.modelClass && a.modelID==b.modelID)) &&
             (!a.isVirtual || (a.modelClass==b.modelClass && a.modelID==b.modelID && a.instID==b.instID)) &&
             a.isAnalog==b.isAnalog &&
-            (!a.isAnalog || (a.daqClass==b.daqClass && a.devID==b.devID && a.isInChn==b.isInChn && a.chanID==b.chanID));
+            (!a.isAnalog || (a.daqClass==b.daqClass && a.devID==b.devID && a.isInChn==b.isInChn && a.chanID==b.chanID)) &&
+            a.isLegacy == b.isLegacy;
 }

manual/performanceMonitor.eps

@@ -7,9 +7,11 @@
 #include "DeviceManager.h"
 #include "ModelManager.h"
 #include "GraphDlg.h"
+#include "PerformanceMonitor.h"
 
 DCThread::DCThread() :
-    graph(nullptr)
+    graph(nullptr),
+    perfmon(nullptr)
 {
   stopped= true;
   finished= true;
@@ -41,6 +43,14 @@ void DCThread::setGraph(GraphDlg *g, double dt)
     }
 }
 
+void DCThread::setPerformanceMonitor(PerformanceMonitor *pt, double dt)
+{
+    if ( stopped ) {
+        perfmon = pt;
+        perfDt = dt;
+    }
+}
+
 void DCThread::setup_and_go()
 {
    // Initialise devices
@@ -235,6 +245,7 @@ void DCThread::run()
 {
    int rateCounter = 0;
    double lastRateReport = 0.;
+   PerformanceMonitor::DataPoint perfData { 0, 0, perfDt, 0 };
    static int i;
    static double evt;
    bool SampleHoldOn= false;
@@ -448,6 +459,22 @@ void DCThread::run()
              rateCounter = 0;
          }
 
+         // Performance monitor
+         if ( perfmon ) {
+             ++perfData.n;
+             if ( dt < perfData.minDt )
+                 perfData.minDt = dt;
+             if ( dt > perfData.maxDt )
+                 perfData.maxDt = dt;
+             if ( t - perfData.t > perfDt ) {
+                 perfData.t = t;
+                 perfmon->q.push(perfData);
+                 // Set min, max to mean rather than boundary to reduce initial flurry of updates
+                 perfData.minDt = perfData.maxDt = perfDt / perfData.n;
+                 perfData.n = 0;
+             }
+         }
+
          // Scripting
          if (t >= evt) { // event needs doing
            scrIter->second();

src/core/AP.cpp

@@ -14,6 +14,7 @@ std::vector<mhHHData> mhHHp;
 std::vector<abHHData> abHHp;
 
 PlotData Plotp;
+PerformanceMonitorData PerfMonp;
 
 dataSavingParams dataSavingPs;
 

src/core/ChannelIndex.cpp

@@ -204,6 +204,8 @@ void MyMainWindow::StartButClicked()
 
   if ( !ui->graphtab->startPlotting(DCT) )
       ui->tabWidget->setTabEnabled(1, false);
+  if ( !ui->performancetab->startPlotting(DCT) )
+      ui->tabWidget->setTabEnabled(2, false);
   rateIndicator->setText("Started");
   DCT->setup_and_go();
 }
@@ -224,7 +226,9 @@ void MyMainWindow::StopButClicked()
     DisplayMessage(QString("Main: Dynamic Clamp stopped."));
   }
   ui->graphtab->stopPlotting();
+  ui->performancetab->stopPlotting();
   ui->tabWidget->setTabEnabled(1, true);
+  ui->tabWidget->setTabEnabled(2, true);
 }
 
 void MyMainWindow::exportData(bool ignoreDAQ)
@@ -234,6 +238,7 @@ void MyMainWindow::exportData(bool ignoreDAQ)
   ui->DAQTable->exportData(ignoreDAQ);
   DSDlg->exportData();
   ui->graphtab->exportData();
+  ui->performancetab->exportData();
 }
 
 void MyMainWindow::importData()
@@ -243,6 +248,7 @@ void MyMainWindow::importData()
   ui->currentTable->importData();
   DSDlg->importData();
   ui->graphtab->importData();
+  ui->performancetab->importData();
   updateStartButton();
 }
 

src/core/DCThread.cpp

@@ -361,6 +361,11 @@
         <string>Graph</string>
        </attribute>
       </widget>
+      <widget class="PerformanceMonitor" name="performancetab">
+       <attribute name="title">
+        <string>Performance</string>
+       </attribute>
+      </widget>
      </widget>
     </item>
     <item row="1" column="0" colspan="2">
@@ -515,6 +520,12 @@
    <header>GraphDlg.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>PerformanceMonitor</class>
+   <extends>QWidget</extends>
+   <header>PerformanceMonitor.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>StartBut</tabstop>