From 2d4133617fc11b93e03c457dade234f3fe737e5c Mon Sep 17 00:00:00 2001 From: SGCMarkus Date: Fri, 8 Mar 2024 11:37:02 +0100 Subject: [PATCH] astrodatadownloader: use SECTOR for TESS and TTABLEID for Kepler/K2 as extra information --- .../astrodatadownloader.py | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/main/astrodatadownloader/astrodatadownloader.py b/main/astrodatadownloader/astrodatadownloader.py index 92f1a42..a5425c8 100644 --- a/main/astrodatadownloader/astrodatadownloader.py +++ b/main/astrodatadownloader/astrodatadownloader.py @@ -1,5 +1,6 @@ from astroquery.mast import Observations from astropy import table +from astropy.io import fits import numpy as np from enum import Enum from copy import deepcopy @@ -26,25 +27,22 @@ def parse_manifest(manifest): exts = [] for i,f in enumerate(manifest['Local Path']): file_parts = np.array(np.unique(f.split(sep = '-'))) - sectors = list( map ( lambda x: x[0:2] == 's0', file_parts)) - if(len(file_parts[sectors]) > 0): - s1 = file_parts[sectors][0] - try: - s2 = file_parts[sectors][1] - except: - s2 = s1 - if(s1 == s2): - sector_range.append("%s" % s1) - else: - sector_range.append("%s-%s" % (s1,s2)) - else: + try: + with fits.open(f, mode="readonly") as hdu: + if("SECTOR" in hdu[0].header): + sector_range.append(f"{hdu[0].header['SECTOR']}") + elif("TTABLEID" in hdu[0].header): + sector_range.append(f"{hdu[0].header['TTABLEID']}") + hdu.close() + except: sector_range.append("-") + path_parts = np.array(f.split(sep = '/')) filenames.append(path_parts[-1]) exts.append(path_parts[-1][-8:]) results.add_column(table.Column(name = "filename", data = filenames)) - results.add_column(table.Column(name = "sectors", data = sector_range)) + results.add_column(table.Column(name = "sector", data = sector_range)) results.add_column(table.Column(name = "fileType", data = exts)) results.add_column(table.Column(name = "index", data = np.arange(0,len(manifest))))