Changeset 11030 for trunk/FACT++

Timestamp:

06/16/11 10:33:16 (13 years ago)

Author:

Daniela Dorner

Message:

added configuration parameters

File:

• trunk/FACT++/src/scheduler.cc (modified) (5 diffs)

trunk/FACT++/src/scheduler.cc

@@ -31 +31 @@
 
 // things to be done/checked/changed
-// * do not use --database, but sth like --database-scheduler
-//   to be independent of the configuration database
+// * --schedule-database should be required
 // * move definition of config parameters to AutoScheduler class
 //   + read in from config
+// * in some (all?) loops iterator over vector can be replaced by counter
 
 // other things to do
@@ -157 +157 @@
     string fDatabase;
     string fDBName;
+    int fDurationCalRun; //unit: minutes
+    int fDurationPedRun; //unit: minutes
+    int fDurationRepos; //unit: minutes
 
     int Schedule()
@@ -162 +165 @@
         bool error = false;
 
-        time_duration runtimec(0, 3, 0);
-        time_duration runtimep(0, 3, 0);
+        time_duration runtimec(0, fDurationCalRun, 0);
+        time_duration runtimep(0, fDurationPedRun, 0);
+        time_duration repostime(0, fDurationRepos, 0);
         time_duration mintime(1, 0, 0);
-        time_duration repostime(0, 5, 0);
-        //ptime startsched=microsec_clock::local_time();
 
         const ptime startsched(microsec_clock::local_time());
@@ -716 +718 @@
     {
         fDatabase = conf.Get<string>("schedule-database");
+        fDurationCalRun = conf.Get<int>("duration-cal-run");
+        fDurationPedRun = conf.Get<int>("duration-ped-run");
+        fDurationRepos  = conf.Get<int>("duration-repos");
 
         return true;
@@ -809 +814 @@
                                            ,  "Database link as in\n\t[user:[password]@][server][:port][/database]\nOverwrites options from the default configuration file.")
         ("mintime",           var<int>(),     "minimum observation time")
+        ("duration-cal-run",  var<int>()
+#if BOOST_VERSION >= 104200
+         ->required()
+#endif
+                                           ,     "duration of calibration run [min]")
+        ("duration-ped-run",  var<int>()
+#if BOOST_VERSION >= 104200
+         ->required()
+#endif
+                                           ,     "duration of pedestal run [min]")
+        ("duration-repos",    var<int>()
+#if BOOST_VERSION >= 104200
+         ->required()
+#endif
+                                           ,     "duration of repositioning [min]")
         ;