Changeset 14948

Timestamp:

02/23/13 10:57:43 (12 years ago)

Author:

tbretz

Message:

Added T3, T6, T9, T12 (preliminary)

Location:

trunk/FACT++/src

Files:

• HeadersMagicLidar.h (modified) (1 diff)
• magiclidar.cc (modified) (5 diffs)

trunk/FACT++/src/HeadersMagicLidar.h

@@ -24 +24 @@
         float fPBL;
 
+        float fT3;
+        float fT6;
+        float fT9;
+        float fT12;
+
     } __attribute__((__packed__));
 }

trunk/FACT++/src/magiclidar.cc

@@ -114 +114 @@
                 if (line.substr(0, 3)=="ZEN")
                     data.fZd = stoi(line.substr(3));
-
                 if (line.substr(0, 2)=="AZ")
                     data.fAz = stof(line.substr(2));
@@ -120 +119 @@
                 if (line.substr(0, 3)=="PBL")
                     data.fPBL = stof(line.substr(3));
-
                 if (line.substr(0, 3)=="CHE")
                     data.fCHE = stof(line.substr(3));
-
                 if (line.substr(0, 3)=="COT")
                     data.fCOT = stof(line.substr(3));
 
+                if (line.substr(0, 2)=="T3")
+                    data.fT3 = stof(line.substr(2));
+                if (line.substr(0, 2)=="T6")
+                    data.fT6 = stof(line.substr(2));
+                if (line.substr(0, 2)=="T9")
+                    data.fT9 = stof(line.substr(2));
+                if (line.substr(0, 3)=="T12")
+                    data.fT12 = stof(line.substr(3));
+
                 if (line.substr(0, 4)=="HOUR")
                     hh = stoi(line.substr(4));
-
                 if (line.substr(0, 6)=="MINUTS")
                     mm = stoi(line.substr(6));
-
                 if (line.substr(0, 7)=="SECONDS")
                     ss = stoi(line.substr(7));
@@ -138 +142 @@
                 if (line.substr(0, 4)=="YEAR")
                     y = stoi(line.substr(4));
-
                 if (line.substr(0, 5)=="MONTH")
                     m = stoi(line.substr(5));
-
                 if (line.substr(0, 3)=="DAY")
                     d = stoi(line.substr(3));
@@ -161 +163 @@
                 << " CHE=" << data.fCHE
                 << " COT=" << data.fCOT
+                << " T3-12=" << data.fT3
+                << "/" << data.fT6
+                << "/" << data.fT9
+                << "/" << data.fT12
                 << " Zd="  << data.fZd  << "°"
                 << " Az="  << data.fAz  << "°";
@@ -313 +319 @@
     ConnectionDimLidar(ba::io_service& ioservice, MessageImp &imp) :
         ConnectionLidar(ioservice, imp),
-        fDimLidar("MAGIC_LIDAR/DATA", "F:1;F:1;F:1;F:1;F:1",
-                     "|Zd[deg]:Pointing direction zenith distance"
-                     "|Az[deg]:Pointing direction azimuth"
-                     "|CHE[km]:Cloud height"
-                     "|COT[1]:Cloud optical transparency at 532nm"
-                     "|PBL[100]:Planetary boundary layer normalized to 100 for clear nights")
+        fDimLidar("MAGIC_LIDAR/DATA", "F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1;F:1",
+                  "|Zd[deg]:Pointing direction zenith distance"
+                  "|Az[deg]:Pointing direction azimuth"
+                  "|CHE[km]:Cloud height"
+                  "|COT[1]:Cloud optical transparency at 532nm"
+                  "|PBL[100]:Planetary boundary layer normalized to 100 for clear nights"
+                  "|T3:"
+                  "|T6:"
+                  "|T9:"
+                  "|T12:")
     {
     }