Changeset 10924

Timestamp:

06/07/11 22:19:53 (13 years ago)

Author:

tbretz

Message:

Some small updates; added possibility for compilation under C and C++

File:

• trunk/FACT++/src/HeadersFAD.h (modified) (12 diffs)

trunk/FACT++/src/HeadersFAD.h

@@ -2 +2 @@
 #define FACT_HeadersFAD
 
+#ifdef __cplusplus
 #include <ostream>
 
@@ -13 +14 @@
 namespace FAD
 {
+#endif
     enum Enable
     {
@@ -31 +33 @@
     enum Commands
     {
-        kCmdWrite           = 0x0500,         // write to Config-RAM
-        kCmdWriteRoi        = kCmdWrite|0x00, // Baseaddress ROI-Values
-        kCmdWriteDac        = kCmdWrite|0x24, // Baseaddress DAC-Values
-
-        kCmdWriteRate       = kCmdWrite|0x2c, // Continous trigger rate
-        kCmdWriteRunNumber  = kCmdWrite|0x2d, // 
+        kCmdWrite             = 0x0500,         // write to Config-RAM
+        kCmdWriteRoi          = kCmdWrite|0x00, // Baseaddress ROI-Values
+        kCmdWriteDac          = kCmdWrite|0x24, // Baseaddress DAC-Values
+
+        kCmdWriteRate         = kCmdWrite|0x2c, // Continous trigger rate
+        kCmdWriteRunNumberMSW = kCmdWrite|0x2d, // Run Number most  significant word
+        kCmdWriteRunNumberLSW = kCmdWrite|0x2e, // Run Number least significant word
 
         /*
@@ -71 +74 @@
     enum
     {
-        kMaxRegAddr  = 0xff,    // Highest address in config-ram
-        kMaxRegValue = 0xffff,
-        kMaxDacAddr  = kNumDac-1,
-        kMaxDacValue = 0xffff,
-        kMaxRoiAddr  = kNumChannels-1,
-        kMaxRoiValue = kMaxBins,
+        kMaxRegAddr   = 0xff,    // Highest address in config-ram
+        kMaxRegValue  = 0xffff,
+        kMaxDacAddr   = kNumDac-1,
+        kMaxDacValue  = 0xffff,
+        kMaxRoiAddr   = kNumChannels-1,
+        kMaxRoiValue  = kMaxBins,
+        kMaxRunNumber = 0xffffffff,
     };
 
@@ -89 +93 @@
     struct EventHeader
     {
+#ifdef __cplusplus
         enum Bits
         {
@@ -99 +104 @@
             kSpiSclk       = 1<< 5,
         };
-
+#endif
         // Einmalig:     (new header changes entry in array --> send only if array changed)
         // ----------------------------------
@@ -173 +178 @@
         uint16_t fDac[kNumDac];
         //
-
+#ifdef __cplusplus
         EventHeader() { init(*this); }
 
@@ -260 +265 @@
         void clear() { reset(*this); }
         void print(std::ostream &out) const;
+#endif
 
     } __attribute__((__packed__));
@@ -271 +277 @@
         // uint16_t fData[];
 
+#ifdef __cplusplus
         ChannelHeader() { init(*this); }
 
@@ -289 +296 @@
         uint16_t Chip() const    { return fId>>4; }
         uint16_t Channel() const { return fId&0xf; }
-
+#endif
     } __attribute__((__packed__));
 
@@ -386 +393 @@
 */
     // --------------------------------------------------------------------
-
+#ifdef __cplusplus
     inline std::ostream &operator<<(std::ostream &out, const EventHeader &h)
     {
@@ -398 +405 @@
         return out;
     }
+#endif
+
+#ifdef __cplusplus
 };
-
-#endif
+#endif
+
+#endif