Changeset 17174 for trunk/FACT++/src

Timestamp:

09/19/13 16:15:12 (11 years ago)

Author:

tbretz

Message:

Some minor updates and a bug fix in the format of the NOMINAL service.

Location:

trunk/FACT++/src

Files:

• DimServiceInfoList.cc (modified) (1 diff)
• InterpreterV8.cc (modified) (4 diffs)
• biasctrl.cc (modified) (5 diffs)
• fscctrl.cc (modified) (5 diffs)

trunk/FACT++/src/DimServiceInfoList.cc

@@ -696 +696 @@
 #endif
 
-    const int rc = DimClient::sendCommand(cmd.c_str(), (void*)v.data(), v.size());
-    if (!rc)
-        throw runtime_error("ERROR - Sending command "+cmd+" failed.");
+    DimClient::sendCommandNB(cmd.c_str(), (void*)v.data(), v.size());
+//    const int rc = DimClient::sendCommand(cmd.c_str(), (void*)v.data(), v.size());
+//    if (!rc)
+//        throw runtime_error("ERROR - Sending command "+cmd+" failed.");
 }
 

trunk/FACT++/src/InterpreterV8.cc

@@ -1445 +1445 @@
 void InterpreterV8::JsHandleEvent(const EventImp &evt, uint64_t cnt, const string &service)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
@@ -1513 +1515 @@
 void InterpreterV8::JsHandleState(const std::string &server, const State &state)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
@@ -1619 +1623 @@
 int InterpreterV8::JsHandleInterrupt(const EventImp &evt)
 {
+    // FIXME: This blocks service updates, we have to run this
+    //        in a dedicated thread.
     const Locker locker;
 
@@ -2723 +2729 @@
     rc.emplace_back("new Date(");
     rc.emplace_back("'use strict';");
-
+    rc.emplace_back("undefined");
+    rc.emplace_back("null");
+    rc.emplace_back("delete ");
 
     rc.emplace_back("dim.log(");

trunk/FACT++/src/biasctrl.cc

@@ -69 +69 @@
     vector<int16_t>  fCurrent;     // Current in ADC units (12bit = 5mA)
 
+    virtual void UpdateV(const Time = Time())
+    {
+    }
+
+    virtual void UpdateVgapd()
+    {
+    }
+
+public:
     virtual void UpdateVA()
     {
     }
 
-    virtual void UpdateV(const Time = Time())
-    {
-    }
-
-    virtual void UpdateVgapd()
-    {
-    }
-
     // ====================================================
 
+protected:
     vector<float> fBreakdownVoltage;      // Breakdown voltage of GAPDs
     //vector<float> fChannelOffset;         // User defined channel offset
@@ -1511 +1513 @@
     DimDescribedService fDimGapd;
 
+public:
     void UpdateVA()
     {
@@ -1521 +1524 @@
     }
 
+private:
     void UpdateV(const Time now=Time())
     {
@@ -1560 +1564 @@
         fDimVolt("BIAS_CONTROL/VOLTAGE", "F:416",
                  "|Uout[V]:Output voltage"),
-        fDimGapd("BIAS_CONTROL/NOMINAL", "F:416;F:416;F:416;F:416",
+        fDimGapd("BIAS_CONTROL/NOMINAL", "F:416;F:416;F:416",
                  "|Ubr[V]:Nominal breakdown voltage at 25deg C"
                  "|Uoff[V]:Bias crate channel calibration offsets"
@@ -1771 +1775 @@
             return T::GetCurrentState();
         }
+
+        fBias.UpdateVA();
+
+        T::Info("Successfully loaded new mapping '"+evt.GetString()+"'");
 
         return T::GetCurrentState();

trunk/FACT++/src/fscctrl.cc

@@ -551 +551 @@
         }
 
-        UpdateHum( time, humidities);
         UpdateTemp(time, temperatures);
         UpdateVolt(time, voltages);
         UpdateCur( time, currents);
+        UpdateHum( time, humidities);
 
         StartRead();
@@ -697 +697 @@
         rms /= T.size();
         rms -= avg*avg;
-        rms = rms<0 ? 0 : sqrt(rms - avg*avg);
+        rms = rms<0 ? 0 : sqrt(rms);
 
         // Clean broken reports
@@ -725 +725 @@
         T = inter.Interpolate(T);
 
+        avg = 0;
+        rms = 0;
+        for (int i=0; i<320; i++)
+        {
+            avg += T[i];
+            rms += T[i]*T[i];
+        }
+
+        avg /= 320;
+        rms /= 320;
+        rms -= avg*avg;
+        rms = rms<0 ? 0 : sqrt(rms);
+
+        vector<float> out;
+        out.reserve(322);
+        out.assign(T.cbegin(), T.cend());
+        out.emplace_back(avg);
+        out.emplace_back(rms);
+
         // Update the Dim service with the interpolated positions
-        Update(fDimTemp2, vector<float>(T.cbegin(), T.cend()), time);
+        Update(fDimTemp2, out, time);
     }
 
@@ -755 +774 @@
                     "|T_back[deg C]:FTM backpanel temperatures FTM (top/bottom), FSC (top/bottom)"
                     "|T_eth[deg C]:Ethernet switches temperatures top (front/back), bottom (f/b)"),
-        fDimTemp2  ("FSC_CONTROL/BIAS_TEMP", "F:1;F:320",
+        fDimTemp2  ("FSC_CONTROL/BIAS_TEMP", "F:1;F:320;F:1;F:1",
                     "|t[s]:FSC uptime"
-                    "|T[deg C]:Interpolated temperatures at bias patch positions"),
+                    "|T[deg C]:Interpolated temperatures at bias patch positions"
+                    "|T_avg[deg C]:Average temperature calculated from all patches"
+                    "|T_rms[deg C]:Temperature RMS calculated from all patches"),
         fDimHum    ("FSC_CONTROL/HUMIDITY", "F:1;F:4",
                     "|t[s]:FSC uptime"
@@ -926 +947 @@
         fFSC.SetVerbose(!conf.Get<bool>("quiet"));
 
-        const string fname1 = conf.Get<string>("sesnor-pos-file");
+        const string fname1 = conf.Get<string>("sensor-pos-file");
         const auto v1 = ReadVector(fname1);
         if (v1.size() != 31)