Changeset 12090 for trunk/FACT++/src

Timestamp:

09/13/11 14:43:41 (13 years ago)

Author:

tbretz

Message:

Increased sync-delay from 333ms to 500ms; added commands and states to help output.

File:

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

trunk/FACT++/src/biasctrl.cc

@@ -622 +622 @@
         for (int ch=0; ch<kNumChannels; ch++)
         {
+            // FIXME: dac[ch] += calib_offset
             const vector<char> cmd = GetCmd(kCmdChannelSet, ch, dac[ch]);
             data.insert(data.end(), cmd.begin(), cmd.end());
@@ -1100 +1101 @@
         Warn(msg);
 
+        // FIXME: dac += calib_offset
         PostMessage(GetCmd(kCmdChannelSet, ch, dac));
         AsyncRead(ba::buffer(fBuffer, 3), kExpertChannelSet|(ch<<8), ++fSendCounter);
@@ -1898 +1900 @@
     int EvalOptions(Configuration &conf)
     {
+        // FIXME: Read calib_offset
+        // FIXME: Check calib offset being smaller than +/-0.25V
+
         fBias.SetVerbose(!conf.Get<bool>("quiet"));
 
@@ -1994 +1999 @@
         ("ramp-step",       var<uint16_t>(46),   "Maximum step in DAC counts during ramping (Volt = DAC*90/4096)")
         ("update-interval", var<uint16_t>(3000), "Interval between two current requests in milliseconds")
-        ("sync-delay",      var<uint16_t>(333),  "Delay between sending the inital 0's after a newly established connection to synchronize the output stream in milliseconds")
+        ("sync-delay",      var<uint16_t>(500),  "Delay between sending the inital 0's after a newly established connection to synchronize the output stream in milliseconds")
         ("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)")
@@ -2032 +2037 @@
 void PrintHelp()
 {
+    Main::PrintHelp<StateMachineBias<StateMachine,ConnectionBias>>();
+
     /* Additional help text which is printed after the configuration
      options goes here */