Changeset 11179 for trunk/FACT++/src

Timestamp:

06/24/11 15:46:00 (13 years ago)

Author:

tbretz

Message:

Added FAD DNA.

Location:

trunk/FACT++/src

Files:

• EventBuilderWrapper.h (modified) (5 diffs)
• fad.cc (modified) (2 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -722 +722 @@
     DimDescribedService fDimFwVersion;
     DimDescribedService fDimStatus;
+    DimDescribedService fDimDNA;
     DimDescribedService fDimStatistics;
 
@@ -742 +743 @@
         fDimFwVersion   ("FAD_CONTROL/FIRMWARE_VERSION", "F:43", ""),
         fDimStatus      ("FAD_CONTROL/STATUS",           "S:42", ""),
+        fDimDNA         ("FAD_CONTROL/DNA",              "X:40", ""),
         fDimStatistics  ("FAD_CONTROL/STATISTICS",       "X:8",  ""),
         fDebugStream(false), fDebugRead(false)
@@ -1453 +1455 @@
         {
             const pair<bool, boost::array<uint16_t,43>> ver = Compare(&h, &h.fVersion);
-            //Print("Ver", ver);
 
             pair<bool, boost::array<float,43>> data;
@@ -1467 +1468 @@
         }
 
+        /*
+         uint16_t fTriggerType;
+         uint32_t fTriggerId;
+         uint32_t fEventCounter;
+         uint32_t fFreqRefClock;
+         uint16_t fAdcClockPhaseShift;
+         uint16_t fNumTriggersToGenerate;
+         uint16_t fTriggerGeneratorPrescaler;
+         uint64_t fDNA; // Xilinx DNA
+         uint32_t fTimeStamp;
+         uint32_t fRunNumber;
+         int16_t  fTempDrs[kNumTemp];   // In units of 1/16 deg(?)
+         uint16_t fDac[kNumDac];
+         */
+
         if (old.fTriggerType != h.fTriggerType)
         {
@@ -1477 +1493 @@
             const pair<bool, boost::array<uint32_t,43>> run = Compare(&h, &h.fRunNumber);
             Print("Run", run);
+        }
+
+        if (old.fDNA != h.fDNA)
+        {
+            const pair<bool, boost::array<uint64_t,43>> dna = Compare(&h, &h.fDNA);
+            fDimDNA.setData(const_cast<uint64_t*>(dna.second.data())+3, 40*sizeof(uint64_t));
+            fDimDNA.updateService();
         }
 

trunk/FACT++/src/fad.cc

@@ -324 +324 @@
         fHeader.fBoardId = (fBoardId%10) | ((fBoardId/10)<<8);
         fHeader.fRunNumber = 1;
+        fHeader.fDNA = reinterpret_cast<uint64_t>(this);
         fHeader.fStatus = 0xf<<12 |
             FAD::EventHeader::kDenable    |
@@ -330 +331 @@
             FAD::EventHeader::kDcmReady   |
             FAD::EventHeader::kSpiSclk;
+
 
         fStartTime = Time(Time::utc).UnixTime();