Skip to content

Commit db03123

Browse files
committed
shifted RCS-plotting to first position
1 parent d9af5be commit db03123

1 file changed

Lines changed: 22 additions & 20 deletions

File tree

lib/visualization/pypolly_display_all.py

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,27 @@ def main():
173173

174174
print('retrievals to plot: '+ str(args.retrieval))
175175

176+
if ('all' in args.retrieval) or ('RCS' in args.retrieval):
177+
## plotting RCS plots
178+
try:
179+
nc_files = readout.get_nc_filename(date, device, inputfolder, param='RCS')
180+
for data_file in nc_files:
181+
nc_dict = readout.read_nc_file(data_file,date,device,location)
182+
param_ls = ['RCS_FR_355nm', 'RCS_FR_cross_355nm', 'RCS_NR_355nm', 'RCS_RR_355nm', 'RCS_FR_387nm', 'RCS_NR_387nm', 'RCS_FR_407nm', 'RCS_NR_407nm', 'RCS_FR_532nm', 'RCS_FR_cross_532nm','RCS_FR_parallel_532nm', 'RCS_NR_532nm', 'RCS_NR_cross_532nm', 'RCS_RR_532nm', 'RCS_FR_607nm', 'RCS_NR_607nm', 'RCS_FR_1064nm', 'RCS_FR_cross_1064nm', 'RCS_RR_1064nm']
183+
for p in param_ls:
184+
p1 = re.split(r'RCS_',p)[1]
185+
param = re.split(r'_[1-9].*nm',p1)[0]
186+
wavelength = re.split(f'{param}_',p1)[-1]
187+
wavelength = re.split(r'nm',wavelength)[0]
188+
189+
if np.all(nc_dict[p].mask): ## do not plot empty/non-existing channels
190+
continue
191+
else:
192+
print(f'plotting {p}')
193+
display_3d.pollyDisplayRCS(nc_dict, config_dict, polly_conf_dict, outputfolder, wavelength=wavelength,param=param,donefilelist_dict=donefilelist_dict)
194+
except Exception as e:
195+
logging.exception("An error occurred")
196+
176197
if ('all' in args.retrieval) or ('cloudinfo' in args.retrieval):
177198
## plotting ATT_BETA_FR plots + cloudinfo
178199
try:
@@ -187,6 +208,7 @@ def main():
187208
except Exception as e:
188209
logging.exception("An error occurred")
189210

211+
190212
if ('all' in args.retrieval) or ('attbsc' in args.retrieval):
191213
## plotting ATT_BETA_FR plots
192214
try:
@@ -492,26 +514,6 @@ def main():
492514
except Exception as e:
493515
logging.exception("An error occurred")
494516

495-
if ('all' in args.retrieval) or ('RCS' in args.retrieval):
496-
## plotting RCS plots
497-
try:
498-
nc_files = readout.get_nc_filename(date, device, inputfolder, param='RCS')
499-
for data_file in nc_files:
500-
nc_dict = readout.read_nc_file(data_file,date,device,location)
501-
param_ls = ['RCS_FR_355nm', 'RCS_FR_cross_355nm', 'RCS_NR_355nm', 'RCS_RR_355nm', 'RCS_FR_387nm', 'RCS_NR_387nm', 'RCS_FR_407nm', 'RCS_NR_407nm', 'RCS_FR_532nm', 'RCS_FR_cross_532nm','RCS_FR_parallel_532nm', 'RCS_NR_532nm', 'RCS_NR_cross_532nm', 'RCS_RR_532nm', 'RCS_FR_607nm', 'RCS_NR_607nm', 'RCS_FR_1064nm', 'RCS_FR_cross_1064nm', 'RCS_RR_1064nm']
502-
for p in param_ls:
503-
p1 = re.split(r'RCS_',p)[1]
504-
param = re.split(r'_[1-9].*nm',p1)[0]
505-
wavelength = re.split(f'{param}_',p1)[-1]
506-
wavelength = re.split(r'nm',wavelength)[0]
507-
508-
if np.all(nc_dict[p].mask): ## do not plot empty/non-existing channels
509-
continue
510-
else:
511-
print(f'plotting {p}')
512-
display_3d.pollyDisplayRCS(nc_dict, config_dict, polly_conf_dict, outputfolder, wavelength=wavelength,param=param,donefilelist_dict=donefilelist_dict)
513-
except Exception as e:
514-
logging.exception("An error occurred")
515517

516518
## add plotted files to donefile
517519
if write2donefile == True:

0 commit comments

Comments
 (0)