Changeset 11175

Timestamp:

06/24/11 14:19:43 (13 years ago)

Author:

tbretz

Message:

Removed some obsolete stuff

Location:

trunk/FACT++

Files:

• gui/FactGui.h (modified) (4 diffs)
• src/EventBuilderWrapper.h (modified) (5 diffs)

trunk/FACT++/gui/FactGui.h

@@ -390 +390 @@
     DimStampedInfo fDimFadConnections;
     DimStampedInfo fDimFadFwVersion;
-    DimStampedInfo fDimFadPllLock;
-    DimStampedInfo fDimFadDrsEnabled;
     DimStampedInfo fDimFadStatus;
     DimStampedInfo fDimFadStatistics;
@@ -1115 +1113 @@
         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<uint8_t>();
-
-        ostringstream tip;
-        tip << "<table border='1'><tr><th colspan='11'>" << Time().GetAsStr() << "</th></tr><tr><th></th>";
-        for (int b=0; b<10; b++)
-            tip << "<th>" << b << "</th>";
-        tip << "</tr>";
-
-        for (int c=0; c<4; c++)
-        {
-            tip << "<tr><th>" << c << "</th>";
-            for (int b=0; b<10; b++)
-            {
-                tip << "<td>"
-                    << (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)
-                    << "</td>";
-            }
-            tip << "</tr>";
-        }
-        tip << "</table>";
-
-        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<uint8_t>();
-
-//        SetLedColor(fFadLedDrsEnabled, d.qos?(ptr[0]?kLedGreen:kLedRed):kLedOrange, d.time);
-
-        ostringstream tip;
-        tip << "<table border='1'><tr><th colspan='11'>" << Time().GetAsStr() << "</th></tr><tr><th></th>";
-        for (int b=0; b<10; b++)
-            tip << "<th>" << b << "</th>";
-        tip << "</tr>";
-
-        for (int c=0; c<4; c++)
-        {
-            tip << "<tr><th>" << c << "</th>";
-            for (int b=0; b<10; b++)
-            {
-                tip << "<td>"
-                    << (ptr[c*10+b+1]?"on":"off")
-                    << "</td>";
-            }
-            tip << "</tr>";
-        }
-        tip << "</table>";
-
-        fFadLedDrsEnabled->setToolTip(tip.str().c_str());
-
-    }
-*/
+
     void SetFadLed(QPushButton *led, const DimData &d, uint16_t bitmask)
     {
@@ -2024 +1956 @@
             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 +2400 @@
         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)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -721 +721 @@
     DimDescribedService fDimEventData;
     DimDescribedService fDimFwVersion;
-    //DimDescribedService fDimPllLock;
-    //DimDescribedService fDimDrsEnabled;
-    //DimDescribedService fDimTriggerLine;
-    //DimDescribedService fDimContinousTrigger;
-    //DimDescribedService fDimSocket;
     DimDescribedService fDimStatus;
     DimDescribedService fDimStatistics;
@@ -740 +735 @@
     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 +1478 @@
             Print("Run", run);
         }
-/*
-        if (old.PLLLCK() != h.PLLLCK())
-        {
-            const pair<bool, boost::array<uint16_t,43>> pll = Compare(&h, &h.fStatus, 0xf<<12, 12);
-            pair<bool, boost::array<uint8_t,41>> 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<bool, boost::array<uint16_t,43>> drs = Compare(&h, &h.fStatus, FAD::EventHeader::kDenable);
-            pair<bool, boost::array<uint8_t,43>> 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<bool, boost::array<uint16_t,43>> wri = Compare(&h, &h.fStatus, FAD::EventHeader::kDwrite);
-            Print("Wri", wri);
-        }
-
-        if (old.IsRefClockTooLow() != h.IsRefClockTooLow())
-        {
-            const pair<bool, boost::array<uint16_t,43>> owf = Compare(&h, &h.fStatus, FAD::EventHeader::kRefClkTooLow);
-            Print("Owf", owf);
-        }
-*/
+
         if (old.IsDcmLocked() != h.IsDcmLocked())
         {
@@ -1540 +1496 @@
             Print("Spi", spi);
         }
-/*
-        if (old.HasBusy() != h.HasBusy())
-        {
-            const pair<bool, boost::array<uint16_t,43>> bsy = Compare(&h, &h.fStatus, FAD::EventHeader::kBusy);
-            pair<bool, boost::array<uint8_t,43>> 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<bool, boost::array<uint16_t,43>> trg = Compare(&h, &h.fStatus, FAD::EventHeader::kTriggerLine);
-            pair<bool, boost::array<uint8_t,43>> 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<bool, boost::array<uint16_t,43>> cnt = Compare(&h, &h.fStatus, FAD::EventHeader::kContTrigger);
-            pair<bool, boost::array<uint8_t,43>> 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<bool, boost::array<uint16_t,43>> sck = Compare(&h, &h.fStatus, FAD::EventHeader::kSock17);
-            Print("Sck", sck);
-        }
-*/
+
         if (old.fStatus != h.fStatus)
         {
@@ -1585 +1502 @@
             fDimStatus.setData(const_cast<uint16_t*>(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<bool, boost::array<uint32_t,43>> frq = Compare(&h, &h.fFreqRefClock);
-        //Print("Frq", frq);
+        }
     }
 };