Changeset 12240 for trunk/FACT++

Timestamp:

10/23/11 14:53:12 (13 years ago)

Author:

tbretz

Message:

Some imporved output.

File:

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

trunk/FACT++/src/ratescan.cc

@@ -200 +200 @@
             fCounter++;
 
-            if (fSeconds>=fSecondsMax || fThresholdMin+fCounter*fThresholdStep>fThresholdMax)
+            if (fSeconds>=fSecondsMax)
             {
+                Message("Rate scan stopped due to timeout.");
+                fCounter=-1;
+                return;
+            }
+
+            if (fThresholdMin+fCounter*fThresholdStep>fThresholdMax)
+            {
+                Message("Rate scan finished.");
                 fCounter = -1;
-                cout << "The END" << endl;
+
                 //DimClient::sendCommandNB("FTM_CONTROL/STOP_RUN", NULL, 0);
                 return;
@@ -264 +272 @@
         const int32_t data[2] = { -1, fThresholdMin };
 
-        Message("Starting Trigger (FTM)");
+        //Message("Starting Trigger (FTM)");
         //Dim::SendCommand("FTM_CONTROL/SET_PRESCALING", int32_t(20));
         Dim::SendCommand("FTM_CONTROL/SET_THRESHOLD", data);
@@ -272 +280 @@
         fSeconds = -2;
 
+        ostringstream msg;
+        msg << "Rate scan from DAC=" << fThresholdMin << " to DAC=";
+        msg << fThresholdMax << " in steps of " << fThresholdStep;
+        msg << " started.";
+        Message(msg);
+
         return GetCurrentState();
     }
@@ -278 +292 @@
     {
         fCounter = -1;
+        Message("Rate scan manually stopped.");
 
         //if (fStatusFTM.second==FTM::kTakingData)