From 20027639122812cdfbab40f9d35693aec7ac617d Mon Sep 17 00:00:00 2001 From: Reagen Leimbach Date: Sat, 11 Apr 2020 20:21:21 -0700 Subject: [PATCH] Updated valid_table to be used in Zcalbase_gal and added revised option to column_name for valid_table --- Metallicity_Stack_Commons/column_names.py | 1 + Metallicity_Stack_Commons/valid_table.py | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Metallicity_Stack_Commons/column_names.py b/Metallicity_Stack_Commons/column_names.py index f191615..757cd2e 100644 --- a/Metallicity_Stack_Commons/column_names.py +++ b/Metallicity_Stack_Commons/column_names.py @@ -71,6 +71,7 @@ def line_fit_suffix_add(line_name0, line_type0): # Bin-related files filename_dict['bin_info'] = 'bin_info.tbl' filename_dict['bin_valid'] = 'bin_validation.tbl' +filename_dict['bin_valid_rev'] = 'bin_validation_revised.tbl' filename_dict['bin_valid_rev'] = filename_dict['bin_valid'].replace('.tbl', '.revised.tbl') filename_dict['bin_fit'] = 'bin_emission_line_fit.tbl' filename_dict['bin_fit_rev'] = filename_dict['bin_fit'].replace('.tbl', '.revised.tbl') diff --git a/Metallicity_Stack_Commons/valid_table.py b/Metallicity_Stack_Commons/valid_table.py index e797117..b2ad29b 100644 --- a/Metallicity_Stack_Commons/valid_table.py +++ b/Metallicity_Stack_Commons/valid_table.py @@ -3,7 +3,7 @@ from astropy.io import ascii as asc from astropy.table import Table, Column -from Metallicity_Stack_Commons.column_names import filename_dict, valid_table_names0 # , bin_names0, remove_from_list +from Metallicity_Stack_Commons.Metallicity_Stack_Commons.column_names import filename_dict, valid_table_names0 # , bin_names0, remove_from_list def make_validation_table(fitspath): @@ -72,7 +72,7 @@ def make_validation_table(fitspath): ver_tab = fitspath + filename_dict['bin_valid'] tab1 = Table([bin_ID, N_stack, detection, OIII4363, O_4363_SN], names=valid_table_names0) asc.write(tab1, ver_tab, format='fixed_width_two_line') - + ''' # Write revised file for human editing ver_tab_revised = fitspath + filename_dict['bin_valid_rev'] if not exists(ver_tab_revised): @@ -85,7 +85,7 @@ def make_validation_table(fitspath): print("ERROR!!! FILE EXISTS!!! WILL NOT OVERWRITE !!!") print("ERROR!!! PLEASE RENAME/DELETE FILE TO REGENERATE !!!") print(" ") - + ''' def compare_to_by_eye(fitspath, dataset): """ @@ -173,5 +173,5 @@ def compare_to_by_eye(fitspath, dataset): detect_add = Column(name='Detection', data=check_ID) ver_tab.add_column(detect_add, 2) - asc.write(ver_tab, fitspath + 'bin_validation_revised.tbl', format='fixed_width_two_line') + asc.write(ver_tab, fitspath + filename_dict['bin_valid_rev'], format='fixed_width_two_line') asc.write(ver_tab, fitspath + 'bin_validation_revised.csv', format='csv')