Merge branch 'master' of gitlab_iannis:ioannis_binietoglou/atmospheric-lidar

Mon, 25 Jan 2021 23:34:21 +0200

author
Ioannis <ibinietoglou@raymetrics.com>
date
Mon, 25 Jan 2021 23:34:21 +0200
changeset 209
f3bec37bfcd0
parent 206
dfe6a8c99195 (current diff)
parent 208
686c1525ce36 (diff)
child 210
b08b40c62027

Merge branch 'master' of gitlab_iannis:ioannis_binietoglou/atmospheric-lidar

atmospheric_lidar/raymetrics.py file | annotate | diff | comparison | revisions
--- a/atmospheric_lidar/raymetrics.py	Wed Nov 11 17:06:57 2020 +0200
+++ b/atmospheric_lidar/raymetrics.py	Mon Jan 25 23:34:21 2021 +0200
@@ -57,7 +57,7 @@
 
     # Specifications of the header lines.
     licel_file_header_format = ['filename',
-                                'start_date start_time end_date end_time altitude longitude latitude zenith_angle azimuth_angle temperature pressure',
+                                'start_date start_time end_date end_time altitude longitude latitude zenith_angle azimuth_angle temperature pressure custom_info',
                                 # Appart from Site that is read manually
                                 'azimuth_start azimuth_stop azimuth_step zenith_start zenith_stop zenith_step azimuth_offset',
                                 'LS1 rate_1 LS2 rate_2 number_of_datasets', ]
@@ -132,6 +132,11 @@
             self.zenith_start = self.zenith_start_raw
             self.zenith_stop = self.zenith_stop_raw
 
+        try:
+            self.custom_info = self.raw_info['custom_info'].strip('"')
+        except KeyError:
+            self.custom_info = None
+
     def get_coordinates(self, channel_name):
         """
         Calculate the lat, lon, z coordinates for each measurement point.
@@ -734,7 +739,7 @@
     """
     # Specifications of the header lines.
     licel_file_header_format = ['filename',
-                                'start_date start_time end_date end_time altitude longitude latitude zenith_angle azimuth_angle temperature pressure',
+                                'start_date start_time end_date end_time altitude longitude latitude zenith_angle azimuth_angle temperature pressure custom_info',
                                 # Appart from Site that is read manually
                                 'LS1 rate_1 LS2 rate_2 number_of_datasets', ]
 
@@ -762,6 +767,11 @@
         else:
             self.azimuth_angle = self.azimuth_angle_raw
 
+        try:
+            self.custom_info = self.raw_info['custom_info'].strip('"')
+        except KeyError:
+            self.custom_info = None
+
 
 class FixedPointingChannel(LicelChannel):
     """ A class representing measurements of a specific lidar channel, during a fixed pointing measurement. """

mercurial