Mercurial > public > atmospheric_lidar / changeset

--- a/atmospheric_lidar/licel_depol.py	Thu Mar 02 10:20:58 2017 +0200
+++ b/atmospheric_lidar/licel_depol.py	Thu Mar 02 12:39:55 2017 +0200
@@ -39,10 +39,10 @@
     def read_channel_data(self):
 
         # Read plus and minus 45 measurements
-        self.plus45_measurement = LicelLidarMeasurement(self.plus45_files)
+        self.plus45_measurement = LicelLidarMeasurement(self.plus45_files, self.use_id_as_name)
         self.plus45_measurement.rename_channel(suffix='_p45')
 
-        self.minus45_measurement = LicelLidarMeasurement(self.minus45_files)
+        self.minus45_measurement = LicelLidarMeasurement(self.minus45_files, self.use_id_as_name)
         self.minus45_measurement.rename_channel(suffix='_m45')
 
         # Combine them in this object

--- a/atmospheric_lidar/rali_depolarization_parameters.py	Thu Mar 02 10:20:58 2017 +0200
+++ b/atmospheric_lidar/rali_depolarization_parameters.py	Thu Mar 02 12:39:55 2017 +0200
@@ -77,80 +77,4 @@
          'DAQ_Range': 0,
          'Pol_Calib_Range_Min': 1000,
          'Pol_Calib_Range_Max': 3000},
-         }
-
-
-channel_parameters_full = \
-{ '00532.p_an_p45': {'channel_ID': 383,
-         'Background_Low': 50000,
-         'Background_High': 60000,
-         'Laser_Shots': 3000,
-         'LR_Input': 1,
-         'DAQ_Range': 100.0,
-         'Depolarization_Factor': 0,
-         'Pol_Calib_Range_Min': 1000,
-         'Pol_Calib_Range_Max': 3000},
- '00532.p_ph_p45': {'channel_ID': 378,
-         'Background_Low': 50000,
-         'Background_High': 60000,
-         'Laser_Shots': 3000,
-         'LR_Input': 1,
-         'DAQ_Range': 0,
-         'Depolarization_Factor': 0,
-         'Pol_Calib_Range_Min': 1000,
-         'Pol_Calib_Range_Max': 3000},
- '00532.s_an_p45': {'channel_ID': 385 ,
-         'Background_Low': 50000,
-         'Background_High': 60000,
-         'Laser_Shots': 3000,
-         'LR_Input': 1,
-         'DAQ_Range': 20.0,
-         'Depolarization_Factor': 0.115,
-         'Pol_Calib_Range_Min': 1000,
-         'Pol_Calib_Range_Max': 3000},
- '00532.s_ph_p45': {'channel_ID': 380,
-         'Background_Low': 50000,
-         'Background_High': 60000,
-         'Laser_Shots': 3000,
-         'LR_Input': 1,
-         'DAQ_Range': 0,
-         'Depolarization_Factor': 0.115,
-         'Pol_Calib_Range_Min': 1000,
-         'Pol_Calib_Range_Max': 3000},
- '00532.p_an_m45': {'channel_ID': 384,
-         'Background_Low': 50000,
-         'Background_High': 60000,
-         'Laser_Shots': 3000,
-         'LR_Input': 1,
-         'DAQ_Range': 100.0,
-         'Depolarization_Factor': 0,
-         'Pol_Calib_Range_Min': 1000,
-         'Pol_Calib_Range_Max': 3000},
- '00532.p_ph_m45': {'channel_ID': 379,
-         'Background_Low': 50000,
-         'Background_High': 60000,
-         'Laser_Shots': 3000,
-         'LR_Input': 1,
-         'DAQ_Range': 0,
-         'Depolarization_Factor': 0,
-         'Pol_Calib_Range_Min': 1000,
-         'Pol_Calib_Range_Max': 3000},
- '00532.s_an_m45': {'channel_ID': 386,
-         'Background_Low': 50000,
-         'Background_High': 60000,
-         'Laser_Shots': 3000,
-         'LR_Input': 1,
-         'DAQ_Range': 20.0,
-         'Depolarization_Factor': 0.115,
-         'Pol_Calib_Range_Min': 1000,
-         'Pol_Calib_Range_Max': 3000},
- '00532.s_ph_m45': {'channel_ID': 382,
-         'Background_Low': 50000,
-         'Background_High': 60000,
-         'Laser_Shots': 3000,
-         'LR_Input': 1,
-         'DAQ_Range': 0,
-         'Depolarization_Factor': 0.115,
-         'Pol_Calib_Range_Min': 1000,
-         'Pol_Calib_Range_Max': 3000},
-         }
+         }
\ No newline at end of file