Mercurial > public > atmospheric_lidar / changeset

--- a/atmospheric_lidar/__init__.py	Wed Mar 25 18:17:28 2020 +0200
+++ b/atmospheric_lidar/__init__.py	Sat May 02 19:00:02 2020 +0300
@@ -1,1 +1,1 @@
-__version__ = '0.5.0'
\ No newline at end of file
+__version__ = '0.5.1'
\ No newline at end of file

--- a/atmospheric_lidar/licel_depol.py	Wed Mar 25 18:17:28 2020 +0200
+++ b/atmospheric_lidar/licel_depol.py	Sat May 02 19:00:02 2020 +0300
@@ -9,7 +9,7 @@
 
 class LicelCalibrationMeasurement(LicelLidarMeasurement):
 
-    def __init__(self, plus45_files=None, minus45_files=None, use_id_as_name=False, licel_timezone='UTC'):
+    def __init__(self, plus45_files=None, minus45_files=None, use_id_as_name=False, get_name_by_order=False, licel_timezone='UTC'):
         """Class to handle depolarization calibration measurements according to the SCC.
 
 
@@ -21,11 +21,14 @@
            List of paths for the minus 45 files.
         use_id_as_name : bool
            Defines if channels names are descriptive or transient digitizer IDs.
+        get_name_by_order : bool
+           If True, channels are named by the order they appear.
         licel_timezone : str
            String describing the timezone according to the tz database.
         """
         # Setup the empty class
-        super(LicelCalibrationMeasurement, self).__init__(use_id_as_name=use_id_as_name, licel_timezone=licel_timezone)
+        super(LicelCalibrationMeasurement, self).__init__(use_id_as_name=use_id_as_name, licel_timezone=licel_timezone,
+                                                          get_name_by_order=get_name_by_order)
 
         self.plus45_files = plus45_files
         self.minus45_files = minus45_files
@@ -62,11 +65,15 @@
 
     def read_channel_data(self):
         # Read plus and minus 45 measurements
-        self.plus45_measurement = LicelLidarMeasurement(self.plus45_files, self.use_id_as_name, self.licel_timezone)
+        self.plus45_measurement = LicelLidarMeasurement(self.plus45_files, use_id_as_name=self.use_id_as_name,
+                                                        get_name_by_order=self.get_name_by_order,
+                                                        licel_timezone=self.licel_timezone)
         self.plus45_measurement.extra_netcdf_parameters = self.extra_netcdf_parameters
         self.plus45_measurement.rename_channels(suffix='_p45')
 
-        self.minus45_measurement = LicelLidarMeasurement(self.minus45_files, self.use_id_as_name, self.licel_timezone)
+        self.minus45_measurement = LicelLidarMeasurement(self.minus45_files, use_id_as_name=self.use_id_as_name,
+                                                         get_name_by_order=self.get_name_by_order,
+                                                         licel_timezone=self.licel_timezone)
         self.minus45_measurement.extra_netcdf_parameters = self.extra_netcdf_parameters
         self.minus45_measurement.rename_channels(suffix='_m45')
 

--- a/atmospheric_lidar/scripts/licel2scc.py	Wed Mar 25 18:17:28 2020 +0200
+++ b/atmospheric_lidar/scripts/licel2scc.py	Sat May 02 19:00:02 2020 +0300
@@ -46,7 +46,8 @@
         extra_netcdf_parameters = custom_netcdf_parameters
 
         def __init__(self, file_list=None):
-            super(CustomLidarMeasurement, self).__init__(file_list, use_id_as_name, licel_timezone=licel_timezone)
+            super(CustomLidarMeasurement, self).__init__(file_list, use_id_as_name=use_id_as_name,
+                                                         licel_timezone=licel_timezone)
 
         def set_PT(self):
             ''' Sets the pressure and temperature at station level. This is used if molecular_calc parameter is

--- a/atmospheric_lidar/scripts/licel2scc_depol.py	Wed Mar 25 18:17:28 2020 +0200
+++ b/atmospheric_lidar/scripts/licel2scc_depol.py	Sat May 02 19:00:02 2020 +0300
@@ -44,7 +44,7 @@
         extra_netcdf_parameters = custom_netcdf_parameters
 
         def __init__(self, plus45_files=None, minus45_files=None):
-            super(CustomLidarMeasurement, self).__init__(plus45_files, minus45_files, use_id_as_name,
+            super(CustomLidarMeasurement, self).__init__(plus45_files, minus45_files, use_id_as_name=use_id_as_name,
                                                          licel_timezone=licel_timezone)
 
         def set_PT(self):