# HG changeset patch # User Ioannis # Date 1611610461 -7200 # Node ID f3bec37bfcd0b1b52730004458781400c0839742 # Parent dfe6a8c9919589185de8d9a9833d61e5d52592c4# Parent 686c1525ce361765046e8be458da2d1fa6b81f5d Merge branch 'master' of gitlab_iannis:ioannis_binietoglou/atmospheric-lidar diff -r dfe6a8c99195 -r f3bec37bfcd0 atmospheric_lidar/raymetrics.py --- 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. """