Index: /trunk/FACT++/src/ftmctrl.cc
===================================================================
--- /trunk/FACT++/src/ftmctrl.cc	(revision 11578)
+++ /trunk/FACT++/src/ftmctrl.cc	(revision 11579)
@@ -2349,45 +2349,49 @@
         ;
 
+    po::options_description freq("Sampling frequency setup");
+    freq.add_options()
+        ("clock-conditioner.frequency",  vars<uint16_t>(),      "Frequencies for which to setup the clock-conditioner (replace the * in the following options by this definition)")
+        ("clock-conditioner.R0.*",       var<Hex<uint32_t>>(),  "Clock-conditioner R0")
+        ("clock-conditioner.R1.*",       var<Hex<uint32_t>>(),  "Clock-conditioner R1")
+        ("clock-conditioner.R8.*",       var<Hex<uint32_t>>(),  "Clock-conditioner R8")
+        ("clock-conditioner.R9.*",       var<Hex<uint32_t>>(),  "Clock-conditioner R9")
+        ("clock-conditioner.R11.*",      var<Hex<uint32_t>>(),  "Clock-conditioner R11")
+        ("clock-conditioner.R13.*",      var<Hex<uint32_t>>(),  "Clock-conditioner R13")
+        ("clock-conditioner.R14.*",      var<Hex<uint32_t>>(),  "Clock-conditioner R14")
+        ("clock-conditioner.R15.*",      var<Hex<uint32_t>>(),  "Clock-conditioner R15");
+
     po::options_description runtype("Run type configuration");
     runtype.add_options()
