Changeset 13006 for trunk

Timestamp:

03/07/12 18:48:02 (13 years ago)

Author:

tbretz

Message:

Reformated the output to make it better fit the help2man conversion.

Location:

trunk/FACT++/src

Files:

• dimctrl.cc (modified) (2 diffs)
• fitscheck.cc (added)
• fitsdump.cc (modified) (1 diff)

trunk/FACT++/src/dimctrl.cc

@@ -24 +24 @@
         "Usage: dimctrl [-c type] [OPTIONS]\n"
         "  or:  dimctrl [OPTIONS]\n\n";
-
-    Main::PrintUsage();
     cout << endl;
 }
@@ -31 +29 @@
 void PrintHelp()
 {
+    Main::PrintUsage();
 }
 

trunk/FACT++/src/fitsdump.cc

@@ -852 +852 @@
         "\n"
         "Usage: fitsdump [OPTIONS] fitsfile col col ... \n"
-        "  or:  fitsdump [OPTIONS]\n";
-
-    cout << endl;
-}
-
-void PrintHelp()
-{
-    cout <<
+        "  or:  fitsdump [OPTIONS]\n"
         "\n"
-        "To address a column several syntax is possible:\n"
-        "  ColumnName:        Will address all fields of a column\n"
-        "  ColumnName[n]:     Will address the n-th field of a column (starts with 0)\n"
-        "  ColumnName[n1:n2]: Will address all fields between n1 and including n2\n"
+        "Addressing a column:\n"
+        "  ColumnName:         Will address all fields of a column\n"
+        "  ColumnName[n]:      Will address the n-th field of a column (starts with 0)\n"
+        "  ColumnName[n1:n2]:  Will address all fields between n1 and including n2\n"
 #ifdef HAVE_ROOT
         "\n"
-        "To select some columns can use --filter\n"
-        "Such a selction is evaluated using TFormula, hence, every "
+        "Selecting a column:\n"
+        "  Commandline option:  --filter\n"
+        "  Explanation:  Such a selection is evaluated using TFormula, hence, every "
         "mathematical operation allowed in TFormula is allowed there, too. "
         "The reference is the column index as printed in the output stream, "
         "starting with 1. The index 0 is reserved for the row number.\n"
-        "\n"
-        "Example:\n"
-        "  fitsdump Zd --filter=\"[0]>20 && cos([1])*TMath::RadToDeg()<45\"\n"
-        "\n"
+#endif
+        ;
+    cout << endl;
+}
+
+void PrintHelp()
+{
+#ifdef HAVE_ROOT
+    cout <<
+        "\n\n"
+        "Examples:\n"
         "In --root mode, fitsdump support TFormula's syntax for all columns and the filter "
         "You can then refer to a column or a (single) index of the column just by its name "
         "If the index is omitted, 0 is assumed\n"
         "\n"
-
-        "Example:\n"
+        "  fitsdump Zd --filter=\"[0]>20 && cos([1])*TMath::RadToDeg()<45\"\n"
+        "\n"
+        "The columns can also be addressed with their names\n"
+        "\n"
         "  fitsdump \"(Zd+Err)*TMath::DegToRad()\" --filter=\"Num>100 && Num<200\"\n"
+        "\n"
         "is identical to\n"
+        "\n"
         "  fitsdump \"(Zd[0]+Err[0])*TMath::DegToRad()\" --filter=\"Num[0]>100 && Num[0]<200\"\n"
-        "A special placeholder exists for the row number:\n"
+        "\n"
+        "A special placeholder exists for the row number\n"
+        "\n"
         "  fitsdump \"#\" --filter=\"#>10 && #<100\"\n"
-#endif
         "\n";
     cout << endl;
-}
+#endif
+}
+
 
 void SetupConfiguration(Configuration& conf)