Changeset 18338 for trunk

Timestamp:

09/30/15 10:51:13 (9 years ago)

Author:

tbretz

Message:

Adapted to the latest changed on the TNG weather report web site and to its new location.

Location:

trunk/FACT++/src

Files:

• HeadersTNGWeather.h (modified) (1 diff)
• tngweather.cc (modified) (8 diffs)

trunk/FACT++/src/HeadersTNGWeather.h

@@ -18 +18 @@
         DimWeather() { memset(this, 0, sizeof(DimWeather)); }
 
-        float fTemp10M;
-        float fTemp5M;
-        float fTemp2M;
-        float fTempGround;
-        float fDewPoint;
-        float fHumidity;
-        float fAirPressure;
-        float fWindSpeed;
-        float fWindDirection;
-        float fDeltaM1;
-        float fDustTotal;
-        float fSeeingMed;
-        float fSeeingStdev;
-        float fSolarimeter;
+        float  fTemperature;
+        float  fDewPoint;
+        float  fHumidity;
+        float  fAirPressure;
+        float  fTrend;
+        float  fWindSpeed;
+        float  fWindDirection;
+        float  fDustTotal;
+        double fSeeingMjd;
+        float  fSeeing;
+        float  fSeeingMed;
+        float  fSeeingStdev;
+        float  fSolarimeter;
 
     } __attribute__((__packed__));

trunk/FACT++/src/tngweather.cc

@@ -138 +138 @@
             Out() << "Parsed:\n-------\n" << doc.toString().toStdString() << endl;
 
-        const QDomElement root = doc.documentElement();
-        const QDomElement item = root.firstChildElement("item");
-
+        const QDomElement root    = doc.documentElement();
+        const QDomElement channel = root.firstChildElement("channel");
+        const QDomElement item    = channel.firstChildElement("item");
+
+        const QDomElement see   = item.firstChildElement("tngw:dimmSeeing");
+        const QDomElement mjd   = item.firstChildElement("tngw:dimmSeeing.date");
         const QDomElement med   = item.firstChildElement("tngw:dimmSeeing.median");
         const QDomElement sdev  = item.firstChildElement("tngw:dimmSeeing.stdev");
         const QDomElement dust  = item.firstChildElement("tngw:dustTotal");
-        const QDomElement delta = item.firstChildElement("tngw:deltaM1");
+        const QDomElement trend = item.firstChildElement("tngw:trend");
         const QDomElement pres  = item.firstChildElement("tngw:airPressure");
         const QDomElement dew   = item.firstChildElement("tngw:dewPoint");
@@ -150 +153 @@
         const QDomElement speed = item.firstChildElement("tngw:windSpeed");
         const QDomElement hum   = item.firstChildElement("tngw:hum");
-        const QDomElement tmp0  = item.firstChildElement("tngw:tempGround");
-        const QDomElement tmp2  = item.firstChildElement("tngw:temp2M");
-        const QDomElement tmp5  = item.firstChildElement("tngw:temp5M");
-        const QDomElement tmp10 = item.firstChildElement("tngw:temp10M");
+        const QDomElement tmp   = item.firstChildElement("tngw:temperature");
         const QDomElement solar = item.firstChildElement("tngw:solarimeter");
         const QDomElement date  = item.firstChildElement("tngw:date");
 
