Changeset 18505

Timestamp:

05/23/16 08:19:36 (9 years ago)

Author:

tbretz

Message:

Added cloud base hieght (CLB)

Location:

trunk/FACT++/src

Files:

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

trunk/FACT++/src/HeadersMagicLidar.h

@@ -29 +29 @@
         float fT12;
 
+        float fCloudBaseHeight;
+
     } __attribute__((__packed__));
 }

trunk/FACT++/src/magiclidar.cc

@@ -112 +112 @@
                 try
                 {
-                    if (line.substr(0, 3)=="ZEN")
-                        data.fZd = stoi(line.substr(3));
+                    if (line.substr(0, 2)=="ZD")
+                        data.fZd = stoi(line.substr(2));
                     if (line.substr(0, 2)=="AZ")
                         data.fAz = stof(line.substr(2));
@@ -132 +132 @@
                     if (line.substr(0, 3)=="T12")
                         data.fT12 = stof(line.substr(3));
+
+                    if (line.substr(0, 3)=="CLB")
+                        data.fCloudBaseHeight = stof(line.substr(3));
 
                     if (line.substr(0, 4)=="HOUR")
@@ -182 +185 @@
                 << "/" << data.fT9
                 << "/" << data.fT12
+                << " H="  << data.fCloudBaseHeight/1000 << "km"
                 << " Zd="  << data.fZd  << "°"
                 << " Az="  << data.fAz  << "°";
@@ -332 +336 @@
     ConnectionDimLidar(ba::io_service& ioservice, MessageImp &imp) :
         ConnectionLidar(ioservice, imp),
-        fDimLidar("MAGIC_LIDAR/DATA", "F:1;F:1;F:1;F:1;F:1;F:1",
+        fDimLidar("MAGIC_LIDAR/DATA", "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[1]:Transmission below 3km normalized to 1"
                   "|T6[1]:Transmission below 6km normalized to 1"
                   "|T9[1]:Transmission below 9km normalized to 1"
-                  "|T12[1]:Transmission below 12km normalized to 1")
+                  "|T12[1]:Transmission below 12km normalized to 1"
+                  "|CLB[m]:Cloud base height")
     {
     }