-        ("clock-conditioner.frequency",  vars<uint16_t>(),      "Frequencies for which to setup the clock-conditioner")
-        ("clock-conditioner.R0.*",       var<Hex<uint32_t>>(),  "Clock-conditioner R0 (replace * by the defined frequency)")
-        ("clock-conditioner.R1.*",       var<Hex<uint32_t>>(),  "Clock-conditioner R1 (replace * by the defined frequency)")
-        ("clock-conditioner.R8.*",       var<Hex<uint32_t>>(),  "Clock-conditioner R8 (replace * by the defined frequency)")
-        ("clock-conditioner.R9.*",       var<Hex<uint32_t>>(),  "Clock-conditioner R9 (replace * by the defined frequency)")
-        ("clock-conditioner.R11.*",      var<Hex<uint32_t>>(),  "Clock-conditioner R11 (replace * by the defined frequency)")
-        ("clock-conditioner.R13.*",      var<Hex<uint32_t>>(),  "Clock-conditioner R13 (replace * by the defined frequency)")
-        ("clock-conditioner.R14.*",      var<Hex<uint32_t>>(),  "Clock-conditioner R14 (replace * by the defined frequency)")
-        ("clock-conditioner.R15.*",      var<Hex<uint32_t>>(),  "Clock-conditioner R15 (replace * by the defined frequency)")
-        ("run-type",                     vars<string>(),        "")
-        ("sampling-frequency.*",         var<uint16_t>(),       "")
-        ("trigger.enable-trigger.*",             var<bool>(),           "")
-        ("trigger.enable-external-1.*",          var<bool>(),           "")
-        ("trigger.enable-external-2.*",          var<bool>(),           "")
-        ("trigger.enable-veto.*",                var<bool>(),           "")
-        ("trigger.enable-clock-conditioner.*",   var<bool>(),           "")
-        ("trigger.sequence.interval.*",          var<uint16_t>(),       "")
-        ("trigger.sequence.pedestal.*",          var<uint16_t>(),       "")
-        ("trigger.sequence.lp-int.*",            var<uint16_t>(),       "")
-        ("trigger.sequence.lp-ext.*",            var<uint16_t>(),       "")
-        ("trigger.multiplicity-physics.*",       var<uint16_t>(),       "")
-        ("trigger.multiplicity-calib.*",         var<uint16_t>(),       "")
-        ("trigger.coincidence-window-physics.*", var<uint16_t>(),       "")
-        ("trigger.coincidence-window-calib.*",   var<uint16_t>(),       "")
-        ("trigger.dead-time.*",                  var<uint16_t>(),       "")
-        ("trigger.delay.*",                      var<uint16_t>(),       "")
-        ("trigger.time-marker-delay.*",          var<uint16_t>(),       "")
-        ("trigger.disable-pixel.*",              vars<uint16_t>(),      "")
-        ("trigger.disable-patch.*",              vars<uint16_t>(),      "")
-        ("ftu-report-interval.*",                var<uint16_t>(),       "")
-        ("light-pulser.external.enable-group1.*", var<bool>(),       "")
-        ("light-pulser.external.enable-group2.*", var<bool>(),       "")
-        ("light-pulser.internal.enable-group1.*", var<bool>(),       "")
-        ("light-pulser.internal.enable-group2.*", var<bool>(),       "")
-        ("light-pulser.external.intensity.*",     var<uint16_t>(),   "")
-        ("light-pulser.internal.intensity.*",     var<uint16_t>(),   "")
+        ("run-type",                     vars<string>(),        "Name of run-types (replace the * in the following configuration by the case-sensitive names defined here)")
+        ("sampling-frequency.*",         var<uint16_t>(),       "Sampling frequency as defined in the clock-conditioner.frequency")
+        ("trigger.enable-trigger.*",             var<bool>(),   "Enable trigger output of physics trigger")
+        ("trigger.enable-external-1.*",          var<bool>(),   "Enable external trigger line 1")
+        ("trigger.enable-external-2.*",          var<bool>(),   "Enable external trigger line 2")
+        ("trigger.enable-veto.*",                var<bool>(),   "Enable veto line")
+        ("trigger.enable-clock-conditioner.*",   var<bool>(),   "")
+        ("trigger.sequence.interval.*",          var<uint16_t>(),  "Interval between two artifical triggers in units of n*4ns+8ns")
+        ("trigger.sequence.pedestal.*",          var<uint16_t>(),  "Number of pedestal events in the sequence of artificial triggers")
+        ("trigger.sequence.lp-int.*",            var<uint16_t>(),  "Number of LPint events in the sequence of artificial triggers")
+        ("trigger.sequence.lp-ext.*",            var<uint16_t>(),  "Number of LPext events in the sequence of artificial triggers")
+        ("trigger.multiplicity-physics.*",       var<uint16_t>(),  "Multiplicity for physics events (n out of 40)")
+        ("trigger.multiplicity-calib.*",         var<uint16_t>(),  "Multiplicity for LPext events (n out of 40)")
+        ("trigger.coincidence-window-physics.*", var<uint16_t>(),  "Coincidence window for physics triggers in units of n*4ns+8ns")
+        ("trigger.coincidence-window-calib.*",   var<uint16_t>(),  "Coincidence window for LPext triggers in units of n*4ns+8ns")
+        ("trigger.dead-time.*",                  var<uint16_t>(),  "Dead time after trigger in units of n*4ns+8ns")
+        ("trigger.delay.*",                      var<uint16_t>(),  "Delay of the trigger send to the FAD boards after a trigger in units of n*4ns+8ns")
+        ("trigger.time-marker-delay.*",          var<uint16_t>(),  "Delay of the time-marker after a trigger in units of n*4ns+8ns")
+        ("trigger.disable-pixel.*",              vars<uint16_t>(), "")
+        ("trigger.disable-patch.*",              vars<uint16_t>(), "")
+        ("ftu-report-interval.*",                var<uint16_t>(),  "")
+        ("light-pulser.external.enable-group1.*", var<bool>(),     "Enable LED group 1 of external light pulser")
+        ("light-pulser.external.enable-group2.*", var<bool>(),     "Enable LED group 2 of external light pulser")
+        ("light-pulser.internal.enable-group1.*", var<bool>(),     "Enable LED group 1 of internal light pulser")
+        ("light-pulser.internal.enable-group2.*", var<bool>(),     "Enable LED group 2 of internal light pulser")
+        ("light-pulser.external.intensity.*",     var<uint16_t>(), "Intensity of external light pulser")
+        ("light-pulser.internal.intensity.*",     var<uint16_t>(), "Intensity of internal light pulser")
         ;
 
     conf.AddOptions(control);
+    conf.AddOptions(freq);
     conf.AddOptions(runtype);
 }