Index: /trunk/FACT++/gui/FactGui.h =================================================================== --- /trunk/FACT++/gui/FactGui.h (revision 11174) +++ /trunk/FACT++/gui/FactGui.h (revision 11175) @@ -390,6 +390,4 @@ DimStampedInfo fDimFadConnections; DimStampedInfo fDimFadFwVersion; - DimStampedInfo fDimFadPllLock; - DimStampedInfo fDimFadDrsEnabled; DimStampedInfo fDimFadStatus; DimStampedInfo fDimFadStatistics; @@ -1115,71 +1113,5 @@ SetLedColor(fFadLedFwVersion, d.qos?kLedGreen:kLedOrange, d.time); } -/* - void handleFadPllLock(const DimData &d) - { - if (!CheckSize(d, 41*sizeof(uint8_t))) - return; - -// SetLedColor(fFadLedPllLock, d.qos?kLedGreen:kLedOrange, d.time); - - const uint8_t *ptr = d.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() << "
" << b << "
" << c << "" - << (int)(ptr[c*10+b+1]&8) - << (int)(ptr[c*10+b+1]&4) - << (int)(ptr[c*10+b+1]&2) - << (int)(ptr[c*10+b+1]&1) - << "
"; - - fFadLedPllLock->setToolTip(tip.str().c_str()); - } - - void handleFadDrsEnabled(const DimData &d) - { - if (!CheckSize(d, 41*sizeof(uint8_t))) - return; - - const uint8_t *ptr = d.ptr(); - -// SetLedColor(fFadLedDrsEnabled, d.qos?(ptr[0]?kLedGreen:kLedRed):kLedOrange, d.time); - - 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() << "
" << b << "
" << c << "" - << (ptr[c*10+b+1]?"on":"off") - << "
"; - - fFadLedDrsEnabled->setToolTip(tip.str().c_str()); - - } -*/ + void SetFadLed(QPushButton *led, const DimData &d, uint16_t bitmask) { @@ -2024,10 +1956,4 @@ return PostInfoHandler(&FactGui::handleFadFwVersion); -// if (getInfo()==&fDimFadPllLock) -// return PostInfoHandler(&FactGui::handleFadPllLock); - -// if (getInfo()==&fDimFadDrsEnabled) -// return PostInfoHandler(&FactGui::handleFadDrsEnabled); - if (getInfo()==&fDimFadStatus) return PostInfoHandler(&FactGui::handleFadStatus); @@ -2474,6 +2400,4 @@ fDimFadConnections ("FAD_CONTROL/CONNECTIONS", (void*)NULL, 0, this), fDimFadFwVersion ("FAD_CONTROL/FIRMWARE_VERSION", (void*)NULL, 0, this), - fDimFadPllLock ("FAD_CONTROL/PLL_LOCK", (void*)NULL, 0, this), - fDimFadDrsEnabled ("FAD_CONTROL/DRS_ENABLED", (void*)NULL, 0, this), fDimFadStatus ("FAD_CONTROL/STATUS", (void*)NULL, 0, this), fDimFadStatistics ("FAD_CONTROL/STATISTICS", (void*)NULL, 0, this) Index: /trunk/FACT++/src/EventBuilderWrapper.h =================================================================== --- /trunk/FACT++/src/EventBuilderWrapper.h (revision 11174) +++ /trunk/FACT++/src/EventBuilderWrapper.h (revision 11175) @@ -721,9 +721,4 @@ DimDescribedService fDimEventData; DimDescribedService fDimFwVersion; - //DimDescribedService fDimPllLock; - //DimDescribedService fDimDrsEnabled; - //DimDescribedService fDimTriggerLine; - //DimDescribedService fDimContinousTrigger; - //DimDescribedService fDimSocket; DimDescribedService fDimStatus; DimDescribedService fDimStatistics; @@ -740,17 +735,12 @@ EventBuilderWrapper(MessageImp &imp) : fMsg(imp), fFileFormat(kRaw), fMaxRun(0), - fDimFiles ("FAD_CONTROL/FILES", "X:1", ""), - fDimRuns ("FAD_CONTROL/RUNS", "I:1", ""), - 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", ""), - //fDimPllLock("FAD_CONTROL/PLL_LOCK", "C:41", ""), - //fDimDrsEnabled("FAD_CONTROL/DRS_ENABLED", "C:41", ""), - //fDimTriggerLine("FAD_CONTROL/TRIGGER_LINE", "C:41", ""), - //fDimContinousTrigger("FAD_CONTROL/CONTINOUS_TRIGGER", "C:41", ""), - //fDimBusy("FAD_CONTROL/BUSY", "C:41", ""), - fDimStatus("FAD_CONTROL/STATUS", "S:42", ""), - fDimStatistics("FAD_CONTROL/STATISTICS", "X:8", ""), + fDimFiles ("FAD_CONTROL/FILES", "X:1", ""), + fDimRuns ("FAD_CONTROL/RUNS", "I:1", ""), + 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", ""), + fDimStatus ("FAD_CONTROL/STATUS", "S:42", ""), + fDimStatistics ("FAD_CONTROL/STATISTICS", "X:8", ""), fDebugStream(false), fDebugRead(false) { @@ -1488,39 +1478,5 @@ Print("Run", run); } -/* - if (old.PLLLCK() != h.PLLLCK()) - { - const pair> pll = Compare(&h, &h.fStatus, 0xf<<12, 12); - pair> data; - data.first = pll.first; - data.second[0] = pll.second[1]; - for (int i=0; i<40; i++) - data.second[i+1] = pll.second[i+3]; - Update(fDimPllLock, data); - } - - if (old.HasDenable() != h.HasDenable()) - { - const pair> drs = Compare(&h, &h.fStatus, FAD::EventHeader::kDenable); - pair> data; - data.first = drs.first; - data.second[0] = drs.second[1]; - for (int i=0; i<40; i++) - data.second[i+1] = drs.second[i+3]; - Update(fDimDrsEnabled, data); - } - - if (old.HasDwrite() != h.HasDwrite()) - { - const pair> wri = Compare(&h, &h.fStatus, FAD::EventHeader::kDwrite); - Print("Wri", wri); - } - - if (old.IsRefClockTooLow() != h.IsRefClockTooLow()) - { - const pair> owf = Compare(&h, &h.fStatus, FAD::EventHeader::kRefClkTooLow); - Print("Owf", owf); - } -*/ + if (old.IsDcmLocked() != h.IsDcmLocked()) { @@ -1540,44 +1496,5 @@ Print("Spi", spi); } -/* - if (old.HasBusy() != h.HasBusy()) - { - const pair> bsy = Compare(&h, &h.fStatus, FAD::EventHeader::kBusy); - pair> data; - data.first = bsy.first; - data.second[0] = bsy.second[1]; - for (int i=0; i<40; i++) - data.second[i+1] = bsy.second[i+3]; - Update(fDimBusy, data); - } - - if (old.HasTriggerEnabled() != h.HasTriggerEnabled()) - { - const pair> trg = Compare(&h, &h.fStatus, FAD::EventHeader::kTriggerLine); - pair> data; - data.first = trg.first; - data.second[0] = trg.second[1]; - for (int i=0; i<40; i++) - data.second[i+1] = trg.second[i+3]; - Update(fDimTriggerLine, data); - } - - if (old.HasContTriggerEnabled() != h.HasContTriggerEnabled()) - { - const pair> cnt = Compare(&h, &h.fStatus, FAD::EventHeader::kContTrigger); - pair> data; - data.first = cnt.first; - data.second[0] = cnt.second[1]; - for (int i=0; i<40; i++) - data.second[i+1] = cnt.second[i+3]; - Update(fDimContinousTrigger, data); - } - - if (old.IsInSock17Mode() != h.IsInSock17Mode()) - { - const pair> sck = Compare(&h, &h.fStatus, FAD::EventHeader::kSock17); - Print("Sck", sck); - } -*/ + if (old.fStatus != h.fStatus) { @@ -1585,16 +1502,5 @@ fDimStatus.setData(const_cast(sts.data()), 42*sizeof(uint16_t)); fDimStatus.updateService(); - - cout << "EMMIT" << endl; - } - - - //Update(fDimFwVersion, ver); - //Update(fDimFwVersion, trg); - //Update(fDimFwVersion, run); - // frq send only min/max - - //const pair> frq = Compare(&h, &h.fFreqRefClock); - //Print("Frq", frq); + } } };