Thu, 03 Nov 2016 12:55:44 +0200
Small changes in Depol file creation.
--- a/atmospheric_lidar/generic.py Tue Jun 07 18:40:58 2016 +0300 +++ b/atmospheric_lidar/generic.py Thu Nov 03 12:55:44 2016 +0200 @@ -374,7 +374,6 @@ 'Background_High': (('channels',), 'd'), 'LR_Input': (('channels',), 'i'), 'DAQ_Range': (('channels',), 'd'), - 'Depolarization_Factor': (('channels',), 'd'), } return channel_variables
--- a/atmospheric_lidar/licel_depol.py Tue Jun 07 18:40:58 2016 +0300 +++ b/atmospheric_lidar/licel_depol.py Thu Nov 03 12:55:44 2016 +0200 @@ -143,7 +143,6 @@ 'Background_High': (('channels',), 'd'), 'LR_Input': (('channels',), 'i'), 'DAQ_Range': (('channels',), 'd'), - 'Depolarization_Factor': (('channels',), 'd'), 'Pol_Calib_Range_Min': (('channels',), 'd'), 'Pol_Calib_Range_Max': (('channels',), 'd'), }
--- a/atmospheric_lidar/rali_depolarization_parameters.py Tue Jun 07 18:40:58 2016 +0300 +++ b/atmospheric_lidar/rali_depolarization_parameters.py Thu Nov 03 12:55:44 2016 +0200 @@ -1,11 +1,13 @@ general_parameters = \ {'System': '\'RALI\'', + 'Call sign': 'bu', 'Laser_Pointing_Angle': 0, 'Molecular_Calc': 0, 'Latitude_degrees_north': 44.348, 'Longitude_degrees_east': 26.029, - 'Altitude_meter_asl': 93.0} # This should be float + 'Altitude_meter_asl': 93.0} # This should be float +# Change to channel_parameters to use all channels. For testing I define only photon counting channels below. channel_parameters = \ { '00532.p_an_p45': {'channel_ID': 383, 'Background_Low': 50000, @@ -31,6 +33,78 @@ 'Laser_Shots': 3000, 'LR_Input': 1, 'DAQ_Range': 20.0, + '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, + '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, + '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, + '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}, @@ -80,4 +154,3 @@ 'Pol_Calib_Range_Min': 1000, 'Pol_Calib_Range_Max': 3000}, } -
--- a/atmospheric_lidar/rali_netcdf_parameters.py Tue Jun 07 18:40:58 2016 +0300 +++ b/atmospheric_lidar/rali_netcdf_parameters.py Thu Nov 03 12:55:44 2016 +0200 @@ -12,15 +12,13 @@ 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 100.0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range': 100.0,}, '00355.o_an': {'channel_ID': 98, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 100.0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range': 100.0,}, '00355.o_ph': {'channel_ID': 99, 'Background_Low': 50000, 'Background_High': 60000, @@ -33,63 +31,54 @@ 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 100.0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range': 100.0,}, '00387.o_ph': {'channel_ID': 91, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range': 0,}, '00532.p_an': {'channel_ID': 94, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 100.0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range': 100.0,}, '00532.p_ph': {'channel_ID': 95, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range': 0,}, '00532.s_an': {'channel_ID': 96, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 20.0, - 'Depolarization_Factor': 0.115,}, + 'DAQ_Range': 20.0,}, '00532.s_ph': {'channel_ID': 97, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 0, - 'Depolarization_Factor': 0.115,}, + 'DAQ_Range': 0,}, '00607.o_an': {'channel_ID': 92, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 20.0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range': 20.0,}, '00607.o_ph': {'channel_ID': 93, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input':1, - 'DAQ_Range':20.0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range':20.0,}, '00408.o_ph': {'channel_ID': 170, 'Background_Low': 50000, 'Background_High': 60000, 'Laser_Shots': 3000, 'LR_Input': 1, - 'DAQ_Range': 0, - 'Depolarization_Factor': 0,}, + 'DAQ_Range': 0,}, }