Changeset 11982 for trunk/FACT++/src

Timestamp:

09/06/11 12:49:44 (14 years ago)

Author:

tbretz

Message:

Added possibility to set a single channel to its reference value.

Location:

trunk/FACT++/src

Files:

• RemoteControl.h (modified) (1 diff)
• argv.cc (modified) (4 diffs)
• biasctrl.cc (modified) (3 diffs)
• logtime.cc (modified) (3 diffs)
• mcp.cc (modified) (4 diffs)

trunk/FACT++/src/RemoteControl.h

@@ -121 +121 @@
     {
     }
+
+    //void SetReceiver(void *) { }
 
     bool PrintGeneralHelp()

trunk/FACT++/src/argv.cc

@@ -4 +4 @@
 
 using namespace std;
+
+template<class T,class S>
+std::ostream &operator<<(std::ostream &out, const pair<T,S> &f)
+{
+    out << f.first << "|" << f.second;
+    return out;
+}
+template<class T, class S>
+std::istream &operator>>(std::istream &in,  pair<T,S> &f)
+{
+    char c;
+    in >> f.first;
+    in >> c;
+    if (c!=':')
+        return in;
+    in >> f.second;
+    return in;
+}
+
+typedef pair<int,int> mytype;
+
+
+//Source is OutputStreamable, meaning that an operator<< is defined
+// that takes a std::ostream or std::wostream object on the left hand side
+// and an instance of the argument type on the right.
+
+// Target is InputStreamable, meaning that an operator>> is defined that
+// takes a std::istream or std::wistream object on the left hand side and
+// an instance of the result type on the right.
+
+//Target is CopyConstructible [20.1.3].
+//Target is DefaultConstructible, meaning that it is possible to default-initialize an object of that type [8.5, 20.1.4].
 
 // --------------------------------------------------------------------------
@@ -67 +99 @@
     po::options_description config("Configuration");
     config.add_options()
+        ("xxx", vars<int>(),             "Print available commandline options.")
+        ("test.*", var<int>(),             "Print available commandline options.")
+        ("map.*",  var<int>(),             "Print available commandline options.")
         ("compression",    var<int>(),                      "set compression level")
         ("optimization",   var<int>(10, &opt),              "optimization level")
@@ -82 +117 @@
         ("switch",        po_switch(),                    "include path")
         ("bool",          var<bool>()->implicit_value(true),                    "include path")
+        ("mytype",        var<mytype>(),                  "include path")
         ;
 
@@ -170 +206 @@
     cout << "Program " << argv[0] << " started successfully." << endl;
 
+    cout << conf.Has("test.A") << " " << conf.Get<int>("test.A") << endl;
+    cout << conf.Has("test.%") << " " << conf.Get<int>("test.%") << endl;
+    cout << conf.Has("test.9") << " " << conf.Get<int>("test.9") << endl;
+    cout << conf.Has("test.data") << " " << conf.Get<int>("test.data") << endl;
+    cout << conf.Has("test.pedestal") << " " << conf.Get<int>("test.pedestal") << endl;
+    cout << conf.Has("map.1") << " " << conf.Get<int>("map.1") << endl;
+    cout << conf.Has("map.2") << " " << conf.Get<int>("map.2") << endl;
+
+    return 0;
+
     cout << conf.Has("switch") << " " << conf.Get<bool>("switch") << endl;
-    cout << conf.Has("bool") << " " << conf.Get<bool>("bool") << endl;
+    cout << conf.Has("bool")   << " " << conf.Get<bool>("bool") << endl;
+    cout << conf.Has("mytype") << " " << conf.Get<mytype>("mytype") << endl;
+
+    cout << "---" << endl;
+    cout << conf.Has("test:A") << " " << conf.Get<int>("test:A") << endl;
+    cout << conf.Has("test:%") << " " << conf.Get<int>("test:%") << endl;
+    cout << conf.Has("test:9") << " " << conf.Get<int>("test:9") << endl;
+
+/*
+    map<string, int> m = conf.GetMap<int>("test:");
+
+    cout << m["test:A"] << endl;
+    cout << m["test:%"] << endl;
+    cout << m["test:9"] << endl;
+*/
+
 
     return 0;

trunk/FACT++/src/biasctrl.cc

@@ -955 +955 @@
     }
 
+    bool SetGapdReferenceCh(uint16_t ch)
+    {
+        if (!CheckChDac("SetGapdReferenceCh", fVoltGapd[ch], ch))
+            return false;
+
+        fVoltRef[ch] = fVoltGapd[ch];
+
+        if (!fIsRamping)
+            fIsRamping = RampOneStep();
+
+        return true;
+    }
+
+
     void SetZero()
     {
@@ -1459 +1473 @@
     }
 
