Changeset 11166 for trunk/FACT++/src

Timestamp:

06/24/11 12:55:20 (14 years ago)

Author:

tbretz

Message:

Added PLL lock.

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (5 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -721 +721 @@
     DimDescribedService fDimEventData;
     DimDescribedService fDimFwVersion;
+    DimDescribedService fDimPllLock;
     DimDescribedService fDimStatistics;
 
@@ -740 +741 @@
         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:43", ""),
         fDimStatistics("FAD_CONTROL/STATISTICS", "X:8", ""),
         fDebugStream(false), fDebugRead(false)
@@ -1353 +1355 @@
             vec[i+3] = *ref;
 
-            if (gi_NumConnect[i/7]!=7)
-                continue;
+//            if (gi_NumConnect[i/7]!=7)
+//                continue;
 
             if (!val)
@@ -1403 +1405 @@
     {
         const uint16_t id = h.Id();
-        if (id>39) // WARNING
+        if (id>39) 
             return;
 
@@ -1442 +1444 @@
         {
             const pair<bool, boost::array<uint16_t,43>> pll = Compare(&h, &h.fStatus, 0xf<<12, 12);
-            Print("Pll", pll);
+            pair<bool, boost::array<uint8_t,43>> data;
+            data.first = pll.first;
+
+            for (int i=0; i<43; i++)
+                data.second[i] = (pll.second[i]>>12)&0xf;
+            Update(fDimPllLock, data);
         }