Index: /trunk/FACT++/gui/FactGui.h =================================================================== --- /trunk/FACT++/gui/FactGui.h (revision 11823) +++ /trunk/FACT++/gui/FactGui.h (revision 11824) @@ -394,4 +394,5 @@ DimStampedInfo fDimFadWriteStats; + DimStampedInfo fDimFadStartRun; DimStampedInfo fDimFadRuns; DimStampedInfo fDimFadEvents; @@ -1018,4 +1019,16 @@ } + void handleFadStartRun(const DimData &d) + { + if (!CheckSize(d, 8)) + return; + + const int64_t *runs = d.ptr(); + + fFadRunNoCur->setValue(runs[0]); + fFadRunNoNext->setValue(runs[1]); + fFadRunNoCur->setEnabled(runs[0]>=0); + } + void handleFadEvents(const DimData &d) { @@ -1028,4 +1041,5 @@ fEvtsSuccessTotal->setValue(ptr[1]); fEvtBldEventId->setValue(ptr[2]); + fFadEvtCounter->setValue(ptr[2]); fEvtBldTriggerId->setValue(ptr[3]); } @@ -1782,4 +1796,8 @@ fFadEvtRateNew->setValue(1000*stat.rateNew/stat.deltaT); fFadEvtRateWrite->setValue(1000*stat.rateWrite/stat.deltaT); + + fFadTransmission->setValue(fFadEvtRateNew->value()); + fFadEthernet->setValue(fFadEthernetRateTot->value()); + fFadWriteRate->setValue(fFadEvtRateWrite->value()); } @@ -2675,4 +2693,7 @@ if (getInfo()==&fDimFadRuns) return PostInfoHandler(&FactGui::handleFadRuns); + + if (getInfo()==&fDimFadStartRun) + return PostInfoHandler(&FactGui::handleFadStartRun); if (getInfo()==&fDimFadRawData) @@ -3139,4 +3160,5 @@ //- fDimFadWriteStats ("FAD_CONTROL/STATS", (void*)NULL, 0, this), + fDimFadStartRun ("FAD_CONTROL/START_RUN", (void*)NULL, 0, this), fDimFadRuns ("FAD_CONTROL/RUNS", (void*)NULL, 0, this), fDimFadEvents ("FAD_CONTROL/EVENTS", (void*)NULL, 0, this), Index: /trunk/FACT++/gui/design.ui =================================================================== --- /trunk/FACT++/gui/design.ui (revision 11823) +++ /trunk/FACT++/gui/design.ui (revision 11824) @@ -11,6 +11,6 @@ 0 0 - 1186 - 850 + 1203 + 852 @@ -53,5 +53,5 @@ - 5 + 3 @@ -3305,692 +3305,958 @@ - - - FAD Controls I + + + 0 - - - - - - - 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 - - + + + + FAD Controls I + + + + + + + + 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 + + + + + + + This is<br>a tool tip + + + Version + + + + + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 65535 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + V + + + + + + + true + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Run Number + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + 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 + + + 2147483647 + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + + + + + Min + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Max + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + °C + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + °C + + + + + + + true + + + + 0 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + MHz + + + 3 + + + 70000000.000000000000000 + + + 0.000000000000000 + + + + + + + + 0 + 0 + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + QAbstractSpinBox::NoButtons + + + MHz + + + 3 + + + 70000000.000000000000000 + + + 0.000000000000000 + + + + + + + Temperature + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + Reference 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 + + + + + + + -- underflow + + + + + + + PLL lock + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + -1 + + + 1024 + + + -1 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 1024 + + + + + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + -1 + + + 1024 + + + -1 + + + + + + + false + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + 1024 + + + + + + + Region of interest (ch9) + + + + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + - - - This is<br>a tool tip - - - Version - - - - - - - true - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 65535 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - V - - - - - - - true - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Run Number - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - - - - - 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 - - - 2147483647 - - - - - + - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - - - - Min - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Max - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - °C - - - - - - - true - - - - 0 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - MHz - - - 3 - - - 70000000.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - QAbstractSpinBox::NoButtons - - - MHz - - - 3 - - - 70000000.000000000000000 - - - 0.000000000000000 - - - - - - - Temperature - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - Reference 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 - - - - - - - -- underflow - - - - - - - PLL lock - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - false - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - -1 - - - 1024 - - - -1 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 1024 - - - - - - - false - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - -1 - - - 1024 - - - -1 - - - - - - - false - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 1024 - - - - - - - Region of interest (ch9) - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true + Qt::Horizontal - - - - - Qt::Horizontal - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + + + + Statistics + + + + + + 0 + + + + + Run number + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + 0 + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + n/a + + + 9999 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 9999 + + + + + + + Current + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Next + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + Event counter + + + Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + Transmission rate + + + Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evt/s + + + 99999 + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + Ethernet rate + + + Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1000000 + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 5 + + + + + + + + Output rate + + + Qt::AlignBottom|Qt::AlignRight|Qt::AlignTrailing + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evt/s + + + 99999 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + + + + + @@ -5741,4 +6007,88 @@ + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evt/s + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Max in buffer + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Buffer contents + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + New in buffer + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 10 + + + + @@ -5778,88 +6128,4 @@ - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evt/s - - - 2147483647 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - evts - - - 2147483647 - - - - - - - Max in buffer - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Buffer contents - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - New in buffer - - - Qt::AlignBottom|Qt::AlignHCenter - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - @@ -6021,23 +6287,4 @@ - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - kB/s - - - 1000000 - - - @@ -6141,4 +6388,23 @@ Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1000000 @@ -6361,20 +6627,4 @@ - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - QAbstractSpinBox::NoButtons - - - 2147483647 - - - @@ -6424,4 +6674,20 @@ \----> + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 @@ -8866,5 +9132,5 @@ 0 0 - 1186 + 1203 21 Index: /trunk/FACT++/src/EventBuilderWrapper.h =================================================================== --- /trunk/FACT++/src/EventBuilderWrapper.h (revision 11823) +++ /trunk/FACT++/src/EventBuilderWrapper.h (revision 11824) @@ -416,5 +416,8 @@ void LoadDrsCalibration(const char *fname) { - DataCalib::ReadFits(fname, fMsg); + if (!DataCalib::ReadFits(fname, fMsg)) + return; + fMsg.Info("Successfully loaded DRS calibration from "+string(fname)); + DataCalib::Update(fDimDrsCalibration); } @@ -813,4 +816,9 @@ } + uint32_t GetRunNumber() const + { + return fRunNumber; + } + void gotNewRun(int runnr, PEVNT_HEADER */*headers*/) { Index: /trunk/FACT++/src/fadctrl.cc =================================================================== --- /trunk/FACT++/src/fadctrl.cc (revision 11823) +++ /trunk/FACT++/src/fadctrl.cc (revision 11824) @@ -1123,5 +1123,6 @@ // (Note that we might need another step which only checks if the continous trigger // is wwitched off, too) - fDimStartRun.Update(int64_t(runno)); + const int64_t runs[2] = { runno, runno+1 }; + fDimStartRun.Update(runs); T::Info(" ==> TODO: Insert/update run configuration in database!"); @@ -1544,5 +1545,5 @@ T(out, "FAD_CONTROL"), EventBuilderWrapper(*static_cast(this)), ba::io_service::work(static_cast(*this)), fStatus1(40), fStatus2(40), fStatusC(40), fStatusT(false), - fDimStartRun("FAD_CONTROL/START_RUN", "X:1", ""), + fDimStartRun("FAD_CONTROL/START_RUN", "X:2", ""), fDimConnection("FAD_CONTROL/CONNECTIONS", "C:40;C:1", "") { @@ -1554,5 +1555,6 @@ // deletion and creation of threads and more. - fDimStartRun.Update(int64_t(-1)); + const int64_t runs[2] = { -1, GetRunNumber() }; + fDimStartRun.Update(runs); // State names