Changeset 10804 for trunk/FACT++/src/fitsloader.cc

Timestamp:

05/24/11 19:34:26 (13 years ago)

Author:

tbretz

Message:

Simplified program options handling.

File:

• trunk/FACT++/src/fitsloader.cc (modified) (2 diffs)

trunk/FACT++/src/fitsloader.cc

@@ -22 +22 @@
  */
  //****************************************************************
-#include "FACT.h"
 #include "Event.h"
 #include "StateMachineDim.h"
@@ -681 +680 @@
         vm = conf.Parse(argc, argv);
     }
+#if BOOST_VERSION > 104000
+    catch (po::multiple_occurrences &e)
+    {
+        cerr << "Program options invalid due to: " << e.what() << " of '" << e.get_option_name() << "'." << endl;
+        return -1;
+    }
+#endif
     catch (exception& e)
     {
-        cout << "Sorry, could not properly parse the program's arguments. returning" << endl;
-        cout << e.what() << endl;
+        cerr << "Program options invalid due to: " << e.what() << endl;
         return -1;
     }
 
-    if (conf.HasPrint())
-            return -1;
-    if (conf.HasVersion())
-    {
-        FACT::PrintVersion(argv[0]);
+    if (conf.HasVersion() || conf.HasPrint())
         return -1;
-    }
 
     if (conf.HasHelp())