Changeset 10635 for trunk

Timestamp:

05/09/11 20:16:55 (14 years ago)

Author:

tbretz

Message:

Unified help output more; echanged constructors of DimDescribedService

File:

• trunk/FACT++/src/dataLogger.cc (modified) (6 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -42 +42 @@
  */
  //****************************************************************
+#include "FACT.h"
 #include "Event.h"
 #include "Time.h"
@@ -352 +353 @@
 {
                 //create the DIM service
-                int dataSize = 2*sizeof(long) + sizeof(long);
+//              int dataSize = 2*sizeof(long) + sizeof(long);
 
                 DataLoggerStats statVar;
@@ -365 +366 @@
                         statVar.freeSpace = -1;
 
-                DimDescribedService srvc ("DATA_LOGGER/STATS", "X:3", &statVar, dataSize, "Add description here");
+                DimDescribedService srvc ("DATA_LOGGER/STATS", "X:3", statVar, "Add description here");
                 fPreviousSize = 0;
                 bool statWarning = false;
@@ -559 +560 @@
                 fToDim.fileName[0] = '\0';
 
-                fOpenedNightlyFiles = new DimDescribedService((GetName() + "/FILENAME_NIGHTLY").c_str(), "I:1;C", &fToDim, sizeof(int)+1,
+                fOpenedNightlyFiles = new DimDescribedService(GetName() + "/FILENAME_NIGHTLY", "I:1;C", fToDim,
                                                               "Path and base name which is used to compile the filenames for the nightly files."
                                                               "|Type[int]:type of open files (1=log, 2=rep, 4=fits)"
                                                               "|Name[string]:path and base file name");
 
-                fOpenedRunFiles = new DimDescribedService((GetName() + "/FILENAME_RUN").c_str(), "I:1;C", &fToDim, sizeof(int)+1,
-                                                              "Path and base name which is used to compile the filenames for the run files."
-                                                              "|Type[int]:type of open files (1=log, 2=rep, 4=fits)"
-                                                              "|Name[string]:path and base file name");
+                fOpenedRunFiles = new DimDescribedService(GetName() + "/FILENAME_RUN", "I:1;C", fToDim,
+                                                          "Path and base name which is used to compile the filenames for the run files."
+                                                          "|Type[int]:type of open files (1=log, 2=rep, 4=fits)"
+                                                          "|Name[string]:path and base file name");
 
                 fNumSubAndFitsData.numSubscriptions = 0;
                 fNumSubAndFitsData.numOpenFits = 0;
-                fNumSubAndFits = new DimDescribedService((GetName() + "/NUM_SUBS").c_str(), "I:2", &fNumSubAndFitsData, sizeof(NumSubAndFitsType),
+                fNumSubAndFits = new DimDescribedService(GetName() + "/NUM_SUBS", "I:2", fNumSubAndFitsData,
                                                          "Shows number of services to which the data logger is currently subscribed and the total number of open files."
                                                          "|Subscriptions[int]:number of dim services to which the data logger is currently subscribed."
@@ -2060 +2061 @@
         "writes them to ascii and fits files.\n"
         "\n"
-        "Usage: dataLogger [-c type] [OPTIONS]\n"
-        "  or:  dataLogger [OPTIONS]\n"
-        "\n"
-        "Options:\n"
-        "The following describes the available commandline options. "
-        "For further details on how command line option are parsed "
-        "and in which order which configuration sources are accessed "
-        "please refer to the class reference of the Configuration class.";
-    cout << endl;
-
-}
-
-void PrintHelp()
-{
-    cout << "\n"
         "The default is that the program is started without user interaction. "
         "All actions are supposed to arrive as DimCommands. Using the -c "
         "option, a local shell can be initialized. With h or help a short "
-        "help message about the usuage can be brought to the screen."
-        << endl;
-}
-
-/*
- The first line of the --version information is assumed to be in one
- of the following formats:
-
-   <version>
-   <program> <version>
-   {GNU,Free} <program> <version>
-   <program> ({GNU,Free} <package>) <version>
-   <program> - {GNU,Free} <package> <version>
-
- and separated from any copyright/author details by a blank line.
-
- Handle multi-line bug reporting sections of the form:
-
-   Report <program> bugs to <addr>
-   GNU <package> home page: <url>
-   ...
-*/
-void PrintVersion(const char *name)
-{
-    cout <<
-        name << " - "PACKAGE_STRING"\n"
+        "help message about the usuage can be brought to the screen.\n"
         "\n"
-        "Written by Thomas Bretz et al.\n"
-        "\n"
-        "Report bugs to <"PACKAGE_BUGREPORT">\n"
-        "Home page: "PACKAGE_URL"\n"
-        "\n"
-        "Copyright (C) 2011 by the FACT Collaboration.\n"
-        "This is free software; see the source for copying conditions.\n"
-        << endl;
-}
-
+        "Usage: dataLogger [-c type] [OPTIONS]\n"
+        "  or:  dataLogger [OPTIONS]\n";
+    cout << endl;
+
+}
+
+void PrintHelp()
+{
+    /* Additional help text which is printed after the configuration
+     options goes here */
+}
 
 void SetupConfiguration(Configuration &conf)
@@ -2164 +2126 @@
     if (conf.HasVersion())
     {
-        PrintVersion(argv[0]);
+        FACT::PrintVersion(argv[0]);
         return -1;
     }