+    int SetGapdReferenceCh(const EventImp &evt)
+    {
+        if (!CheckEventSize(evt.GetSize(), "SetGapdReferenceCh", 2))
+            return false;
+
+        fBias.SetGapdReferenceCh(evt.GetUShort());
+
+        return T::GetCurrentState();
+    }
+
+
     // --------------------------------------------------------------------
 
@@ -1714 +1739 @@
             ("Set a single channel a new DAC reference value. Starts ramping if necessary.");
 
-        T::AddEvent("SET_GAPD_REFERENCE_VOLTAGE", kConnected, kAtReference, kOverCurrent)
+        T::AddEvent("SET_GLOBAL_GAPD_REFERENCE_VOLTAGE", kConnected, kAtReference, kOverCurrent)
             (Wrapper(bind(&ConnectionBias::SetGapdVoltage, &fBias, 0.)))
             ("Set all channels to their G-APD reference voltage. Starts ramping if necessary.");
+
+        T::AddEvent("SET_CHANNEL_GAPD_REFERENCE_VOLTAGE", "S:1", kConnected, kAtReference, kOverCurrent)
+            (bind(&StateMachineBias::SetGapdReferenceCh, this, placeholders::_1))
+            ("Set a single channel channels to its G-APD reference voltage. Starts ramping if necessary.");
 
         T::AddEvent("SET_GAPD_REFERENCE_OFFSET", "F:1", kConnected, kAtReference, kOverCurrent)

trunk/FACT++/src/logtime.cc

@@ -6 +6 @@
 #include <iostream>
 
+#include "DimDescriptionService.h"
+
 int main(int, const char **)
 {
-   // We could use putenv to make the Configure class change the value...
+    // We could use putenv to make the Configure class change the value...
     setenv("DIM_DNS_NODE", "localhost", 0);
 
@@ -14 +16 @@
     DimServer::start("TIME");
 
+    usleep(2000000);
+
+    DimServer::stop();
+
+    return 0;
+
     // Some info on the console
     std::cout << "Offering TIME/MESSAGE...\n" << std::endl;
+
+    short s;
+    int i;
+    long long ll;
+    float f;
+    DimDescribedService servt("TIME/TEST", "O:1;I:1;C",
+                              "This is my test command|Char[c]:This is a char|   Int This is an int|String[s]:This is a string");
+
+    DimDescribedService servs("TIME/SHORT",     s,  "[a]");
+    DimDescribedService servx("TIME/LONGLONG",  ll, "|: This is my long long");
+    DimDescribedService servi("TIME/INT",       i,  "|MyInt  [  mi  ] ");
+    DimDescribedService servf("TIME/FLOAT",     f,  "|   MyFloat  :   This is my float");
+    DimDescribedService servc("TIME/TIME", const_cast<char*>(""), "|MyTime[T]:This is my time");
+
+    DimCommand cmd("TIME/CMD", "I:2;F:2");
+
+    DimDescriptionService des("TIME/CMD", "|range[addr]:From DAC to DAC|values[DAC]:DAC values to be set");
+
+    {
+    Time t0;
 
     // Setup a DimService called TIME/MESSAGE
@@ -23 +51 @@
         // Send current time
         msg.Message(Time().GetAsStr());
+//        servx.Update();
+        /*
+        servs.updateService();
+        servi.updateService();
+        servf.updateService();
+        servc.updateService();
+         */
+        // wait approximately one second
+        usleep(100000);
 
-        // wait approximately one second
-        usleep(1000000);
+//        if (t0.UnixTime()-Time().UnixTime()<-5)
+//            break;
     }
+    }
+
+    DimDescribedService servxx("TIME/XXX", const_cast<char*>(""), "|MyTime[T]:This is my time");
+    usleep(10000000);
 
     return 0;

trunk/FACT++/src/mcp.cc

@@ -55 +55 @@
         kStateConfiguring2,
         kStateConfiguring3,
+        kStateConfiguring4,
         kStateConfigured,
     };
@@ -271 +272 @@
     }
 
+    Time fConfigTimer;
+
     int Execute()
     {
@@ -317 +320 @@
                     return GetCurrentState();
 
+                fConfigTimer = Time();
+
+                return kStateConfiguring4;
+            }
+
+            if (GetCurrentState()==kStateConfiguring4)
+            {
+                // We need some delay to ensure that after sending the
+                // "Enable Trigger Line" command to all FADs the really
+                // have all already enabled the trigger line
+                if (Time()-fConfigTimer<boost::posix_time::milliseconds(100))
+                    return kStateConfiguring4;
+
                 Message("Starting Trigger (FTM)");
                 Dim::SendCommand("FTM_CONTROL/START_RUN");
@@ -391 +407 @@
 
         AddStateName(kStateConfiguring3, "Configuring3",
+                     ".");
+
+        AddStateName(kStateConfiguring4, "Configuring4",
                      ".");