Index: /trunk/FACT++/gui/FactGui.h =================================================================== --- /trunk/FACT++/gui/FactGui.h (revision 11199) +++ /trunk/FACT++/gui/FactGui.h (revision 11200) @@ -383,5 +383,4 @@ DimStampedInfo fDimFtmCounter; - DimStampedInfo fDimFadFiles; DimStampedInfo fDimFadRuns; DimStampedInfo fDimFadEvents; @@ -390,4 +389,5 @@ DimStampedInfo fDimFadConnections; DimStampedInfo fDimFadFwVersion; + DimStampedInfo fDimFadRunNumber; DimStampedInfo fDimFadDNA; DimStampedInfo fDimFadStatus; @@ -930,18 +930,14 @@ // ===================== FAD ============================================ - void handleFadFiles(const DimData &d) - { - if (!CheckSize(d, 8)) - return; - - fEvtBuilderOpenFiles->setValue(d.get()); - } - void handleFadRuns(const DimData &d) { - if (!CheckSize(d, 4)) - return; - - fEvtsRunMax->setValue(d.get()); + if (!CheckSize(d, 12)) + return; + + const uint32_t *ptr = d.ptr(); + + fEvtBldRunNumberMin->setValue(ptr[1]); + fEvtBldRunNumberMax->setValue(ptr[2]); + fEvtBldOpenFiles->setValue(ptr[0]); } @@ -1078,32 +1074,27 @@ fFadConnections.assign(ptr, ptr+40); } -/* - template - bool CheckConsistency(const T *v) - { - for (int i=1; i<40; i++) - if (fFadConnections[i]==10 && v[i]!=v[0]) - return false; - - return true; - } - - template - T GetFirst(const T *v) - { - for (int i=0; i<40; i++) - if (fFadConnections[i]==9) - return v[i]; - - return T(); - } - */ - void handleFadFwVersion(const DimData &d) - { - if (!CheckSize(d, 43*sizeof(float))) - return; - - const float *ptr = d.ptr(); - fFadFwVersion->setValue(ptr[1]); + + template + void handleFadMinMax(const DimData &d, QPushButton *led, S *wmin, S *wmax=0) + { + if (!CheckSize(d, 42*sizeof(T))) + return; + + const T *ptr = d.ptr(); + const T min = ptr[40]; + const T max = ptr[41]; + + if (maxsetValue(0); + else + wmin->setValue(min); + + if (wmax) + wmax->setValue(max); ostringstream tip; @@ -1117,12 +1108,20 @@ tip << "" << c << ""; for (int b=0; b<10; b++) - tip << "" << ptr[c*10+b+3] << ""; + tip << "" << ptr[c*10+b] << ""; tip << ""; } tip << ""; - fFadFwVersion->setToolTip(tip.str().c_str()); - - SetLedColor(fFadLedFwVersion, d.qos?kLedGreen:kLedOrange, d.time); + led->setToolTip(tip.str().c_str()); + } + + void handleFadFwVersion(const DimData &d) + { + handleFadMinMax(d, fFadLedFwVersion, fFadFwVersion); + } + + void handleFadRunNumber(const DimData &d) + { + handleFadMinMax(d, fFadLedRunNumber, fFadRunNumber); } @@ -1199,6 +1198,4 @@ SetFadLed(fFadLedSocket, d, FAD::EventHeader::kSock17); SetFadLed(fFadLedPllLock, d, 0xf000); - - } @@ -2001,6 +1998,6 @@ return PostInfoHandler(&FactGui::handleLoggerStats); - if (getInfo()==&fDimFadFiles) - return PostInfoHandler(&FactGui::handleFadFiles); +// if (getInfo()==&fDimFadFiles) +// return PostInfoHandler(&FactGui::handleFadFiles); if (getInfo()==&fDimFadConnections) @@ -2009,4 +2006,7 @@ if (getInfo()==&fDimFadFwVersion) return PostInfoHandler(&FactGui::handleFadFwVersion); + + if (getInfo()==&fDimFadRunNumber) + return PostInfoHandler(&FactGui::handleFadRunNumber); if (getInfo()==&fDimFadDNA) @@ -2065,6 +2065,6 @@ return PostInfoHandler(&FactGui::handleFtmError); - if (getInfo()==&fDimFadFiles) - return PostInfoHandler(&FactGui::handleFadFiles); +// if (getInfo()==&fDimFadFiles) +// return PostInfoHandler(&FactGui::handleFadFiles); for (map::iterator i=fServices.begin(); i!=fServices.end(); i++) @@ -2450,5 +2450,4 @@ fDimFtmDynamicData ("FTM_CONTROL/DYNAMIC_DATA", (void*)NULL, 0, this), fDimFtmCounter ("FTM_CONTROL/COUNTER", (void*)NULL, 0, this), - fDimFadFiles ("FAD_CONTROL/FILES", (void*)NULL, 0, this), fDimFadRuns ("FAD_CONTROL/RUNS", (void*)NULL, 0, this), fDimFadEvents ("FAD_CONTROL/EVENTS", (void*)NULL, 0, this), @@ -2457,4 +2456,5 @@ fDimFadConnections ("FAD_CONTROL/CONNECTIONS", (void*)NULL, 0, this), fDimFadFwVersion ("FAD_CONTROL/FIRMWARE_VERSION", (void*)NULL, 0, this), + fDimFadRunNumber ("FAD_CONTROL/RUN_NUMBER", (void*)NULL, 0, this), fDimFadDNA ("FAD_CONTROL/DNA", (void*)NULL, 0, this), fDimFadStatus ("FAD_CONTROL/STATUS", (void*)NULL, 0, this), Index: /trunk/FACT++/gui/MainWindow.cc =================================================================== --- /trunk/FACT++/gui/MainWindow.cc (revision 11199) +++ /trunk/FACT++/gui/MainWindow.cc (revision 11200) @@ -253,4 +253,15 @@ } +void MainWindow::on_fFadRunNumberCmd_valueChanged(int val) +{ + Dim::SendCommand("FAD_CONTROL/SET_RUN_NUMBER", uint64_t(val)); +} + +void MainWindow::on_fFadRoiCmd_valueChanged(int val) +{ + const int32_t vals[2] = { -1, val }; + Dim::SendCommand("FAD_CONTROL/SET_REGION_OF_INTEREST", vals); +} + void MainWindow::SetTriggerSequence() { Index: /trunk/FACT++/gui/MainWindow.h =================================================================== --- /trunk/FACT++/gui/MainWindow.h (revision 11199) +++ /trunk/FACT++/gui/MainWindow.h (revision 11200) @@ -66,4 +66,7 @@ void on_fFadSocket0_clicked(); void on_fFadSocket17_clicked(); + + void on_fFadRunNumberCmd_valueChanged(int); + void on_fFadRoiCmd_valueChanged(int); // Tab: FTM Index: /trunk/FACT++/gui/design.ui =================================================================== --- /trunk/FACT++/gui/design.ui (revision 11199) +++ /trunk/FACT++/gui/design.ui (revision 11200) @@ -1,4 +1,5 @@ + Thomas Bretz for the FACT collaboration MainWindow @@ -10,5 +11,5 @@ 0 0 - 1149 + 1201 768 @@ -52,5 +53,5 @@ - 3 + 4 @@ -2873,5 +2874,5 @@ - + @@ -2900,8 +2901,8 @@ - 560 + 630 0 307 - 161 + 181 @@ -3101,532 +3102,13 @@ - - - - - - 590 - 210 - 281 - 287 - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - + + - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true + Event Builder thread running - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - DRS enable - - - - - - - Write enable - - - - - - - DCM locked - - - - - - - DCM ready - - - - - - - SPI serial clock - - - - - - - on - - - - - - - on - - - - - - - on - - - - - - - on - - - - - - - on - - - - - - - off - - - - - - - off - - - - - - - off - - - - - - - off - - - - - - - off - - - - - - - Start - - - - - - - Stop - - - - - - - off - - - - - - - Trigger line - - - - - - - Continous trigger - - - - - - - on - - - - - - - off - - - - - - - Run - - - - - - - Data Sockets - - - - - - - Sock 0 - - - - - - - Sock 1-7 - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - on - - - - - - - on - - - - - - - off - - - - - - - Busy - - - - - + true @@ -3667,1139 +3149,9 @@ - - - - 10 - 20 - 281 - 234 - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - Prescaler - - - - - - - Region of interest - - - - - - - Reference clock - - - - - - - This is<br>a tool tip - - - Version - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - -- underflow - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - V - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Temperature - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Min - - - Qt::AlignCenter - - - - - - - Max - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - - - - PLL lock - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - - - 300 - 30 - 267 - 141 - - - - - - - Run number - - - - - - - Trigger ID - - - - - - - Event ID - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 1000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 1000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 1000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 100000000 - - - - - - - FAD Buffer - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 5 - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Min - - - - - - - Max - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 1000000 - - - - - - - - - 10 - 0 - 57 - 15 - - - - FAD - - - - - - 300 - 10 - 121 - 20 - - - - Eventbuilder / FAD - - - - - - 10 - 280 - 271 - 81 - - - - - - - 10 - 260 - 57 - 15 - - - - DNA - - - - - - 360 - 390 - 227 - 104 - - - - - - - Successfull - - - - - - - Rejected - - - - - - - Incomplete - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 1000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Current run - - - - - - - Total - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 1000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - - - 380 - 370 - 191 - 16 - - - - Event builder event statistics - - - - - - 10 - 380 - 341 - 126 - - - - - - - 24 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - - - - - Min - - - Qt::AlignCenter - - - - - - - Avg - - - Qt::AlignCenter - - - - - - - Max - - - Qt::AlignCenter - - - - - - - Buffer - - - Qt::AlignCenter - - - - - - - Ethernet throughput per socket - - - - - - - Total - - - Qt::AlignCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - MB - - - 1000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - kB/s - - - 1000000 - - - - - - - - - 10 - 360 - 91 - 16 - - - - Event builder - - - 610 - 180 + 520 + 220 94 24 @@ -4813,6 +3165,6 @@ - 570 - 160 + 530 + 30 94 24 @@ -4826,6 +3178,6 @@ - 670 - 160 + 530 + 60 94 24 @@ -4839,6 +3191,6 @@ - 770 - 160 + 530 + 90 94 24 @@ -4849,193 +3201,9 @@ - - - - 300 - 180 - 161 - 16 - - - - EventBuilderThread running - - - - - true - - - - 470 - 180 - 18 - 25 - - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - 300 - 200 - 284 - 160 - - - - - - - Evts waiting for completion - - - - - - - Incomplete evts ready - - - - - - - Incompl evts rem f buf (last s) - - - - - - - Incompl evts rem f buffer (tot) - - - - - - - Connections - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 10000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 10000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 10000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 10000000 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 10000000 - - - - - - 720 - 180 + 520 + 250 94 24 @@ -5046,4 +3214,1847 @@ + + + + 0 + 330 + 361 + 171 + + + + FAD DNAs + + + + + + + + + + + 630 + 190 + 303 + 324 + + + + FAD Controls + + + + + + + + on + + + + + + + off + + + + + + + Trigger line + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Sock 0 + + + + + + + Sock 1-7 + + + + + + + Data Sockets + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + on + + + + + + + off + + + + + + + Busy + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Continous trigger + + + + + + + off + + + + + + + on + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + on + + + + + + + off + + + + + + + DRS enable + + + + + + + Write enable + + + + + + + off + + + + + + + on + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + on + + + + + + + off + + + + + + + off + + + + + + + on + + + + + + + on + + + + + + + off + + + + + + + DCM locked + + + + + + + DCM ready + + + + + + + SPI serial clock + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Start + + + + + + + Stop + + + + + + + Run + + + + + + + + + + + 0 + 20 + 361 + 300 + + + + FAD Controls + + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Prescaler + + + + + + + Region of interest + + + + + + + Reference clock + + + + + + + This is<br>a tool tip + + + Version + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + -- underflow + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + V + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 1024 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Temperature + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Min + + + Qt::AlignCenter + + + + + + + Max + + + Qt::AlignCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + + + PLL lock + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Run Number + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 999999999 + + + + + + + + + + + + + + + EvtBld + + + + + + + 0 + 0 + + + + QDockWidget::NoDockWidgetFeatures + + + Event Builder overview + + + + + 0 + 0 + + + + + + + + + Closed files + + + + + 110 + 60 + 250 + 104 + + + + + + + Successfull + + + + + + + Rejected + + + + + + + Incomplete + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Current run + + + + + + + Total + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 1000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + + + + + Open files + + + + + 80 + 80 + 309 + 101 + + + + + + + Run number + + + + + + + Trigger ID + + + + + + + Event ID + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + + + + Min + + + + + + + Max + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 999999999 + + + + + + + + + + + Ethernet and memory + + + + + 50 + 60 + 361 + 126 + + + + + + + 24 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Min + + + Qt::AlignCenter + + + + + + + Avg + + + Qt::AlignCenter + + + + + + + Max + + + Qt::AlignCenter + + + + + + + Buffer + + + Qt::AlignCenter + + + + + + + Ethernet throughput per socket + + + + + + + Total + + + Qt::AlignCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + MB + + + 1000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1000000 + + + + + + + Maximum buffer size + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + + + + + Processing statistics + + + + + 60 + 40 + 361 + 160 + + + + + + + Incomplete events in buffer + + + + + + + Completed events ready for writing + + + + + + + No of events removed from buffer (1s) + + + + + + + No of events removed from buffer (tot) + + + + + + + Connections (open sockets) + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 10000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 10000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 10000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 10000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 10000000 + + + + + + + + + + @@ -5055,5 +5066,5 @@ ADC - + @@ -5068,7 +5079,7 @@ - Display of ADC data + Event Builder overview - + @@ -5077,19 +5088,7 @@ - + - - - - 0 - 0 - - - - - 500 - 500 - - + QFrame::StyledPanel @@ -5098,8 +5097,5 @@ QFrame::Sunken - - - 3 - + @@ -5573,5 +5569,5 @@ - + @@ -5693,5 +5689,5 @@ - + Remaining free disk space @@ -5763,5 +5759,5 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -5789,5 +5785,5 @@ - + true @@ -5827,5 +5823,5 @@ - + true @@ -5877,5 +5873,5 @@ - + true @@ -6640,6 +6636,6 @@ <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Ubuntu';"></p></body></html> @@ -6693,5 +6689,5 @@ 0 0 - 1149 + 1201 21 Index: /trunk/FACT++/src/EventBuilderWrapper.h =================================================================== --- /trunk/FACT++/src/EventBuilderWrapper.h (revision 11199) +++ /trunk/FACT++/src/EventBuilderWrapper.h (revision 11200) @@ -720,10 +720,9 @@ uint32_t fNumEvts[2]; - DimDescribedService fDimFiles; DimDescribedService fDimRuns; DimDescribedService fDimEvents; -// DimDescribedService fDimCurrentEvent; DimDescribedService fDimEventData; DimDescribedService fDimFwVersion; + DimDescribedService fDimRunNumber; DimDescribedService fDimStatus; DimDescribedService fDimDNA; @@ -741,10 +740,9 @@ EventBuilderWrapper(MessageImp &imp) : fMsg(imp), fFileFormat(kRaw), fMaxRun(0), - fDimFiles ("FAD_CONTROL/FILES", "X:1", ""), - fDimRuns ("FAD_CONTROL/RUNS", "I:1", ""), + fDimRuns ("FAD_CONTROL/RUNS", "I:3", ""), fDimEvents ("FAD_CONTROL/EVENTS", "I:2", ""), -// fDimCurrentEvent("FAD_CONTROL/CURRENT_EVENT", "I:1", ""), fDimEventData ("FAD_CONTROL/EVENT_DATA", "S:1;I:1;S:1;I:2;S:1;S", ""), - fDimFwVersion ("FAD_CONTROL/FIRMWARE_VERSION", "F:43", ""), + fDimFwVersion ("FAD_CONTROL/FIRMWARE_VERSION", "F:42", ""), + fDimRunNumber ("FAD_CONTROL/RUN_NUMBER", "I:42", ""), fDimStatus ("FAD_CONTROL/STATUS", "S:42", ""), fDimDNA ("FAD_CONTROL/DNA", "X:40", ""), @@ -759,6 +757,4 @@ memset(fNumEvts, 0, sizeof(fNumEvts)); - fDimRuns.Update(uint32_t(0)); -// fDimCurrentEvent.Update(uint32_t(0)); fDimEvents.Update(fNumEvts); @@ -944,4 +940,28 @@ // -------------- Mapped event builder callbacks ------------------ + void UpdateRuns() + { + uint32_t values[3] = + { + static_cast(fFiles.size()), + 0xffffffff, + 0 + }; + + for (vector::const_iterator it=fFiles.begin(); + it!=fFiles.end(); it++) + { + const DataFileImp *file = *it; + + if (file->GetRunId()GetRunId(); + + if (file->GetRunId()>values[2]) + values[2] = file->GetRunId(); + } + + fDimRuns.Update(values); + } + vector fFiles; @@ -970,15 +990,9 @@ fFiles.push_back(file); - if (runid>fMaxRun) - { - fMaxRun = runid; - fNumEvts[kCurrent] = 0; - - fDimRuns.Update(fMaxRun); - fDimEvents.Update(fNumEvts); -// fDimCurrentEvent.Update(uint32_t(0)); - } - - fDimFiles.Update(fFiles.size()); + UpdateRuns(); + + fNumEvts[kCurrent] = 0; + fDimEvents.Update(fNumEvts); + // fDimCurrentEvent.Update(uint32_t(0)); return reinterpret_cast(file); @@ -1037,5 +1051,5 @@ fFiles.erase(it); - fDimFiles.Update(fFiles.size()); + UpdateRuns(); const bool rc = file->Close(tail); @@ -1360,5 +1374,5 @@ template - pair> Compare(const FAD::EventHeader *h, const T *t, const uint64_t mask=~0, const uint8_t shift=0) + boost::array Compare(const FAD::EventHeader *h, const T *t) { const int offset = reinterpret_cast(t) - reinterpret_cast(h); @@ -1368,5 +1382,5 @@ const T *max = NULL; - boost::array vec; + boost::array vec; bool rc = true; @@ -1376,9 +1390,9 @@ const T *ref = reinterpret_cast(base+offset); - vec[i+3] = (*ref&mask)>>shift; + vec[i] = *ref; if (gi_NumConnect[i]!=7) { - vec[i+3] = -1; + vec[i] = 0; continue; } @@ -1397,16 +1411,12 @@ max = val; - if ((*val&mask)!=(*ref&mask)) + if (*val!=*ref) rc = false; } - if (!val) - return make_pair(false, vec); - - vec[0] = (*min&mask)>>shift; - vec[1] = (*val&mask)>>shift; - vec[2] = (*max&mask)>>shift; - - return make_pair(rc, vec); + vec[40] = val ? *min : 0xffffffff; + vec[41] = val ? *max : 0; + + return vec; } @@ -1453,8 +1463,8 @@ template - void Update(DimDescribedService &svc, const pair> &data) - { - svc.setQuality(data.first); - svc.setData(const_cast(data.second.data()), sizeof(T)*N); + void Update(DimDescribedService &svc, const boost::array &data, int n=N) + { +// svc.setQuality(vec[40]<=vec[41]); + svc.setData(const_cast(data.data()), sizeof(T)*n); svc.updateService(); } @@ -1492,16 +1502,20 @@ if (old.fVersion != h.fVersion || changed) { - const pair> ver = Compare(&h, &h.fVersion); - - pair> data; - data.first = ver.first; - - for (int i=0; i<43; i++) + const boost::array ver = Compare(&h, &h.fVersion); + + boost::array data; + for (int i=0; i<42; i++) { ostringstream str; - str << (ver.second[i]>>8) << '.' << (ver.second[i]&0xff); - data.second[i] = atof(str.str().c_str()); + str << (ver[i]>>8) << '.' << (ver[i]&0xff); + data[i] = atof(str.str().c_str()); } Update(fDimFwVersion, data); + } + + if (old.fRunNumber != h.fRunNumber || changed) + { + const boost::array run = Compare(&h, &h.fRunNumber); + fDimRunNumber.Update(run); } @@ -1514,5 +1528,4 @@ uint16_t fNumTriggersToGenerate; uint16_t fTriggerGeneratorPrescaler; - uint64_t fDNA; // Xilinx DNA uint32_t fTimeStamp; uint32_t fRunNumber; @@ -1523,19 +1536,12 @@ if (old.fTriggerType != h.fTriggerType || changed) { - const pair> typ = Compare(&h, &h.fTriggerType); - Print("Typ", typ); - } - - if (old.fRunNumber != h.fRunNumber || changed) - { - const pair> run = Compare(&h, &h.fRunNumber); - Print("Run", run); + const boost::array typ = Compare(&h, &h.fTriggerType); + //Print("Typ", typ); } if (old.fDNA != h.fDNA || changed) { - const pair> dna = Compare(&h, &h.fDNA); - fDimDNA.setData(const_cast(dna.second.data())+3, 40*sizeof(uint64_t)); - fDimDNA.updateService(); + const boost::array dna = Compare(&h, &h.fDNA); + Update(fDimDNA, dna, 40); } @@ -1543,7 +1549,6 @@ { const boost::array sts = CompareBits(&h, &h.fStatus); - fDimStatus.setData(const_cast(sts.data()), 42*sizeof(uint16_t)); - fDimStatus.updateService(); - } + Update(fDimStatus, sts); + } } };