Mercurial > public > atmospheric_lidar / changeset

--- a/atmospheric_lidar/generic.py	Wed Jan 10 17:07:36 2018 +0200
+++ b/atmospheric_lidar/generic.py	Thu Jan 18 11:36:45 2018 +0200
@@ -386,7 +386,7 @@
                              'System': None,
                              'Latitude_degrees_north': None,
                              'Longitude_degrees_east': None,
-                             'Altitude_meter_asl': None}
+                             'Altitude_meter_asl': None,}
 
         channel_names = self.channels.keys()
 
@@ -403,7 +403,8 @@
             input_values[attribute["name"]] = attribute["value"]
 
         # Override global attributes, if provided in the settings file.
-        for attribute_name in ['System', 'Latitude_degrees_north', 'Longitude_degrees_east', 'Altitude_meter_asl']:
+        for attribute_name in ['System', 'Latitude_degrees_north', 'Longitude_degrees_east', 'Altitude_meter_asl',
+                               'Overlap_File_Name', 'LR_File_Name', 'Sounding_File_Name']:
             if attribute_name in parameters.general_parameters.keys():
                 if attribute_name in input_values:
                     logger.info("Overriding {0} attribute, using the value provided in the parameter file.".format(

--- a/atmospheric_lidar/scripts/licel2scc.py	Wed Jan 10 17:07:36 2018 +0200
+++ b/atmospheric_lidar/scripts/licel2scc.py	Thu Jan 18 11:36:45 2018 +0200
@@ -148,7 +148,7 @@
     try:
         measurement = measurement.subset_by_scc_channels()
     except ValueError as err:
-        logging.error(err)
+        logger.error(err)
         sys.exit(1)
 
     # Save the netcdf