Changeset 10691 for trunk/FACT++/src/ftmctrl.cc

Timestamp:

05/12/11 22:55:23 (14 years ago)

Author:

tbretz

Message:

Added some docu; renamed Coincidence to multiplicity.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -505 +505 @@
     void CmdReqDynDat()
     {
-        PostCmd(FTM::kCmdRead, FTM::kReadDynamicData);
+        PostCmd(FTM::kCmdRead, FTM::kCmdDynamicData);
     }
 
     void CmdReqStatDat()
     {
-        PostCmd(FTM::kCmdRead, FTM::kReadStaticData);
+        PostCmd(FTM::kCmdRead, FTM::kCmdStaticData);
     }
 
     void CmdSendStatDat()
     {
-        PostCmd(fStaticData.HtoN(), FTM::kCmdWrite, FTM::kWriteStaticData);
+        PostCmd(fStaticData.HtoN(), FTM::kCmdWrite, FTM::kCmdStaticData);
 
         // Request the changed configuration to ensure the
@@ -553 +553 @@
 
         const boost::array<uint16_t, 2> data = {{ addr, val }};
-        PostCmd(data, FTM::kCmdWrite, FTM::kWriteRegister);
+        PostCmd(data, FTM::kCmdWrite, FTM::kCmdRegister);
 
         // Request the changed configuration to ensure the
@@ -568 +568 @@
 
         const boost::array<uint16_t, 1> data = {{ addr }};
-        PostCmd(data, FTM::kCmdRead, FTM::kReadRegister);
+        PostCmd(data, FTM::kCmdRead, FTM::kCmdRegister);
 
         return true;
@@ -813 +813 @@
     }
 
-    bool SetTriggerCoincidence(uint16_t n)
-    {
-        if (n==0 || n>FTM::StaticData::kMaxCoincidence)
+    bool SetTriggerMultiplicity(uint16_t n)
+    {
+        if (n==0 || n>FTM::StaticData::kMaxMultiplicity)
             return false;
 
-        if (n==fStaticData.fCoincidencePhysics)
+        if (n==fStaticData.fMultiplicityPhysics)
             return true;
 
-        fStaticData.fCoincidencePhysics = n;
+        fStaticData.fMultiplicityPhysics = n;
 
         CmdSendStatDat();
@@ -843 +843 @@
     }
 
-    bool SetCalibCoincidence(uint16_t n)
-    {
-        if (n==0 || n>FTM::StaticData::kMaxCoincidence)
+    bool SetCalibMultiplicity(uint16_t n)
+    {
+        if (n==0 || n>FTM::StaticData::kMaxMultiplicity)
             return false;
 
-        if (n==fStaticData.fCoincidenceCalib)
+        if (n==fStaticData.fMultiplicityCalib)
             return true;
 
-        fStaticData.fCoincidenceCalib = n;
+        fStaticData.fMultiplicityCalib = n;
 
         CmdSendStatDat();
@@ -1264 +1264 @@
     }
 
-    int SetTriggerCoincidence(const EventImp &evt)
-    {
-        if (!CheckEventSize(evt.GetSize(), "SetTriggerCoincidence", 2))
-            return T::kSM_FatalError;
-
-        if (!fFTM.SetTriggerCoincidence(evt.GetUShort()))
-            T::Warn("SetTriggerCoincidence -  Value out of range.");
-
-        return T::GetCurrentState();
-    }
-
-    int SetCalibCoincidence(const EventImp &evt)
-    {
-        if (!CheckEventSize(evt.GetSize(), "SetCalibCoincidence", 2))
-            return T::kSM_FatalError;
-
-        if (!fFTM.SetCalibCoincidence(evt.GetUShort()))
-            T::Warn("SetCalibCoincidence -  Value out of range.");
+    int SetTriggerMultiplicity(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetTriggerMultiplicity", 2))
+            return T::kSM_FatalError;
+
+        if (!fFTM.SetTriggerMultiplicity(evt.GetUShort()))
+            T::Warn("SetTriggerMultiplicity -  Value out of range.");
+
+        return T::GetCurrentState();
+    }
+
+    int SetCalibMultiplicity(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetCalibMultiplicity", 2))
+            return T::kSM_FatalError;
+
+        if (!fFTM.SetCalibMultiplicity(evt.GetUShort()))
+            T::Warn("SetCalibMultiplicity -  Value out of range.");
 
         return T::GetCurrentState();
@@ -1516 +1516 @@
              "|LPext[int]:number of triggers of the external light pulser");
 
-        AddEvent("SET_TRIGGER_COINCIDENCE", "S:1", kStateIdle)
-            (boost::bind(&StateMachineFTM::SetTriggerCoincidence, this, _1))
-            ("Setup the coincidence condition for physcis triggers"
+        AddEvent("SET_TRIGGER_Multiplicity", "S:1", kStateIdle)
+            (boost::bind(&StateMachineFTM::SetTriggerMultiplicity, this, _1))
+            ("Setup the Multiplicity condition for physcis triggers"
              "|N[int]:Number of requirered coincident triggers from sum-patches (1-40)");
 
@@ -1525 +1525 @@
             ("");
 
-        AddEvent("SET_CALIBRATION_COINCIDENCE", "S:1", kStateIdle)
-            (boost::bind(&StateMachineFTM::SetCalibCoincidence, this, _1))
-            ("Setup the coincidence condition for artificial (calibration) triggers"
+        AddEvent("SET_CALIBRATION_Multiplicity", "S:1", kStateIdle)
+            (boost::bind(&StateMachineFTM::SetCalibMultiplicity, this, _1))
+            ("Setup the Multiplicity condition for artificial (calibration) triggers"
              "|N[int]:Number of requirered coincident triggers from sum-patches (1-40)");