Changeset 15110 for trunk

Timestamp:

03/18/13 16:42:47 (12 years ago)

Author:

tbretz

Message:

Removed default from file name resources.

Location:

trunk/FACT++/src

Files:

• biasctrl.cc (modified) (2 diffs)
• feedback.cc (modified) (1 diff)
• ratecontrol.cc (modified) (1 diff)
• smartfact.cc (modified) (1 diff)

trunk/FACT++/src/biasctrl.cc

@@ -2131 +2131 @@
         if (!conf.Has("bias-map-file") && !conf.Has("bias-database"))
         {
-            T::Error("Neither bias-map-file not bias-dtabase specified.");
+            T::Error("Neither bias-map-file not bias-database specified.");
             return 5;
         }
@@ -2188 +2188 @@
         ("volt-max-abs",    var<float>(75),      "Absolte upper limit for the voltage (in Volts)")
         ("volt-max-rel",    var<float>(2.5),     "Relative upper limit for the voltage w.r.t. the G-APD reference voltage (in Volts)")
-        ("bias-map-file",   var<string>("GAPDmap.txt"), "File with nominal and offset voltages for each channel.")
-        ("bias-database",   var<string>(""),      "")
+        ("bias-map-file",   var<string>(),       "File with nominal and offset voltages for each channel.")
+        ("bias-database",   var<string>(),       "")
         ;
 

trunk/FACT++/src/feedback.cc

@@ -1500 +1500 @@
     po::options_description control("Feedback options");
     control.add_options()
-        ("pixel-map-file",      var<string>("FACTmapV5a.txt"), "Pixel mapping file. Used here to get the default reference voltage.")
+        ("pixel-map-file",      var<string>()->required(), "Pixel mapping file. Used here to get the default reference voltage.")
         ("current-request-interval",  var<uint16_t>(1000), "Interval between two current requests.")
         ("num-calib-ignore",    var<uint16_t>(30), "Number of current requests to be ignored before averaging")

trunk/FACT++/src/ratecontrol.cc

@@ -846 +846 @@
     control.add_options()
         ("quiet,q", po_bool(),  "Disable printing more informations during rate control.")
-        ("pixel-map-file", var<string>("FACTmapV5a.txt"), "Pixel mapping file. Used here to get the default reference voltage.")
+        ("pixel-map-file", var<string>()->required(), "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.")

trunk/FACT++/src/smartfact.cc

@@ -3041 +3041 @@
     po::options_description control("Smart FACT");
     control.add_options()
-        ("pixel-map-file",  var<string>("FACTmapV5a.txt"),     "Pixel mapping file. Used here to get the default reference voltage")
+        ("pixel-map-file",  var<string>()->required(),     "Pixel mapping file. Used here to get the default reference voltage")
         ("path",            var<string>("www/smartfact/data"), "Output path for the data-files")
         ("source-database", var<string>(""), "Database link as in\n\tuser:password@server[:port]/database.")