Changeset 12238 for trunk

Timestamp:

10/23/11 14:37:55 (13 years ago)

Author:

tbretz

Message:

Give scan range with the START command.

File:

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

trunk/FACT++/src/ratescan.cc

@@ -169 +169 @@
                 reference = fTriggersPatch[fReferenceIdx];
 
-            if (sqrt(reference)>fResolution*reference && fSeconds<fSecondsMax)
+            if ((reference==0 || sqrt(reference)>fResolution*reference) && fSeconds<fSecondsMax)
             {
                 ostringstream out;
@@ -176 +176 @@
                     out << " (" << sqrt(reference)/reference << ")";
                 Info(out);
+
                 return;
             }
@@ -238 +239 @@
     }
 
-    int StartRateScan()
-    {
+    int StartRateScan(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "StartRateScan", 12))
+            return kSM_FatalError;
+
+        fThresholdMin   = evt.Get<uint32_t>();
+        fThresholdMax   = evt.Get<uint32_t>(4);
+        fThresholdStep = evt.Get<uint32_t>(8);
+
         ofstream fout("ratescan.txt", ios::app);
         fout << "# ----- " << Time() << " -----" << endl;
@@ -257 +265 @@
 
         Message("Starting Trigger (FTM)");
-        Dim::SendCommand("FTM_CONTROL/SET_PRESCALING", int32_t(20));
+        //Dim::SendCommand("FTM_CONTROL/SET_PRESCALING", int32_t(20));
         Dim::SendCommand("FTM_CONTROL/SET_THRESHOLD", data);
         //Dim::SendCommand("FTM_CONTROL/STOP_RUN");
@@ -371 +379 @@
                      "Rate scan in progress.");
 
-        AddEvent("START", kStateConnected)
-            (bind(&StateMachineRateScan::StartRateScan, this))
-            ("");
-
-        AddEvent("START", kStateConnected)
-            (bind(&StateMachineRateScan::StartRateScan, this))
-            ("");
+        AddEvent("START", "I:3", kStateConnected)
+            (bind(&StateMachineRateScan::StartRateScan, this, placeholders::_1))
+            ("Start rate scan for the defined range"
+             "|min[int]:Start value in DAC counts"
+             "|max[int]:Limiting value in DAC counts"
+             "|step[int]:Single step in DAC counts");
 
         AddEvent("STOP", kStateInProgress)
@@ -428 +435 @@
 //             "|verbosity[bool]:disable or enable verbosity for received data (yes/no), except dynamic data");
 */
+/*
+        AddEvent("SET_RANGE", "I:3")
+            (bind(&StateMachineRateScan::SetRange, this, placeholders::_1))
+            ("Set raneg for ratescane"
+             "|min[int]:Start value in DAC counts"
+             "|max[int]:Limiting value in DAC counts"
+             "|step[int]:Single step in DAC counts");
+*/
         AddEvent("PRINT")
             (bind(&StateMachineRateScan::Print, this))
@@ -441 +456 @@
             return 1;
         }*/
-
-        fThresholdMin  = 0;
-        fThresholdMax  = 100;
-        fThresholdStep = 1;
 
         fSecondsMax    = 150;