Changeset 10785 for trunk

Timestamp:

05/23/11 15:15:54 (14 years ago)

Author:

tbretz

Message:

Fixed order of arguments in description of SET_TRIGGER_SEQUENCE; removed some obsolete whitespaces from some output; changed SET_TRIGGER_SEQUENCE from C:3 to S:3 to make it work correctly from the prompt.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -790 +790 @@
     }
 
-    bool SetTriggerSeq(const uint8_t d[3])
+    bool SetTriggerSeq(const uint16_t d[3])
     {
         const uint16_t oldset = fStaticData.fGeneralSettings;
@@ -1240 +1240 @@
 
         if (!fFTM.SetTriggerDelay(evt.GetInt()))
-            T::Warn("SetTriggerDealy -  Value out of range.");
+            T::Warn("SetTriggerDealy - Value out of range.");
 
         return T::GetCurrentState();
@@ -1251 +1251 @@
 
         if (!fFTM.SetTimeMarkerDelay(evt.GetInt()))
-            T::Warn("SetTimeMarkerDelay -  Value out of range.");
+            T::Warn("SetTimeMarkerDelay - Value out of range.");
 
         return T::GetCurrentState();
@@ -1262 +1262 @@
 
         if (!fFTM.SetPrescaling(evt.GetInt()-1))
-            T::Warn("SetPrescaling -  Value out of range.");
+            T::Warn("SetPrescaling - Value out of range.");
 
         return T::GetCurrentState();
@@ -1269 +1269 @@
     int SetTriggerSeq(const EventImp &evt)
     {
-        if (!CheckEventSize(evt.GetSize(), "SetTriggerSeq", 3))
-            return T::kSM_FatalError;
-
-        const uint8_t *data = reinterpret_cast<const uint8_t*>(evt.GetData());
+        if (!CheckEventSize(evt.GetSize(), "SetTriggerSeq", 6))
+            return T::kSM_FatalError;
+
+        const uint16_t *data = reinterpret_cast<const uint16_t*>(evt.GetData());
 
         if (!fFTM.SetTriggerSeq(data))
-            T::Warn("SetTriggerSeq -  Value out of range.");
+            T::Warn("SetTriggerSeq - Value out of range.");
 
         return T::GetCurrentState();
@@ -1286 +1286 @@
 
         if (!fFTM.SetDeadTime(evt.GetInt()))
-            T::Warn("SetDeadTime -  Value out of range.");
+            T::Warn("SetDeadTime - Value out of range.");
 
         return T::GetCurrentState();
@@ -1573 +1573 @@
              "|Enable[bool]:Enable clock conditioner (yes/no)");
 
-        AddEvent("SET_TRIGGER_SEQUENCE", "C:3", kStateIdle)
+        AddEvent("SET_TRIGGER_SEQUENCE", "S:3", kStateIdle)
             (boost::bind(&StateMachineFTM::SetTriggerSeq, this, _1))
             ("Setup the sequence of artificial triggers produced by the FTM"
-             "|Ped[int]:number of pedestal triggers in a row"
-             "|LPint[int]:number of triggers of the internal light pulser"
-             "|LPext[int]:number of triggers of the external light pulser");
+             "|Ped[short]:number of pedestal triggers in a row"
+             "|LPext[short]:number of triggers of the external light pulser"
+             "|LPint[short]:number of triggers of the internal light pulser");
 
         AddEvent("SET_TRIGGER_MULTIPLICITY", "S:1", kStateIdle)