Index: /trunk/FACT++/gui/FactGui.h =================================================================== --- /trunk/FACT++/gui/FactGui.h (revision 11206) +++ /trunk/FACT++/gui/FactGui.h (revision 11207) @@ -385,5 +385,4 @@ DimStampedInfo fDimFadRuns; DimStampedInfo fDimFadEvents; - DimStampedInfo fDimFadCurrentEvent; DimStampedInfo fDimFadEventData; DimStampedInfo fDimFadConnections; @@ -391,4 +390,5 @@ DimStampedInfo fDimFadRunNumber; DimStampedInfo fDimFadDNA; + DimStampedInfo fDimFadTemperature; DimStampedInfo fDimFadStatus; DimStampedInfo fDimFadStatistics; @@ -932,17 +932,20 @@ void handleFadRuns(const DimData &d) { - if (!CheckSize(d, 12)) + if (!CheckSize(d, 20)) return; const uint32_t *ptr = d.ptr(); + fEvtBldOpenFiles->setValue(ptr[0]); + fEvtBldOpenStreams->setValue(ptr[0]); fEvtBldRunNumberMin->setValue(ptr[1]); fEvtBldRunNumberMax->setValue(ptr[2]); - fEvtBldOpenFiles->setValue(ptr[0]); + fEvtBldLastOpened->setValue(ptr[3]); + fEvtBldLastClosed->setValue(ptr[4]); } void handleFadEvents(const DimData &d) { - if (!CheckSize(d, 8)) + if (!CheckSize(d, 16)) return; @@ -951,12 +954,30 @@ fEvtsSuccessCurRun->setValue(ptr[0]); fEvtsSuccessTotal->setValue(ptr[1]); - } - - void handleFadCurrentEvent(const DimData &d) - { - if (!CheckSize(d, 4)) - return; - - fEvtsEventId->setValue(d.get()); + fEvtBldEventId->setValue(ptr[2]); + fEvtBldTriggerId->setValue(ptr[3]); + } + + void handleFadTemperature(const DimData &d) + { + if (d.size()==0) + { + fFadTempMin->setEnabled(false); + fFadTempMax->setEnabled(false); + return; + } + + if (!CheckSize(d, 82*sizeof(float))) + return; + + const float *ptr = d.ptr(); + + fFadTempMin->setEnabled(true); + fFadTempMax->setEnabled(true); + + fFadTempMin->setValue(ptr[0]); + fFadTempMax->setValue(ptr[40]); + + handleFadToolTip(d.time, fFadTempMin, ptr+1); + handleFadToolTip(d.time, fFadTempMax, ptr+41); } @@ -1039,5 +1060,5 @@ } - vector fFadConnections; +// vector fFadConnections; void handleFadConnections(const DimData &d) @@ -1070,7 +1091,35 @@ } - SetLedColor(fFadLEDEventBuilder, ptr[40]==0?kLedRed:kLedGreen, d.time); - - fFadConnections.assign(ptr, ptr+40); + + const bool runs = ptr[40]!=0; + + fStatusEventBuilderLabel->setText(runs?"Running":"Not running"); + fStatusEventBuilderLabel->setToolTip(runs?"Event builder thread running.":"Event builder thread stopped."); + fEvtBldWidget->setEnabled(runs); + + SetLedColor(fStatusEventBuilderLed, runs?kLedGreen:kLedRed, d.time); + +// fFadConnections.assign(ptr, ptr+40); + } + + template + void handleFadToolTip(const Time &time, QWidget *w, T *ptr) + { + ostringstream tip; + tip << ""; + for (int b=0; b<10; b++) + tip << ""; + tip << ""; + + for (int c=0; c<4; c++) + { + tip << ""; + for (int b=0; b<10; b++) + tip << ""; + tip << ""; + } + tip << "
" << time.GetAsStr() << " (UTC)
" << b << "
" << c << "" << ptr[c*10+b] << "
"; + + w->setToolTip(tip.str().c_str()); } @@ -1098,20 +1147,5 @@ wmax->setValue(max); - ostringstream tip; - tip << ""; - for (int b=0; b<10; b++) - tip << ""; - tip << ""; - - for (int c=0; c<4; c++) - { - tip << ""; - for (int b=0; b<10; b++) - tip << ""; - tip << ""; - } - tip << "
" << Time().GetAsStr() << " (UTC)
" << b << "
" << c << "" << ptr[c*10+b] << "
"; - - led->setToolTip(tip.str().c_str()); + handleFadToolTip(d.time, led, ptr); } @@ -1152,11 +1186,17 @@ } - void SetFadLed(QPushButton *led, const DimData &d, uint16_t bitmask) - { + void SetFadLed(QPushButton *led, const DimData &d, uint16_t bitmask, bool invert=false) + { + if (d.size()==0) + { + SetLedColor(led, kLedGray, d.time); + return; + } + const bool quality = d.ptr()[0]&bitmask; const bool value = d.ptr()[1]&bitmask; const uint16_t *ptr = d.ptr()+2; - SetLedColor(led, quality?kLedOrange:(value?kLedGreen:kLedRed), d.time); + SetLedColor(led, quality?kLedOrange:(value^invert?kLedGreen:kLedRed), d.time); ostringstream tip; @@ -1184,5 +1224,5 @@ void handleFadStatus(const DimData &d) { - if (!CheckSize(d, 42*sizeof(uint16_t))) + if (d.size()!=0 && !CheckSize(d, 42*sizeof(uint16_t))) return; @@ -1192,5 +1232,5 @@ SetFadLed(fFadLedDcmReady, d, FAD::EventHeader::kDcmReady); SetFadLed(fFadLedSpiSclk, d, FAD::EventHeader::kSpiSclk); - SetFadLed(fFadLedRefClockTooLow, d, FAD::EventHeader::kRefClkTooLow); + SetFadLed(fFadLedRefClockTooLow, d, FAD::EventHeader::kRefClkTooLow, true); SetFadLed(fFadLedBusy, d, FAD::EventHeader::kBusy); SetFadLed(fFadLedTriggerLine, d, FAD::EventHeader::kTriggerLine); @@ -1215,5 +1255,6 @@ fFadEvtDel->setValue(stat[3]); fFadEvtTot->setValue(stat[4]); - fFadEvtRead->setValue(stat[6]/1024.); + fFadEthernetRateTot->setValue(stat[6]/1024.); + fFadEthernetRateAvg->setValue(stat[6]/1024./stat[7]); fFadEvtConn->setValue(stat[7]); } @@ -1735,6 +1776,14 @@ bool enable = false; - if (s.indexsetText("Offline"); + fStatusEventBuilderLabel->setToolTip("No connection to fadctrl."); + fEvtBldWidget->setEnabled(false); + + SetLedColor(fStatusEventBuilderLed, kLedGray, time); + } if (s.index==FAD::kOffline) // Dim connection / FTM disconnected SetLedColor(fStatusFADLed, kLedRed, time); @@ -2013,4 +2062,7 @@ return PostInfoHandler(&FactGui::handleFadDNA); + if (getInfo()==&fDimFadTemperature) + return PostInfoHandler(&FactGui::handleFadTemperature); + if (getInfo()==&fDimFadStatus) return PostInfoHandler(&FactGui::handleFadStatus); @@ -2024,7 +2076,4 @@ if (getInfo()==&fDimFadRuns) return PostInfoHandler(&FactGui::handleFadRuns); - - if (getInfo()==&fDimFadCurrentEvent) - return PostInfoHandler(&FactGui::handleFadCurrentEvent); if (getInfo()==&fDimFadEventData) @@ -2437,10 +2486,10 @@ fInChoosePatch(false), fDimDNS("DIS_DNS/VERSION_NUMBER", 1, int(0), this), - + //- fDimLoggerStats ("DATA_LOGGER/STATS", (void*)NULL, 0, this), fDimLoggerFilenameNight("DATA_LOGGER/FILENAME_NIGHTLY", (void*)NULL, 0, this), fDimLoggerFilenameRun ("DATA_LOGGER/FILENAME_RUN", (void*)NULL, 0, this), fDimLoggerNumSubs ("DATA_LOGGER/NUM_SUBS", (void*)NULL, 0, this), - + //- fDimFtmPassport ("FTM_CONTROL/PASSPORT", (void*)NULL, 0, this), fDimFtmTriggerCounter ("FTM_CONTROL/TRIGGER_COUNTER", (void*)NULL, 0, this), @@ -2450,7 +2499,7 @@ fDimFtmDynamicData ("FTM_CONTROL/DYNAMIC_DATA", (void*)NULL, 0, this), fDimFtmCounter ("FTM_CONTROL/COUNTER", (void*)NULL, 0, this), + //- fDimFadRuns ("FAD_CONTROL/RUNS", (void*)NULL, 0, this), fDimFadEvents ("FAD_CONTROL/EVENTS", (void*)NULL, 0, this), - fDimFadCurrentEvent ("FAD_CONTROL/CURRENT_EVENT", (void*)NULL, 0, this), fDimFadEventData ("FAD_CONTROL/EVENT_DATA", (void*)NULL, 0, this), fDimFadConnections ("FAD_CONTROL/CONNECTIONS", (void*)NULL, 0, this), @@ -2458,4 +2507,5 @@ fDimFadRunNumber ("FAD_CONTROL/RUN_NUMBER", (void*)NULL, 0, this), fDimFadDNA ("FAD_CONTROL/DNA", (void*)NULL, 0, this), + fDimFadTemperature ("FAD_CONTROL/TEMPERATURE", (void*)NULL, 0, this), fDimFadStatus ("FAD_CONTROL/STATUS", (void*)NULL, 0, this), fDimFadStatistics ("FAD_CONTROL/STATISTICS", (void*)NULL, 0, this) Index: /trunk/FACT++/gui/design.ui =================================================================== --- /trunk/FACT++/gui/design.ui (revision 11206) +++ /trunk/FACT++/gui/design.ui (revision 11207) @@ -53,5 +53,5 @@ - 4 + 3 @@ -2869,5 +2869,5 @@ - + FAD @@ -3101,49 +3101,4 @@ - - - - - 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 - - @@ -3246,5 +3201,5 @@ - + @@ -4010,4 +3965,7 @@ + + false + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -4023,4 +3981,7 @@ + + false + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -4052,4 +4013,7 @@ + + false + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -4103,4 +4067,7 @@ + + false + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -4120,4 +4087,7 @@ + + false + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -4171,5 +4141,5 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -4184,5 +4154,5 @@ - + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -4296,5 +4266,5 @@ - 999999999 + 2147483647 @@ -4344,5 +4314,5 @@ - 999999999 + 2147483647 @@ -4376,5 +4346,5 @@ Event Builder overview - + @@ -4386,15 +4356,616 @@ - - + + - Closed files - - + Open output streams + + + + + 10 + 30 + 441 + 206 + + + + + + + Run no. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + No. streams + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Qt::AlignCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Min + + + + + + + Max + + + + + + + Last run no. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Opened + + + + + + + Closed + + + + + + + For max run no. + + + Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + 2147483647 + + + + + + + Event ID + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Trigger ID + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + ------> + + + + + + + \----> + + + + + + + + + + + Ethernet + + 110 60 - 250 + 263 + 141 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1 + + + 10000.000000000000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1 + + + 10000.000000000000000 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1 + + + 10000.000000000000000 + + + + + + + Per socket + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Total + + + Qt::AlignBottom|Qt::AlignHCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + kB/s + + + 1000000 + + + + + + + Min + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Avg + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Max + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + sockets + + + 1000 + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Memory + + + + + 100 + 40 + 281 + 191 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + MB + + + 1000000 + + + + + + + 24 + + + + + + + Maximum buffer size + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Closed in buffer + + + + + + + Partially in buffer + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Released from buffer + + + + + + + Event release rate + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evts + + + 2147483647 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + evt/s + + + 2147483647 + + + + + + + + + + + Output stream with maximum run no. + + + + + 100 + 80 + 298 104 @@ -4434,5 +5005,5 @@ - 1000000 + 2147483647 @@ -4449,4 +5020,7 @@ QAbstractSpinBox::NoButtons + + 2147483647 + @@ -4462,4 +5036,7 @@ QAbstractSpinBox::NoButtons + + 2147483647 + @@ -4490,5 +5067,5 @@ - 1000000 + 2147483647 @@ -4505,4 +5082,7 @@ QAbstractSpinBox::NoButtons + + 2147483647 + @@ -4518,533 +5098,6 @@ 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 + 2147483647 @@ -5081,5 +5134,5 @@ Event Builder overview - + @@ -6930,6 +6983,6 @@ - 223 - 349 + 230 + 403 @@ -7034,151 +7087,4 @@ - - - - Offline - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - false - - - - 0 - 0 - - - - - 20 - 16777215 - - - - - - - true - - - - - - - Offline - - - - - - - false - - - - 0 - 0 - - - - - 20 - 16777215 - - - - - - - true - - - - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - - - - - Offline - - - @@ -7207,61 +7113,4 @@ - - - - - 0 - 0 - - - - Data acquisition (DRS4 readou) - - - FAD - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - Data Logger (writes slow control files) - - - Logger - - - Qt::AlignCenter - - - - - - - - 0 - 0 - - - - Chat server - - - Chat - - - Qt::AlignCenter - - - @@ -7296,5 +7145,43 @@ - + + + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + @@ -7312,26 +7199,255 @@ - - + + + + + 0 + 0 + + + + Data acquisition (DRS4 readou) + - Offline + FAD + + + Qt::AlignCenter + + + + + + + Event builder + + + Qt::AlignCenter + + + Slow Control + + + + Scheduler + + Qt::AlignCenter + - - + + + + + 0 + 0 + + + + Data Logger (writes slow control files) + - Offline + Logger + + + Qt::AlignCenter + + + + + + + + 0 + 0 + + + + Chat server + + + Chat + + + Qt::AlignCenter + + + + + + + false + + + + 0 + 0 + + + + + 20 + 16777215 + + + + + + + true + + + + + + + false + + + + 0 + 0 + + + + + 20 + 16777215 + + + + + + + true + + + + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + 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 + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + true + + + + @@ -7354,5 +7470,5 @@ - + true @@ -7391,6 +7507,6 @@ - - + + true @@ -7429,12 +7545,26 @@ - - + + - Slow Control + Offline + + + + + + + Offline + + + Offline + + + + @@ -7443,41 +7573,22 @@ - - - - - 18 - 16777215 - - + + - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - true + Offline - - - - - 18 - 16777215 - - + + - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - true + Offline + + + + + + + Offline Index: /trunk/FACT++/src/EventBuilderWrapper.h =================================================================== --- /trunk/FACT++/src/EventBuilderWrapper.h (revision 11206) +++ /trunk/FACT++/src/EventBuilderWrapper.h (revision 11207) @@ -702,6 +702,8 @@ enum { - kCurrent = 0, - kTotal = 1 + kCurrent = 0, + kTotal = 1, + kEventId = 2, + kTriggerId = 3, }; @@ -718,5 +720,7 @@ uint32_t fMaxRun; - uint32_t fNumEvts[2]; + uint32_t fLastOpened; + uint32_t fLastClosed; + uint32_t fNumEvts[4]; DimDescribedService fDimRuns; @@ -727,4 +731,5 @@ DimDescribedService fDimStatus; DimDescribedService fDimDNA; + DimDescribedService fDimTemperature; DimDescribedService fDimStatistics; @@ -739,7 +744,7 @@ public: EventBuilderWrapper(MessageImp &imp) : fMsg(imp), - fFileFormat(kRaw), fMaxRun(0), - fDimRuns ("FAD_CONTROL/RUNS", "I:3", ""), - fDimEvents ("FAD_CONTROL/EVENTS", "I:2", ""), + fFileFormat(kRaw), fMaxRun(0), fLastOpened(0), fLastClosed(0), + fDimRuns ("FAD_CONTROL/RUNS", "I:5", ""), + fDimEvents ("FAD_CONTROL/EVENTS", "I:4", ""), fDimEventData ("FAD_CONTROL/EVENT_DATA", "S:1;I:1;S:1;I:2;S:1;S", ""), fDimFwVersion ("FAD_CONTROL/FIRMWARE_VERSION", "F:42", ""), @@ -747,4 +752,5 @@ fDimStatus ("FAD_CONTROL/STATUS", "S:42", ""), fDimDNA ("FAD_CONTROL/DNA", "X:40", ""), + fDimTemperature ("FAD_CONTROL/TEMPERATURE", "F:82", ""), fDimStatistics ("FAD_CONTROL/STATISTICS", "X:8", ""), fDebugStream(false), fDebugRead(false) @@ -942,9 +948,11 @@ void UpdateRuns() { - uint32_t values[3] = + uint32_t values[5] = { static_cast(fFiles.size()), 0xffffffff, - 0 + 0, + fLastOpened, + fLastClosed }; @@ -960,4 +968,6 @@ values[2] = file->GetRunId(); } + + fMaxRun = values[2]; fDimRuns.Update(values); @@ -990,5 +1000,9 @@ fFiles.push_back(file); + fLastOpened = runid; UpdateRuns(); + + fNumEvts[kEventId] = 0; + fNumEvts[kTriggerId] = 0; fNumEvts[kCurrent] = 0; @@ -1008,11 +1022,12 @@ if (file->GetRunId()==fMaxRun) { - //fDimCurrentEvent.Update(e->EventNum); fNumEvts[kCurrent]++; + fNumEvts[kEventId] = e->EventNum; + fNumEvts[kTriggerId] = e->TriggerType; } fNumEvts[kTotal]++; - static Time oldt; + static Time oldt(boost::date_time::neg_infin); Time newt; if (newt>oldt+boost::posix_time::seconds(1)) @@ -1021,4 +1036,5 @@ oldt = newt; } + // ===> SignalEvtWritten(runid); @@ -1051,5 +1067,8 @@ fFiles.erase(it); + fLastClosed = file->GetRunId(); UpdateRuns(); + + fDimEvents.Update(fNumEvts); const bool rc = file->Close(tail); @@ -1253,4 +1272,9 @@ str << "): " << message; + static string last; + if (str.str()==last) + return; + + last = str.str(); fMsg.Update(str, severity); } @@ -1451,4 +1475,56 @@ Update(fDimStatus, sts); } + + static Time oldt(boost::date_time::neg_infin); + Time newt; + + if (newt>oldt+boost::posix_time::seconds(1)) + { + const boost::array tmp[4] = + { + Compare(&h, &h.fTempDrs[0]), + Compare(&h, &h.fTempDrs[1]), + Compare(&h, &h.fTempDrs[2]), + Compare(&h, &h.fTempDrs[3]) + }; + + vector data; + data.reserve(82); + data.push_back(tmp[0][0]); + data.insert(data.end(), tmp[0].data()+2, tmp[0].data()+42); + data.push_back(tmp[0][1]); + data.insert(data.end(), tmp[0].data()+2, tmp[0].data()+42); + + for (int j=0; j<=3; j++) + { + const boost::array &ref = tmp[j]; + + // Gloabl min + if (ref[40]data[40]) + data[40] = ref[41]; + + for (int i=0; i<40; i++) + { + // min per board + if (ref[i]data[i+41]) + data[i+41] = ref[i]; + } + } + + vector deg(82); + for (int i=0; i<82; i++) + deg[i] = data[i]/16.; + fDimTemperature.Update(deg); + } + + /*