Changeset 12323

Timestamp:

10/29/11 21:37:20 (13 years ago)

Author:

tbretz

Message:

Added the possibility to change the step size and maximum during a ratescan.

File:

• trunk/FACT++/src/ratescan.cc (modified) (6 diffs)

trunk/FACT++/src/ratescan.cc

@@ -66 +66 @@
 
     DimDescribedService fDimData;
+    DimDescribedService fDimProc;
 
     int fCounter;
@@ -94 +95 @@
 
     string fCommand;
+
+    void UpdateProc()
+    {
+        const array<uint32_t,3> v = {{ fThresholdMin, fThresholdMax, fThresholdStep }};
+        fDimProc.Update(v);
+    }
 
     pair<Time, int> GetNewState(DimStampedInfo &info) const
@@ -280 +287 @@
         fThresholdStep = evt.Get<uint32_t>(8);
 
+        UpdateProc();
+
         const Time now;
 
@@ -368 +377 @@
         fReference    = kPatch;
         fReferenceIdx = evt.GetUInt();
+
+        return GetCurrentState();
+    }
+
+    int ChangeStepSize(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "ChangeStepSize", 4))
+            return kSM_FatalError;
+
+        fThresholdStep = evt.Get<uint32_t>();
+
+        UpdateProc();
+
+        return GetCurrentState();
+    }
+
+    int ChangeMaximum(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "ChangeMaximum", 4))
+            return kSM_FatalError;
+
+        fThresholdMax = evt.Get<uint32_t>();
 
         return GetCurrentState();
@@ -401 +432 @@
         fRates("FTM_CONTROL/TRIGGER_RATES", (void*)NULL, 0, this),
         fDimData("RATE_SCAN/DATA", "I:1;F:1;F:1;F:1;F:40;F:160", ""),
+        fDimProc("RATE_SCAN/PROCESS_DATA", "I:1;I:1;I:1",
+                 "Rate scan process data"
+                 "|min[DAC]:Value at which scan was started"
+                 "|max[DAC]:Value at which scan will end"
+                 "|step[DAC]:Step size for scan"),
         fCounter(-1), fReference(kCamera), fReferenceIdx(0)
     {
@@ -436 +472 @@
              "|max[int]:Limiting value in DAC counts"
              "|step[int]:Single step in DAC counts");
+
+        AddEvent("CHANGE_STEP_SIZE", "I:1", kStateInProgress)
+            (bind(&StateMachineRateScan::ChangeStepSize, this, placeholders::_1))
+            ("Change the step size during a ratescan in progress"
+             "|step[int]:Single step in DAC counts");
+
+        AddEvent("CHANGE_MAXIMUM", "I:1", kStateInProgress)
+            (bind(&StateMachineRateScan::ChangeMaximum, this, placeholders::_1))
+            ("Change the maximum limit during a ratescan in progress"
+             "|max[int]:Limiting value in DAC counts");
 
         AddEvent("STOP", kStateInProgress)