Changeset 12239

Timestamp:

10/23/11 14:47:52 (13 years ago)

Author:

tbretz

Message:

Added configuration options and more help output.

File:

• trunk/FACT++/src/ratescan.cc (modified) (4 diffs)

trunk/FACT++/src/ratescan.cc

@@ -388 +388 @@
         AddEvent("STOP", kStateInProgress)
             (bind(&StateMachineRateScan::StopRateScan, this))
-            ("");
+            ("Staop a ratescan in progress");
 
         AddEvent("SET_REFERENCE_CAMERA", kStateDimNetworkNA, kStateDisconnected, kStateConnected)
             (bind(&StateMachineRateScan::SetReferenceCamera, this))
-            ("");
+            ("Use the camera trigger rate as reference for the reolution");
         AddEvent("SET_REFERENCE_BOARD", "I:1", kStateDimNetworkNA, kStateDisconnected, kStateConnected)
             (bind(&StateMachineRateScan::SetReferenceBoard, this, placeholders::_1))
-            ("");
+            ("Use the given board trigger-rate as reference for the reolution"
+             "|board[idx]:Index of the board (4*crate+board)");
         AddEvent("SET_REFERENCE_PATCH", "I:1", kStateDimNetworkNA, kStateDisconnected, kStateConnected)
             (bind(&StateMachineRateScan::SetReferenceBoard, this, placeholders::_1))
-            ("");
+            ("Use the given patch trigger-rate as reference for the reolution"
+             "|patch[idx]:Index of the patch (360*crate+36*board+patch)"            );
 
 /*
@@ -450 +452 @@
     int EvalOptions(Configuration &conf)
     {
-        /*
-        if (!fMap.Read(conf.Get<string>("pixel-map-file")))
-        {
-            Error("Reading mapping table from "+conf.Get<string>("pixel-map-file")+" failed.");
-            return 1;
-        }*/
-
-        fSecondsMax    = 150;
-        fResolution    = 0.05;
+        fSecondsMax = conf.Get<uint16_t>("max-wait");
+        fResolution = conf.Get<double>("resolution");
 
         return -1;
@@ -476 +471 @@
 void SetupConfiguration(Configuration &conf)
 {
-    /*
     po::options_description control("Rate scan options");
     control.add_options()
-        ("pixel-map-file",  var<string>("FACTmapV5a.txt"), "Pixel mapping file. Used here to get the default reference voltage.")
+        ("max-wait",   var<uint16_t>(150), "The maximum number of seconds to wait to get the anticipated resolution for a point.")
+        ("resolution", var<double>(0.05),  "The minimum resolution required for a single data point.")
         ;
 
     conf.AddOptions(control);
-    */
 }
 
@@ -498 +492 @@
 {
     cout <<
-        /*
-        "The feedback control the BIAS voltages based on the calibration signal.\n"
+        "The ratescan program is a tool for automation of rate scans.\n"
         "\n"
-        "The default is that the program is started without user intercation. "
-        "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.\n"
-        "\n"*/
         "Usage: ratescan [-c type] [OPTIONS]\n"
         "  or:  ratescan [OPTIONS]\n";