Skip to content

Commit 72b30af

Browse files
committed
Fixed error when no clean files are found for particular date.
1 parent aedaa4c commit 72b30af

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

functions.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,6 @@ def download_files(datelist, save_path, ftpsc, instrument, bflag, silent):
673673
if bflag == 'beacon':
674674

675675
url = 'https://stereo-ssc.nascom.nasa.gov/pub/beacon/' + sc + '/secchi/img/' + ins + '/' + str(date)
676-
677676
else:
678677

679678
url = 'https://stereo-ssc.nascom.nasa.gov/pub/ins_data/secchi/L0/' + sc[0] + '/img/' + ins + '/' + str(date)
@@ -2861,7 +2860,7 @@ def get_bkgd(path, ftpsc, start, bflag, ins, bg_dur, rolling=False):
28612860
red_files.extend(sorted(glob.glob(red_path + str(dates) + '/' + bflag + '/' + ins + '/*.fts')))
28622861

28632862
if len(red_files) == 0:
2864-
extended_interv = np.arange(bg_dur+5)
2863+
extended_interv = np.arange(bg_dur+1)
28652864
datelist = [datetime.datetime.strftime(date + datetime.timedelta(days=int(i)), '%Y%m%d') for i in extended_interv]
28662865
for k, dates in enumerate(datelist):
28672866
red_paths.append(red_path + str(dates) + '/' + bflag + '/' + ins + '/*.fts')
@@ -5265,7 +5264,7 @@ def reduction(start,hdul,hdul_data,hdul_header,ftpsc,ins,bflag,calpath,pointpath
52655264

52665265
if len(clean_header) == 0:
52675266
print('No clean files found for ', ins, ' on ', start)
5268-
return
5267+
return [], []
52695268

52705269
if len(set(post_conj)) == 1:
52715270

@@ -5443,15 +5442,17 @@ def data_reduction(start, path, datpath, ftpsc, instrument, bflag, silent, save_
54435442

54445443
clean_data,clean_header = reduction(start,hdul,hdul_data,hdul_header,ftpsc,ins,bflag,calpath,pointpath,silent=True)
54455444

5446-
for i in range(0,len(clean_data)):
5447-
if bflag == 'science':
5448-
newname = datetime.datetime.strptime(clean_header[i]['DATE-END'], '%Y-%m-%dT%H:%M:%S.%f').strftime('%Y%m%d_%H%M%S') + '_1b' + ins.replace('i_', '') + ftpsc + '.fts'
5449-
if bflag == 'beacon':
5450-
newname = datetime.datetime.strptime(clean_header[i]['DATE-END'], '%Y-%m-%dT%H:%M:%S.%f').strftime('%Y%m%d_%H%M%S') + '_17' + ins.replace('i_', '') + ftpsc + '.fts'
5451-
5452-
fits.writeto(savepath + ins + '/' + newname, clean_data[i, :, :].astype(np.float32), clean_header[i], output_verify='silentfix', overwrite=True)
5445+
if len(clean_data) != 0:
5446+
for i in range(0,len(clean_data)):
5447+
if bflag == 'science':
5448+
newname = datetime.datetime.strptime(clean_header[i]['DATE-END'], '%Y-%m-%dT%H:%M:%S.%f').strftime('%Y%m%d_%H%M%S') + '_1b' + ins.replace('i_', '') + ftpsc + '.fts'
5449+
if bflag == 'beacon':
5450+
newname = datetime.datetime.strptime(clean_header[i]['DATE-END'], '%Y-%m-%dT%H:%M:%S.%f').strftime('%Y%m%d_%H%M%S') + '_17' + ins.replace('i_', '') + ftpsc + '.fts'
54535451

5452+
fits.writeto(savepath + ins + '/' + newname, clean_data[i, :, :].astype(np.float32), clean_header[i], output_verify='silentfix', overwrite=True)
54545453

5454+
else:
5455+
continue
54555456
# rectify = [hdul_header[i]['rectify'] for i in range(len(hdul))]
54565457

54575458
#######################################################################################################################################

0 commit comments

Comments
 (0)