Changeset 18653 for trunk/FACT++

Timestamp:

09/29/16 10:44:15 (8 years ago)

Author:

tbretz

Message:

Updated to account for the new data in the EventData stream

File:

• trunk/FACT++/src/smartfact.cc (modified) (2 diffs)

trunk/FACT++/src/smartfact.cc

@@ -1734 +1734 @@
     int HandleFadEventData(const EventImp &d)
     {
-        if (!CheckDataSize(d, "FadControl:EventData", 23040))
+        if (!CheckDataSize(d, "FadControl:EventData", 23048))
             return GetCurrentState();
 
-        const float *dat = d.Ptr<float>(1440*sizeof(float)*2);
+        //const uint32_t run = d.GetUint();
+        //const uint32_t evt = d.GetUint(4);
+
+        const float *dat = d.Ptr<float>(8+1440*sizeof(float)*2);
 
         /*
@@ -2709 +2712 @@
         newerr |= SetError(!fPfMiniHumidityHist.empty() && fPfMiniHumidityHist.back()>50,
                            "Camera humidity inside camera exceeds 50% (PFmini)");
-        newerr |= SetError(!fTemperatureControlHist.empty() && (fTemperatureControlHist.back()<26.5 || fTemperatureControlHist.back()>29),
+        newerr |= SetError(!fTemperatureControlHist.empty() && (fTemperatureControlHist.back()<25 || fTemperatureControlHist.back()>28),
                            "Container temperature outside [26.5;29]&deg;C");