Thu, 02 Mar 2017 10:20:58 +0200
Use id.
atmospheric_lidar/licel_depol.py | file | annotate | diff | comparison | revisions | |
atmospheric_lidar/scripts/licel2scc_depol.py | file | annotate | diff | comparison | revisions |
--- a/atmospheric_lidar/licel_depol.py Mon Feb 27 22:10:54 2017 +0200 +++ b/atmospheric_lidar/licel_depol.py Thu Mar 02 10:20:58 2017 +0200 @@ -7,14 +7,14 @@ class LicelCalibrationMeasurement(LicelLidarMeasurement): - def __init__(self, plus45_files=None, minus45_files=None): + def __init__(self, plus45_files=None, minus45_files=None, use_id_as_name=False): # Setup the empty class - super(LicelCalibrationMeasurement, self).__init__() + super(LicelCalibrationMeasurement, self).__init__(use_id_as_name=use_id_as_name) self.plus45_files = plus45_files self.minus45_files = minus45_files - if (plus45_files and minus45_files): + if plus45_files and minus45_files: self.check_equal_length() self.read_channel_data()
--- a/atmospheric_lidar/scripts/licel2scc_depol.py Mon Feb 27 22:10:54 2017 +0200 +++ b/atmospheric_lidar/scripts/licel2scc_depol.py Thu Mar 02 10:20:58 2017 +0200 @@ -38,8 +38,8 @@ class CustomLidarMeasurement(LicelCalibrationMeasurement): extra_netcdf_parameters = custom_netcdf_parameters - def __init__(self, filelist=None): - super(CustomLidarMeasurement, self).__init__(filelist, use_id_as_name) + def __init__(self, plus45_files=None, minus45_files=None): + super(CustomLidarMeasurement, self).__init__(plus45_files, minus45_files, use_id_as_name) def get_PT(self): ''' Sets the pressure and temperature at station level. This is used if molecular_calc parameter is @@ -74,8 +74,8 @@ # Define the command line argument parser = argparse.ArgumentParser(description="A program to convert Licel binary files from depolarization calibration measurements to the SCC NetCDF format.") parser.add_argument("parameter_file", help="The path to a parameter file linking licel and SCC channels.") - parser.add_argument("plus45_string", nargs='?', help="Search string for plus 45 degree files (default '*.*')", default="*.*") - parser.add_argument("minus45_string", nargs='?', help="Search string for minus 45 degree files (default '*.*')", default="*.*") + parser.add_argument("plus45_string", help="Search string for plus 45 degree files") + parser.add_argument("minus45_string", help="Search string for minus 45 degree files") parser.add_argument("-i", '--id_as_name', help="Use transient digitizer ids as channel names, instead of descriptive names", action="store_true")