Tibeuleu/FOC_Reduction
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debug for manual input and multiple obs

Browse Source
This commit is contained in:
Thibault Barnouin
2023-05-12 15:34:49 +02:00
parent 3b44b4a8e0
commit 6fe84d8f2d
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/FOC_reduction.py
View File

@@ -11,7 +11,7 @@ import lib.fits as proj_fits #Functions to handle fits files
import lib.reduction as proj_red #Functions used in reduction pipeline
import lib.plots as proj_plots #Functions for plotting data
from lib.deconvolve import from_file_psf
from lib.query import retrieve_products
from lib.query import retrieve_products, path_exists, system
def main(target=None, proposal_id=None, infiles=None, output_dir="./data"):
@@ -69,17 +69,23 @@ def main(target=None, proposal_id=None, infiles=None, output_dir="./data"):
## Step 1:
# Get data from fits files and translate to flux in erg/cm²/s/Angstrom.
if not infiles is None:
products = [np.array([["/".join(filepath.split('/')[:-1]),filepath.split('/')[-1]] for filepath in infiles],dtype=str)]
prod = np.array([["/".join(filepath.split('/')[:-1]),filepath.split('/')[-1]] for filepath in infiles],dtype=str)
obs_dir = "/".join(infiles[0].split()[:-1])
if not path_exists(obs_dir):
system("mkdir -p {0:s} {1:s}".format(obs_dir,obs_dir.replace("data","plots")))
if target is None:
target = input("Target name:\n>")
else:
target, products = retrieve_products(target,proposal_id,output_dir=output_dir)
data_folder = products[0][0,0]
prod = products.pop()
for prods in products:
main(target=target,infiles=["/".join(pr) for pr in prods],output_dir=output_dir)
data_folder = prod[0,0]
try:
plots_folder = data_folder.replace("data","plots")
except:
plots_folder = "."
infiles = products[0][:,1]
infiles = prod[:,1]
data_array, headers = proj_fits.get_obs_data(infiles, data_folder=data_folder, compute_flux=True)
figname = "_".join([target,"FOC"])
@@ -189,4 +195,4 @@ if __name__ == "__main__":
help='output directory path for the data products', type=str, default="./data")
args = parser.parse_args()
exitcode = main(target=args.target, proposal_id=args.proposal_id, infiles=args.files, output_dir=args.output_dir)
print("Finished with ExitCode: ",exitcode)
print("Finished with ExitCode: ",exitcode)

2
src/lib/query.py
View File

@@ -109,7 +109,7 @@ def get_product_list(target=None, proposal_id=None):
else:
print(obs)
a = [np.array(i.split(":"), dtype=str) for i in input("select observations to be downloaded ('1,3,4,5' or '1,3:5' or 'all','*' default to 1)\n>").split(',')]
if a[0]==['']:
if a[0][0]=='':
a = [[1]]
if a[0][0] in ['a','all','*']:
b = np.ones(len(results),dtype=bool)