-        if (med.isNull()  || sdev.isNull()  || dust.isNull()  || delta.isNull() ||
-            pres.isNull() || dew.isNull()   || wdir.isNull()  || speed.isNull() ||
-            hum.isNull()  || hum.isNull()   || tmp0.isNull()  || tmp2.isNull()  ||
-            tmp5.isNull() || tmp10.isNull() || solar.isNull() || date.isNull())
+        if (see.isNull()  || mjd.isNull()   || med.isNull()  || sdev.isNull() ||
+            dust.isNull() || trend.isNull() || pres.isNull() || dew.isNull()  ||
+            wdir.isNull() || speed.isNull() || hum.isNull()  || tmp.isNull()  ||
+            solar.isNull()|| date.isNull())
         {
             Warn("Parsing of xml failed [1].");
@@ -168 +168 @@
 
         DimWeather w;
+        w.fSeeingMjd     = Time(mjd.text().toStdString()).Mjd();
+        w.fSeeing        = see  .text().toFloat();
         w.fSeeingMed     = med  .text().toFloat();
         w.fSeeingStdev   = sdev .text().toFloat();
         w.fDustTotal     = dust .text().toFloat();
-        w.fDeltaM1       = delta.text().toFloat();
+        w.fTrend         = trend.text().toFloat();
         w.fAirPressure   = pres .text().toFloat();
         w.fDewPoint      = dew  .text().toFloat();
@@ -177 +179 @@
         w.fWindSpeed     = speed.text().toFloat()*3.6;
         w.fHumidity      = hum  .text().toFloat();
-        w.fTempGround    = tmp0 .text().toFloat();
-        w.fTemp2M        = tmp2 .text().toFloat();
-        w.fTemp5M        = tmp5 .text().toFloat();
-        w.fTemp10M       = tmp10.text().toFloat();
+        w.fTemperature   = tmp  .text().toFloat();
         w.fSolarimeter   = solar.text().toFloat();
 
@@ -203 +202 @@
             Out() << endl;
             Out() << "Date:           " << time             << endl;
+            Out() << "Seeing:         " << w.fSeeing << " [" << Time(w.fSeeingMjd) << "]" << endl;
             Out() << "Seeing:         " << w.fSeeingMed << " +- " << w.fSeeingStdev << endl;
             Out() << "DustTotal:      " << w.fDustTotal     << endl;
-            Out() << "DeltaM1:        " << w.fDeltaM1       << endl;
             Out() << "AirPressure:    " << w.fAirPressure   << endl;
+            Out() << "Trend:          " << w.fTrend         << endl;
             Out() << "DewPoint:       " << w.fDewPoint      << endl;
             Out() << "WindDirection:  " << w.fWindDirection << endl;
             Out() << "WindSpeed:      " << w.fWindSpeed     << endl;
             Out() << "Humidity:       " << w.fHumidity      << endl;
-            Out() << "TempGround:     " << w.fTempGround    << endl;
-            Out() << "Temp2M:         " << w.fTemp2M        << endl;
-            Out() << "Temp5M:         " << w.fTemp5M        << endl;
-            Out() << "Temp10M:        " << w.fTemp10M       << endl;
+            Out() << "Temperature:    " << w.fTemperature   << endl;
             Out() << "Solarimeter:    " << w.fSolarimeter   << endl;
             Out() << endl;
@@ -247 +244 @@
         const string cmd =
             "GET "+fSite+" HTTP/1.1\r\n"
+            "User-Agent: FACT tngweather\r\n"
             "Accept: */*\r\n"
-            "Content-Type: application/octet-stream\r\n"
+            "Host: "+Address()+"\r\n"
+            "Connection: close\r\n"//Keep-Alive\r\n"
+            "Content-Type: application/rss+xml\r\n"
             "User-Agent: FACT\r\n"
-            "Host: www.fact-project.org\r\n"
             "Pragma: no-cache\r\n"
             "Cache-Control: no-cache\r\n"
             "Expires: 0\r\n"
-            "Connection: Keep-Alive\r\n"
             "Cache-Control: max-age=0\r\n"
             "\r\n";
@@ -378 +376 @@
     ConnectionDimWeather(ba::io_service& ioservice, MessageImp &imp) :
         ConnectionWeather(ioservice, imp),
-        fDimWeather("TNG_WEATHER/DATA", "F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1",
-                     "|T_10M[deg C]:Temperature 10m above ground"
-                     "|T_5M[deg C]:Temperature 5m above ground"
-                     "|T_2M[deg C]:Temperature 2m above ground"
-                     "|T_0[deg C]:Temperature at ground"
+        fDimWeather("TNG_WEATHER/DATA", "F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;D:1;F:1;F:1;F:1;F:1",
+                     "|T[deg C]:Temperature"
                      "|T_dew[deg C]:Dew point"
                      "|H[%]:Humidity"
                      "|P[mbar]:Air pressure"
+                     "|Trend"
                      "|v[km/h]:Wind speed"
                      "|d[deg]:Wind direction (N-E)"
-                     "|DeltaM1"
                      "|Dust[ug/m^3]:Dust (total)"
+                     "|SeeingDate[mjd]:Seeing MJD"
+                     "|Seeing[arcsec]:Seeing"
                      "|Seeing[arcsec]:Seeing Median"
                      "|SeeingStdev[arcsec]:Seeing Stdev"
@@ -522 +519 @@
         ("no-dim,d",  po_switch(),    "Disable dim services")
         ("addr,a",  var<string>("tngweb.tng.iac.es:80"),  "Network address of Cosy")
-        ("url,u",  var<string>("/weather/rss/"),  "File name and path to load")
+        ("url,u",  var<string>("/api/meteo/weather/feed.xml"),  "File name and path to load")
         ("quiet,q", po_bool(true),  "Disable printing contents of all received messages (except dynamic data) in clear text.")
         ("interval,i", var<uint16_t>(300), "Interval between two updates on the server in seconds")