Index: trunk/FACT++/gui/FactGui.h =================================================================== --- trunk/FACT++/gui/FactGui.h (revision 10919) +++ trunk/FACT++/gui/FactGui.h (revision 10920) @@ -290,5 +290,5 @@ stream.seekp(0); if (idx>=0) - stream << "Pixel=" << idx << " Data=" << fData[idx] << '\0'; + stream << "Pixel=" << idx << "(" < fFtuStatus; + +// vector fMapHW; // Software -> Hardware +// map fMapSW; // Hardware -> Software DimStampedInfo fDimDNS; @@ -344,9 +347,7 @@ DimStampedInfo fDimFtmDynamicData; DimStampedInfo fDimFtmCounter; -/* - DimStampedInfo fDimFadPassport; - DimStampedInfo fDimFadTemperatures; - DimStampedInfo fDimFadSetup; -*/ + + DimStampedInfo fDimFadFiles; + map fServices; @@ -857,4 +858,19 @@ // ===================== FAD ============================================ + + void handleFadFiles(const DimData &d) + { + if (d.size()==0) + return; + + if (d.size()!=8) + { + cout << "Size mismatch: " << d.size() << " " << 8 << endl; + return; + } + + fEvtBuilderOpenFiles->setValue(d.get()); + } + /* void handleFadPassport(const DimData &d) @@ -1652,8 +1668,9 @@ if (getInfo()==&fDimLoggerStats) return PostInfoHandler(&FactGui::handleLoggerStats); + + if (getInfo()==&fDimFadFiles) + return PostInfoHandler(&FactGui::handleFadFiles); + /* - if (getInfo()==&fDimFadTemperatures) - return PostInfoHandler(&FactGui::handleFadTemperatures); - if (getInfo()==&fDimFadSetup) return PostInfoHandler(&FactGui::handleFadSetup); @@ -1925,5 +1942,5 @@ public: FactGui() : - fFtuStatus(40), + fFtuStatus(40), //fMapHW(1440) fDimDNS("DIS_DNS/VERSION_NUMBER", 1, int(0), this), @@ -1939,9 +1956,6 @@ fDimFtmStaticData ("FTM_CONTROL/STATIC_DATA", (void*)NULL, 0, this), fDimFtmDynamicData ("FTM_CONTROL/DYNAMIC_DATA", (void*)NULL, 0, this), - fDimFtmCounter ("FTM_CONTROL/COUNTER", (void*)NULL, 0, this) - /* - , fDimFadPassport ("FAD_CONTROL/PASSPORT", (void*)NULL, 0, this), - fDimFadTemperatures ("FAD_CONTROL/TEMPERATURES", (void*)NULL, 0, this), - fDimFadSetup ("FAD_CONTROL/SETUP", (void*)NULL, 0, this)*/ + fDimFtmCounter ("FTM_CONTROL/COUNTER", (void*)NULL, 0, this), + fDimFadFiles ("FAD_CONTROL/FILES", (void*)NULL, 0, this) { fTriggerWidget->setEnabled(false); @@ -1959,10 +1973,10 @@ // -------------------------------------------------------------------------- - ifstream fin("fact-trigger-all.txt"); + ifstream fin1("fact-trigger-all.txt"); int l = 0; string buf; - while (getline(fin, buf, '\n')) + while (getline(fin1, buf, '\n')) { buf = Tools::Trim(buf); @@ -1981,4 +1995,32 @@ } + // -------------------------------------------------------------------------- +/* + ifstream fin2("FACTmapV3.txt"); + + l = 0; + + while (getline(fin2, buf, '\n')) + { + buf = Tools::Trim(buf); + if (buf[0]=='#') + continue; + + int softid, hardid, geom_i, geom_j, gapd; + + stringstream str(buf); + + str >> softid; + str >> hardid; + str >> geom_i; + str >> geom_j; + str >> gapd; + + fMapHW[softid] = hardid; + fMapSW[hardid] = softid; + + l++; + } +*/ // -------------------------------------------------------------------------- #ifdef HAVE_ROOT Index: trunk/FACT++/gui/design.ui =================================================================== --- trunk/FACT++/gui/design.ui (revision 10919) +++ trunk/FACT++/gui/design.ui (revision 10920) @@ -10,5 +10,5 @@ 0 0 - 1070 + 1149 768 @@ -33,9 +33,9 @@ - + QLayout::SetDefaultConstraint - + @@ -52,5 +52,5 @@ - 1 + 3 @@ -2673,5 +2673,5 @@ - + @@ -2700,5 +2700,5 @@ - 10 + 570 10 307 @@ -2902,4 +2902,1467 @@ + + + + + 10 + 330 + 201 + 172 + + + + + + + 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 + + + + + + + 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 + + + + + + + PLL lock + + + + + + + DRS enable + + + + + + + Write enable + + + + + + + DCM locked + + + + + + + DCM ready + + + + + + + SPI serial clock + + + + + + + on + + + + + + + off + + + + + + + on + + + + + + + on + + + + + + + on + + + + + + + on + + + + + + + on + + + + + + + off + + + + + + + off + + + + + + + off + + + + + + + off + + + + + + + off + + + + + + + + + 10 + 30 + 281 + 211 + + + + + + + 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 + + + + + + + -- overflow + + + + + + + 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 + + + + + + + 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 + + + + + + + + + + 310 + 30 + 221 + 140 + + + + + + + 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 + + + + + + + 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 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + QAbstractSpinBox::NoButtons + + + + + + + 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 + + + + + + + + + 20 + 10 + 57 + 15 + + + + FAD + + + + + + 30 + 300 + 91 + 16 + + + + FAD status + + + + + + 370 + 10 + 121 + 20 + + + + Eventbuilder / FAD + + + + + + 660 + 410 + 231 + 101 + + + + + + + 750 + 390 + 57 + 15 + + + + DNA + + + + + + 300 + 220 + 209 + 104 + + + + + + + Successfull + + + + + + + Rejected + + + + + + + Incomplete + + + + + + + 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 + + + + + + + Current run + + + + + + + Total + + + + + + + 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 + + + + + + + + + 310 + 200 + 191 + 16 + + + + Event builder event statistics + + + + + + 280 + 380 + 341 + 125 + + + + + + + 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 + + + + + + + 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 + + + + + + + + + 290 + 360 + 91 + 16 + + + + Event builder + @@ -4434,6 +5897,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> @@ -4487,5 +5950,5 @@ 0 0 - 1070 + 1149 21 @@ -4728,5 +6191,5 @@ - 207 + 223 320 @@ -4762,42 +6225,4 @@ - - - - true - - - - 0 - 0 - - - - - 18 - 16777215 - - - - - - - - :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png - - - - 16 - 16 - - - - false - - - true - - - @@ -5211,4 +6636,42 @@ + + true + + + + 0 + 0 + + + + + 18 + 16777215 + + + + + + + + :/Resources/icons/gray circle 1.png:/Resources/icons/gray circle 1.png + + + + 16 + 16 + + + + false + + + true + + + + + true