Changeset 10573 for trunk/FACT++/src

Timestamp:

05/04/11 15:26:43 (14 years ago)

Author:

tbretz

Message:

Unified the new setters.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -619 +619 @@
         return true;
     }
+
+    bool SetVal(uint32_t &dest, uint32_t val, uint32_t max)
+    {
+        if (val>max)
+            return false;
+
+        if (dest==val)
+            return true;
+
+        dest = val;
+
+        CmdSendStatDat();
+
+        return true;
+    }
+
     bool SetTriggerInterval(uint32_t val)
     {
-        if (val>StaticData::kMaxTriggerInterval)
-            return false;
-
-        fStaticData.fTriggerInterval = val;
-
-        CmdSendStatDat();
-
-        return true;
+        return Set(fStaticData.fTriggerInterval, val, StaticData::kMaxTriggerInterval);
     }
 
     bool SetTriggerDelay(uint32_t val)
     {
-        if (val>StaticData::kMaxDelayTrigger)
-            return false;
-
-        fStaticData.fDelayTrigger = val;
-
-        CmdSendStatDat();
-
-        return true;
+        return Set(fStaticData.fDelayTrigger, val, StaticData::kMaxDelayTrigger);
     }
 
     bool SetTimeMarkerDelay(uint32_t val)
     {
-        if (val>StaticData::kMaxDelayTimeMarker)
-            return false;
-
-        fStaticData.fDelayTimeMarker = val;
-
-        CmdSendStatDat();
-
-        return true;
+        return Set(fStaticData.fDelayTimeMarker, val, StaticData::kMaxDelayTimeMarker);
     }
 
     bool SetDeadTime(uint32_t val)
     {
-        if (val>StaticData::kMaxDeadTime)
-            return false;
-
-        fStaticData.fDeadTime = val;
-
-        CmdSendStatDat();
-
-        return true;
+        return Set(fStaticData.fDeadTime, val, StaticData::kMaxDeadTime);
     }
 
@@ -1191 +1179 @@
 
 
-        // ENABLE_FTU             idx bool
-        // ---> EnableFtu(idx==-1, bool)
-
         // ENABLE_TRIGGER         bool
         // ENABLE_EXT1            bool
@@ -1200 +1185 @@
         // ---> Enable(bit, bool)
 
-
         // SET_TRIGGER_SEQUENCE   val val val
         // ---> SetTriggerSequence(val, val, val)
-
-        // SET_TRIGGER_INTERVAL   val
-        // SET_TRIGGER_DELAY      val
-        // SET_TIME_MARKER_DELAY  val
-        // SET_DEAD_TIME          val
-        // ---> SetXYZ(val)
 
         // SET_PRESCALING         idx val