Changeset 16776 for trunk/FACT++/src

Timestamp:

06/08/13 12:55:12 (11 years ago)

Author:

tbretz

Message:

Implemented SET_SELECTED_THRESHOLDS to allow setting severalö thresholds during data taking at once... this should have a slightly higher performance than requesting a static data block after each setting. Maybe the difference is small, but nevertheless.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -719 +719 @@
         return true;
     }
-    /*
+
     bool SetSelectedThresholds(const int32_t *th)
     {
         for (int i=0; i<FTM::StaticData::kMaxPatchIdx; i++)
-            if (th[i]<0 || th[i]>FTM::StaticData::kMaxDAC)
+            if (th[i]>FTM::StaticData::kMaxDAC)
                 return false;
 
@@ -730 +730 @@
         for (int i=0; i<=FTM::StaticData::kMaxPatchIdx; i++)
         {
-            if (fBufStaticData[i/4].fDac[i%4]!=th[i])
-            {
-
-                // Calculate offset in static data block
-                const uint16_t addr = (uintptr_t(&fStaticData[i/4].fDAC[i%4])-uintptr_t(&fStaticData))/2;
-
-                // From CmdSetRegister
-                const array<uint16_t, 2> data = {{ addr, uint16_t(th[i]) }};
-                PostCmd(data, FTM::kCmdWrite, FTM::kCmdRegister);
-
-                reinterpret_cast<uint16_t*>(&fBufStaticData)[addr] = th[i];
-            }
-        }
-
-        // Now execute change before the static data is requested back
-        PostCmd(FTM::kCmdConfigFTU, (patch/40) | (((patch/4)%10)<<8));
+            if (th[i]<0 || fBufStaticData[i/4].fDAC[i%4]==th[i])
+                continue;
+
+            // Calculate offset in static data block
+            const uint16_t addr = (uintptr_t(&fStaticData[i/4].fDAC[i%4])-uintptr_t(&fStaticData))/2;
+
+            reinterpret_cast<uint16_t*>(&fBufStaticData)[addr] = th[i];
+
+            // From CmdSetRegister
+            const array<uint16_t, 2> arr = {{ addr, uint16_t(th[i]) }};
+            PostCmd(arr, FTM::kCmdWrite, FTM::kCmdRegister);
+            PostCmd(FTM::kCmdConfigFTU, (i/40) | (((i/4)%10)<<8));
+        }
 
         //CmdGetRegister(addr);
@@ -751 +748 @@
 
         return true;
-    }*/
-
+    }
 
     bool SetAllThresholds(const int32_t *th)
@@ -1632 +1628 @@
     }
 
+    int SetSelectedThresholds(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetSelectedThresholds", 160*4))
+            return T::kSM_FatalError;
+
+        const int32_t *data = evt.Ptr<int32_t>();
+        if (!fFTM.SetSelectedThresholds(data))
+        {
+            ostringstream msg;
+            msg << "SetAllThresholds - Value out of range, maximum 0xffff.";
+            T::Warn(msg);
+        }
+
+        return T::GetCurrentState();
+    }
+
     int SetAllThresholds(const EventImp &evt)
     {
@@ -2178 +2190 @@
              "|Threshold[counts]:Threshold to be set in binary counts");
 
-        T::AddEvent("SET_ALL_THRESHOLDS", "I:160", FTM::State::kIdle, FTM::State::kValid, FTM::State::kConfigured, FTM::State::kTriggerOn)
+        T::AddEvent("SET_SELECTED_THRESHOLDS", "I:160", FTM::State::kTriggerOn)
+            (bind(&StateMachineFTM::SetAllThresholds, this, placeholders::_1))
+            ("Set the comparator thresholds. Only thresholds which are different and >=0 are sent."
+             "|Thresholds[counts]:Threshold to be set in binary counts");
+
+        T::AddEvent("SET_ALL_THRESHOLDS", "I:160", FTM::State::kIdle, FTM::State::kValid, FTM::State::kConfigured)
             (bind(&StateMachineFTM::SetAllThresholds, this, placeholders::_1))
             ("Set the comparator thresholds"