Changeset 10798

Timestamp:

05/24/11 17:38:02 (14 years ago)

Author:

tbretz

Message:

Simplified program options handling.

File:

• trunk/FACT++/src/fadctrl.cc (modified) (8 diffs)

trunk/FACT++/src/fadctrl.cc

@@ -11 +11 @@
 #include <boost/asio/deadline_timer.hpp>
 
-#include "FACT.h"
 #include "Dim.h"
 #include "Event.h"
@@ -75 +74 @@
             return;
 
-        Out() << endl << kBold << "Channel " << i << " received:" << endl;
         Out() << fChannelHeader[i];
         if (fIsHexOutput)
@@ -95 +93 @@
         {
             if (err==ba::error::eof)
-                Warn("Connection closed by remote host (FTM).");
+                Warn("Connection closed by remote host (FAD).");
 
             // 107: Transport endpoint is not connected (bs::error_code(107, bs::system_category))
@@ -1159 +1157 @@
             const int &idx = i->first;
 
-            // FIXME: There is a difference between
-            //        "connecting" and "disconnected"
-
-            // Check conistency eb/fadctrl
-
             // ----- Command socket -----
             if (c.IsConnecting())
@@ -1200 +1193 @@
 
         // ===== Return connection status =====
+
+        // fadctrl:       Always connecting if not disabled
+        // event builder:
 
         if (nconnected1==fBoards.size() && nconnected2==fBoards.size())
@@ -1544 +1540 @@
         ;
 
-    po::options_description control("FTM control options");
+    po::options_description control("FAD control options");
     control.add_options()
 //        ("addr,a",        var<string>("localhost:5000"),  "Network address of FTM")
@@ -1584 +1580 @@
 {
     Configuration conf(argv[0]);
+    conf.SetPrintUsage(PrintUsage);
     SetupConfiguration(conf);
 
@@ -1594 +1591 @@
     catch (po::multiple_occurrences &e)
     {
-        cout << "Error: " << e.what() << " of '" << e.get_option_name() << "' option." << endl;
-        cout << endl;
+        cerr << "Program options invalid due to: " << e.what() << " of '" << e.get_option_name() << "'." << endl;
         return -1;
     }
 #endif
-    catch (std::exception &e)
-    {
-        cout << "Error: " << e.what() << endl;
-        cout << endl;
-
+    catch (exception& e)
+    {
+        cerr << "Program options invalid due to: " << e.what() << endl;
         return -1;
     }
 
-    if (conf.HasPrint())
+    if (conf.HasVersion() || conf.HasPrint())
         return -1;
-
-    if (conf.HasVersion())
-    {
-        FACT::PrintVersion(argv[0]);
-        return -1;
-    }
 
     if (conf.HasHelp())