Skip to content

Commit f224dd4

Browse files
ulysses78ulysses78
authored
Merge pull request #321 from PollyNET/adding_RR-plots_to_summary-profiles
adding RR plots to the summary profile-plots as well as for the QC-plots
2 parents 4e49a75 + 958a8ae commit f224dd4

2 files changed

Lines changed: 34 additions & 15 deletions

File tree

‎lib/visualization/pypolly_display_profiles.py‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -865,9 +865,10 @@ def pollyDisplay_profile_summary(nc_dict_profile,nc_dict_profile_NR,config_dict,
865865
2022-09-01. First edition by Andi
866866
"""
867867

868-
if not nc_dict_profile :
868+
if not nc_dict_profile:
869869
return
870870

871+
871872
## read from config file
872873
figDPI = config_dict['figDPI']
873874
flagWatermarkOn = config_dict['flagWatermarkOn']
@@ -922,13 +923,16 @@ def pollyDisplay_profile_summary(nc_dict_profile,nc_dict_profile_NR,config_dict,
922923

923924
param_dict = {
924925
"backscatter":
925-
{"FR": ['aerBsc_raman_355','aerBsc_raman_532','aerBsc_raman_1064'],
926+
{"FR":
927+
['aerBsc_raman_355','aerBsc_raman_532','aerBsc_raman_1064','aerBsc_RR_355','aerBsc_RR_532','aerBsc_RR_1064'],
926928
"NR":['aerBsc_raman_355','aerBsc_raman_532']
927929
},
928-
"extinction": {"FR": ['aerExt_raman_355','aerExt_raman_532','aerExt_raman_1064'],
930+
"extinction": {"FR":
931+
['aerExt_raman_355','aerExt_raman_532','aerExt_raman_1064','aerExt_RR_355','aerExt_RR_532','aerExt_RR_1064'],
929932
"NR": ['aerExt_raman_355','aerExt_raman_532']
930933
},
931-
"lidarratio": {"FR": ['aerLR_raman_355','aerLR_raman_532','aerLR_raman_1064'],
934+
"lidarratio": {"FR":
935+
['aerLR_raman_355','aerLR_raman_532','aerLR_raman_1064','aerLR_RR_355','aerLR_RR_532','aerLR_RR_1064'],
932936
"NR": ['aerLR_raman_355','aerLR_raman_532']
933937
},
934938
"angstroem": {"FR": ['AE_beta_355_532_Raman','AE_beta_532_1064_Raman','AE_parExt_355_532_Raman'],
@@ -970,16 +974,19 @@ def pollyDisplay_profile_summary(nc_dict_profile,nc_dict_profile_NR,config_dict,
970974
if method == 'raman':
971975
param_dict = {
972976
"backscatter":
973-
{"FR": ['aerBsc_raman_355','aerBsc_raman_532','aerBsc_raman_1064'],
977+
{"FR":
978+
['aerBsc_raman_355','aerBsc_raman_532','aerBsc_raman_1064','aerBsc_RR_355','aerBsc_RR_532','aerBsc_RR_1064'],
974979
"NR": []
975980
},
976-
"extinction": {"FR": ['aerExt_raman_355','aerExt_raman_532','aerExt_raman_1064'],
981+
"extinction": {"FR":
982+
['aerExt_raman_355','aerExt_raman_532','aerExt_raman_1064','aerExt_RR_355','aerExt_RR_532','aerExt_RR_1064'],
977983
"NR": []
978984
},
979985
"lidarratio": {"FR": ['aerLR_raman_355','aerLR_raman_532','aerLR_raman_1064'],
980986
"NR": []
981987
},
982-
"angstroem": {"FR": ['AE_beta_355_532_Raman','AE_beta_532_1064_Raman','AE_parExt_355_532_Raman'],
988+
"angstroem": {"FR":
989+
['aerLR_raman_355','aerLR_raman_532','aerLR_raman_1064','aerLR_RR_355','aerLR_RR_532','aerLR_RR_1064'],
983990
"NR": []
984991
},
985992
"depolarization": {"FR": ['parDepol_raman_355','parDepol_raman_532','parDepol_raman_1064'],
@@ -1031,9 +1038,13 @@ def plotting_procedure(col,param_dict,parameter,xlabel,xlim=[0,1],ylim=[0,1],sca
10311038
if parameter == 'angstroem':
10321039
color_ls = ['orange','magenta','black']
10331040
else:
1034-
color_ls = ['blue','green','red']
1041+
color_ls = ['blue','green','red','purple','olive','lightsalmon']
10351042

1036-
line_style = '-'
1043+
if 'RR' in p:
1044+
line_style = 'dashed'
1045+
else:
1046+
line_style = '-'
1047+
#line_style = '-'
10371048

10381049
if parameter == 'wvmr':
10391050
# ax2 = ax[col].secondary_xaxis('top')
@@ -1322,13 +1333,16 @@ def pollyDisplay_profile_summary_QC(nc_dict_profile,config_dict,polly_conf_dict,
13221333
param_dict = {
13231334
"backscatter":
13241335
{"Klett": ['aerBsc_klett_355','aerBsc_klett_532','aerBsc_klett_1064'],
1325-
"Raman":['aerBsc_raman_355','aerBsc_raman_532','aerBsc_raman_1064']
1336+
"Raman":['aerBsc_raman_355','aerBsc_raman_532','aerBsc_raman_1064','aerBsc_RR_355','aerBsc_RR_532','aerBsc_RR_1064']
1337+
# "Raman":['aerBsc_raman_355','aerBsc_raman_532','aerBsc_raman_1064']
13261338
},
13271339
"extinction": {"Klett": ['aerBsc_klett_355','aerBsc_klett_532','aerBsc_klett_1064'],
1328-
"Raman": ['aerExt_raman_355','aerExt_raman_532','aerExt_raman_1064']
1340+
#"Raman": ['aerExt_raman_355','aerExt_raman_532','aerExt_raman_1064']
1341+
"Raman": ['aerExt_raman_355','aerExt_raman_532','aerExt_raman_1064','aerExt_RR_355','aerExt_RR_532','aerExt_RR_1064'],
13291342
},
13301343
"lidarratio": {"Klett": [],
1331-
"Raman": ['aerLR_raman_355','aerLR_raman_532','aerLR_raman_1064']
1344+
"Raman": ['aerLR_raman_355','aerLR_raman_532','aerLR_raman_1064','aerLR_RR_355','aerLR_RR_532','aerLR_RR_1064'],
1345+
#"Raman": ['aerLR_raman_355','aerLR_raman_532','aerLR_raman_1064']
13321346
},
13331347
"angstroem": {"Klett": [],
13341348
"Raman": ['AE_beta_355_532_Raman','AE_beta_532_1064_Raman','AE_parExt_355_532_Raman']
@@ -1359,9 +1373,13 @@ def plotting_procedure_QC(col,param_dict,parameter,xlabel,xlim=[0,1],ylim=[0,1],
13591373
if parameter == 'angstroem':
13601374
color_ls = ['orange','magenta','black']
13611375
else:
1362-
color_ls = ['blue','green','red']
1376+
color_ls = ['blue','green','red','purple','olive','lightsalmon']
13631377

1364-
line_style = '-'
1378+
1379+
if 'RR' in p:
1380+
line_style = 'dashed'
1381+
else:
1382+
line_style = '-'
13651383

13661384
if parameter == 'wvmr':
13671385
# ax2 = ax[col].secondary_xaxis('top')

‎lib/visualization/pypolly_readout.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,8 @@ def read_config(configfile):
278278
def read_excel_config_file(excel_file, timestamp, device):
279279
pd.set_option('display.width', 1500)
280280
pd.set_option('display.max_columns', None)
281-
excel_file_ds = pd.read_excel(f'{excel_file}', engine='openpyxl',usecols = 'A:Z')
281+
#excel_file_ds = pd.read_excel(f'{excel_file}', engine='openpyxl',usecols = 'A:Z')
282+
excel_file_ds = pd.read_excel(f'{excel_file}', engine='openpyxl')
282283
print(excel_file)
283284
## search for timerange for given timestamp
284285
filtered_device = excel_file_ds.loc[(excel_file_ds['Instrument'] == device)]

0 commit comments

Comments
 (0)