Changeset 10700 for trunk/FACT++

Timestamp:

05/13/11 13:38:56 (14 years ago)

Author:

tbretz

Message:

Fixed Dim format of TRIGGER_COUNTER and replaced Multiplicity by MULTIPLICITY in event names:

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -971 +971 @@
         ConnectionFTM(ioservice, imp),
         fDimPassport      ("FTM_CONTROL/PASSPORT",        "X:1;S:1", ""),
-        fDimTriggerCounter("FTM_CONTROL/TRIGGER_COUNTER", "X:1;S:1;S:1;S:2;S:1;S:1;S:21;S:1;S:1", ""),
+        fDimTriggerCounter("FTM_CONTROL/TRIGGER_COUNTER", "X:1;I:1", ""),
         fDimError         ("FTM_CONTROL/ERROR",           "X:1;S:1;S:28", ""),
         fDimFtuList       ("FTM_CONTROL/FTU_LIST",        "X:1;X:1;S:1;C:4;X:40;C:40;C:40",  ""),
@@ -1516 +1516 @@
              "|LPext[int]:number of triggers of the external light pulser");
 
-        AddEvent("SET_TRIGGER_Multiplicity", "S:1", kStateIdle)
+        AddEvent("SET_TRIGGER_MULTIPLICITY", "S:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetTriggerMultiplicity, this, _1))
             ("Setup the Multiplicity condition for physcis triggers"
@@ -1525 +1525 @@
             ("");
 
-        AddEvent("SET_CALIBRATION_Multiplicity", "S:1", kStateIdle)
+        AddEvent("SET_CALIBRATION_MULTIPLICITY", "S:1", kStateIdle)
             (boost::bind(&StateMachineFTM::SetCalibMultiplicity, this, _1))
             ("Setup the Multiplicity condition for artificial (calibration) triggers"