Changeset 10581 for trunk

Timestamp:

05/04/11 20:34:16 (13 years ago)

Author:

tbretz

Message:

Fixed SetVal

File:

• trunk/FACT++/src/ftmctrl.cc (modified) (2 diffs)

trunk/FACT++/src/ftmctrl.cc

@@ -620 +620 @@
     }
 
-    bool SetVal(uint32_t &dest, uint32_t val, uint32_t max)
+    bool SetVal(uint16_t *dest, uint32_t val, uint32_t max)
     {
         if (val>max)
             return false;
 
-        if (dest==val)
+        if (*dest==val)
             return true;
 
-        dest = val;
+        *dest = val;
 
         CmdSendStatDat();
@@ -637 +637 @@
     bool SetTriggerInterval(uint32_t val)
     {
-        return Set(fStaticData.fTriggerInterval, val, StaticData::kMaxTriggerInterval);
+        return SetVal(&fStaticData.fTriggerInterval, val, StaticData::kMaxTriggerInterval);
     }
 
     bool SetTriggerDelay(uint32_t val)
     {
-        return Set(fStaticData.fDelayTrigger, val, StaticData::kMaxDelayTrigger);
+        return SetVal(&fStaticData.fDelayTrigger, val, StaticData::kMaxDelayTrigger);
     }
 
     bool SetTimeMarkerDelay(uint32_t val)
     {
-        return Set(fStaticData.fDelayTimeMarker, val, StaticData::kMaxDelayTimeMarker);
+        return SetVal(&fStaticData.fDelayTimeMarker, val, StaticData::kMaxDelayTimeMarker);
     }
 
     bool SetDeadTime(uint32_t val)
     {
-        return Set(fStaticData.fDeadTime, val, StaticData::kMaxDeadTime);
+        return SetVal(&fStaticData.fDeadTime, val, StaticData::kMaxDeadTime);
     }