Changeset 10880

Timestamp:

05/27/11 17:41:52 (14 years ago)

Author:

tbretz

Message:

Use new Ptr() template to access EventImp contents.

Location:

trunk/FACT++/src

Files:

• fadctrl.cc (modified) (3 diffs)
• ftmctrl.cc (modified) (4 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -635 +635 @@
             return T::kSM_FatalError;
 
-        const uint32_t *dat = reinterpret_cast<const uint32_t*>(evt.GetData());
+        const uint32_t *dat = evt.Ptr<uint32_t>();
 
         if (!Check(dat, FAD::kMaxRegAddr, FAD::kMaxRegValue))
@@ -652 +652 @@
 
         // ---- was uint32_t
-        const int32_t *dat = reinterpret_cast<const int32_t*>(evt.GetData());
+        const int32_t *dat = evt.Ptr<int32_t>();
 
         // ---- -1 for all
@@ -669 +669 @@
             return T::kSM_FatalError;
 
-        const uint32_t *dat = reinterpret_cast<const uint32_t*>(evt.GetData());
+        const uint32_t *dat = evt.Ptr<uint32_t>();
 
         if (!Check(dat, FAD::kMaxDacAddr, FAD::kMaxDacValue))

trunk/FACT++/src/ftmctrl.cc

@@ -1083 +1083 @@
             return T::kSM_FatalError;
 
-        const unsigned int *dat = reinterpret_cast<const unsigned int*>(evt.GetData());
+        const uint32_t *dat = evt.Ptr<uint32_t>();
 
         if (dat[1]>uint16_t(-1))
@@ -1218 +1218 @@
             return T::kSM_FatalError;
 
-        const int32_t *data = reinterpret_cast<const int32_t*>(evt.GetData());
+        const int32_t *data = evt.Ptr<int32_t>();
 
         if (!fFTM.SetThreshold(data[0], data[1]))
@@ -1231 +1231 @@
             return T::kSM_FatalError;
 
-        const int32_t &board  = *reinterpret_cast<const int32_t*>(evt.GetText());
-        const int8_t  &enable = *reinterpret_cast<const int8_t*>(evt.GetText()+4);
+        const int32_t &board  = evt.Get<int32_t>();
+        const int8_t  &enable = evt.Get<int8_t>(4);
 
         if (!fFTM.EnableFTU(board, enable))
@@ -1300 +1300 @@
             return T::kSM_FatalError;
 
-        const uint16_t *data = reinterpret_cast<const uint16_t*>(evt.GetData());
+        const uint16_t *data = evt.Ptr<uint16_t>();
 
         if (!fFTM.SetTriggerSeq(data))