Changeset 19712 for trunk

Timestamp:

10/03/19 12:23:30 (5 years ago)

Author:

tbretz

Message:

Added GTC dust measurements

Location:

trunk/FACT++

Files:

• src/smartfact.cc (modified) (11 diffs)
• www/smartfact/struct/gtcdust.page (added)
• www/smartfact/struct/status.page (modified) (1 diff)
• www/smartfact/struct/weather.page (modified) (1 diff)

trunk/FACT++/src/smartfact.cc

@@ -43 +43 @@
 #include "HeadersRateControl.h"
 #include "HeadersTNGWeather.h"
+#include "HeadersGTC.h"
 #include "HeadersMagicLidar.h"
 #include "HeadersMagicWeather.h"
@@ -548 +549 @@
     Time  fTngWeatherDustTime;
 
+    deque<float> fGtcDustHist;
+    Time  fGtcDustTime;
+
     deque<float> fRainSensorDataHist;
     Time  fRainSensorDataTime;
@@ -638 +642 @@
     DimDescribedState fDimMagicLidar;
     DimDescribedState fDimTngWeather;
+    DimDescribedState fDimGtcDust;
     DimDescribedState fDimTemperature;
     DimDescribedState fDimRainSensor;
@@ -1030 +1035 @@
         else
             out << "\t\n";
+        out << HTML::kWhite << '\t';
+        if (!fGtcDustHist.empty())
+            out << fGtcDustHist.back() << '\t' << fGtcDustTime.GetAsStr("%H:%M") << '\n';
+        else
+            out << "\t\n";
 
         ofstream(fPath+"/weather.data") << out.str();
@@ -1092 +1102 @@
         return GetCurrentState();
     }
+
+    int HandleGtcDustData(const EventImp &d)
+    {
+        if (!CheckDataSize(d, "GtcDust:Data", 4))
+            return GetCurrentState();
+
+        fGtcDustTime = d.GetTime();
+
+        fGtcDustHist.push_back(d.GetFloat());
+        if (fGtcDustHist.size()>300)
+                fGtcDustHist.pop_front();
+
+        const Statistics stat(fGtcDustHist);
+
+        const double scale = stat.max>0 ? pow(10, ceil(log10(stat.max))) : 0;
+
+        WriteHist(d, "hist-gtc-dust", fGtcDustHist, scale);
+
+        ostringstream out;
+        out << d.GetJavaDate() << '\n';
+
+        ofstream(fPath+"/gtcdust.data") << out.str();
+
+        return GetCurrentState();
+    }
+
 
     int HandleRainSensorData(const EventImp &d)
@@ -2301 +2337 @@
         Out() << fDimMagicWeather   << endl;
         Out() << fDimTngWeather     << endl;
+        Out() << fDimGtcDust        << endl;
         Out() << fDimMagicLidar     << endl;
         Out() << fDimTemperature    << endl;
@@ -3268 +3305 @@
             out << GetStateHtml(fDimMagicWeather,   MagicWeather::State::kConnected);
             out << GetStateHtml(fDimTngWeather,     TNGWeather::State::kConnected);
+            out << GetStateHtml(fDimGtcDust,        GTC::State::kReceiving);
             out << GetStateHtml(fDimMagicLidar,     MagicLidar::State::kConnected);
             out << GetStateHtml(fDimTemperature,    Temperature::State::kValid);
@@ -3318 +3356 @@
         fLastRunFinishedWithZeroEvents(false),
         fTngWeatherDustTime(Time::none),
+        fGtcDustTime(Time::none),
         fBiasControlVoltageMed(0),
         fBiasControlCurrentMed(0),
@@ -3337 +3376 @@
         fDimMagicLidar    ("MAGIC_LIDAR"),
         fDimTngWeather    ("TNG_WEATHER"),
+        fDimGtcDust       ("GTC_DUST"),
         fDimTemperature   ("TEMPERATURE"),
         fDimRainSensor    ("RAIN_SENSOR"),
@@ -3367 +3407 @@
         fDimMagicLidar.Subscribe(*this);
         fDimTngWeather.Subscribe(*this);
+        fDimGtcDust.Subscribe(*this);
         fDimTemperature.Subscribe(*this);
         fDimRainSensor.Subscribe(*this);
@@ -3442 +3483 @@
         Subscribe("TNG_WEATHER/DATA")
             (bind(&StateMachineSmartFACT::HandleTngWeatherData,      this, placeholders::_1));
+        Subscribe("GTC_DUST/DATA")
+            (bind(&StateMachineSmartFACT::HandleGtcDustData,         this, placeholders::_1));
         Subscribe("RAIN_SENSOR/DATA")
             (bind(&StateMachineSmartFACT::HandleRainSensorData,      this, placeholders::_1));

trunk/FACT++/www/smartfact/struct/status.page

@@ -24 +24 @@
 |Magic Weather|$0|
 |TNG Weather|$0|tngdata
+|GTC Dust|$0|gtcdust
 |Magic Lidar|$0|
 |Temperature|$0|temperature

trunk/FACT++/www/smartfact/struct/weather.page

@@ -10 +10 @@
 |Wind direction|$0
 |Dust (TNG)|$0 µg/m³ [$1]|tngdust
+|Dust (GTC)|$0 µg/m³ [$1]|gtcdust