Changeset 15130

Timestamp:

03/21/13 09:13:58 (12 years ago)

Author:

tbretz

Message:

Some more updates to improve the log output and reduce the amount during normal data taking.

File:

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

trunk/FACT++/src/ftmctrl.cc

@@ -422 +422 @@
         array<uint16_t, 5> cmd = {{ '@', u1, u2, u3, u4 }};
 
-        ostringstream msg;
-        msg << "Sending command:" << hex;
-        msg << " 0x" << setw(4) << setfill('0') << cmd[0];
-        msg << " 0x" << setw(4) << setfill('0') << u1;
-        msg << " 0x" << setw(4) << setfill('0') << u2;
-        msg << " 0x" << setw(4) << setfill('0') << u3;
-        msg << " 0x" << setw(4) << setfill('0') << u4;
-        msg << " (+" << dec << dat.size() << " words)";
-        Message(msg);
+        if (fIsVerbose)
+        {
+            ostringstream msg;
+            msg << "Sending command:" << hex;
+            msg << " 0x" << setw(4) << setfill('0') << cmd[0];
+            msg << " 0x" << setw(4) << setfill('0') << u1;
+            msg << " 0x" << setw(4) << setfill('0') << u2;
+            msg << " 0x" << setw(4) << setfill('0') << u3;
+            msg << " 0x" << setw(4) << setfill('0') << u4;
+            msg << " (+" << dec << dat.size() << " words)";
+            Message(msg);
+        }
 
         vector<uint16_t> out(cmd.size()+dat.size());
@@ -444 +447 @@
         array<uint16_t, 5> cmd = {{ '@', u1, u2, u3, u4 }};
 
-        ostringstream msg;
-        msg << "Sending command:" << hex;
-        msg << " 0x" << setw(4) << setfill('0') << cmd[0];
-        msg << " 0x" << setw(4) << setfill('0') << u1;
-        msg << " 0x" << setw(4) << setfill('0') << u2;
-        msg << " 0x" << setw(4) << setfill('0') << u3;
-        msg << " 0x" << setw(4) << setfill('0') << u4;
-        msg << " (+" << dec << dat.size() << " words)";
-        Message(msg);
+        if (fIsVerbose)
+        {
+            ostringstream msg;
+            msg << "Sending command:" << hex;
+            msg << " 0x" << setw(4) << setfill('0') << cmd[0];
+            msg << " 0x" << setw(4) << setfill('0') << u1;
+            msg << " 0x" << setw(4) << setfill('0') << u2;
+            msg << " 0x" << setw(4) << setfill('0') << u3;
+            msg << " 0x" << setw(4) << setfill('0') << u4;
+            msg << " (+" << dec << dat.size() << " words)";
+            Message(msg);
+        }
 
         vector<uint16_t> out(cmd.size()+dat.size());
@@ -510 +516 @@
     void CmdStartRun()
     {
+        Info("Sending start trigger.");
+
         PostCmd(FTM::kCmdStartRun, FTM::kStartRun);
 
@@ -518 +526 @@
     void CmdStopRun()
     {
+        Info("Sending stop trigger.");
+
         PostCmd(FTM::kCmdStopRun);
 
@@ -566 +576 @@
             return false;
 
+        Info("Sending crate reset for crate "+to_string(addr));
         PostCmd(FTM::kCmdCrateReset, 1<<addr);
 
@@ -573 +584 @@
     bool CmdResetCamera()
     {
+        Info("Sending camera reset");
+
         PostCmd(FTM::kCmdCrateReset, FTM::kResetCrate0);
         PostCmd(FTM::kCmdCrateReset, FTM::kResetCrate1);
@@ -2595 +2608 @@
         ("no-dim",        po_bool(),  "Disable dim services")
         ("addr,a",        var<string>("localhost:5000"),  "Network address of FTM")
-        ("quiet,q",       po_bool(),  "Disable printing contents of all received messages (except dynamic data) in clear text.")
+        ("quiet,q",       po_bool(true), "Disable printing contents of all received messages (except dynamic data) in clear text.")
         ("hex-out",       po_bool(),  "Enable printing contents of all printed messages also as hex data.")
         ("dynamic-out",   po_bool(),  "Enable printing received dynamic data.")