analysis.composite_indv_detect.main: Use column_names definition (iss #…

…21)
astrochun · Mar 15, 2020 · 4b586bd · 4b586bd
1 parent daa8199
commit 4b586bd
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Metallicity_Stack_Commons/analysis/composite_indv_detect.py b/Metallicity_Stack_Commons/analysis/composite_indv_detect.py
@@ -7,6 +7,10 @@
 
 from ..temp_metallicity_calc import metallicity_calculation
 from .. import OIII_r
+from ..column_names import bin_names0, indv_names0, temp_metal_names0
+
+ID_name = indv_names0[0]
+bin_ID_name = bin_names0[0]
 
 
 def main(fitspath, dataset, composite_file, indv_em_line_file, indv_bin_file, outfile, det3=True):
@@ -77,8 +81,8 @@ def main(fitspath, dataset, composite_file, indv_em_line_file, indv_bin_file, ou
 
     # Define [indv_derived_prop_table] to include ID, bin_ID, composite T_e,
     # and 12+log(O/H)
-    arr0 = [indv_em_line_table['ID'], bin_id_indv, adopted_temp, com_O_log]
-    names0 = ['ID', 'bin_ID', 'T_e', '12+log(O/H)']
+    arr0 = [indv_em_line_table[ID_name], bin_id_indv, adopted_temp, com_O_log]
+    names0 = [ID_name, bin_ID_name] + temp_metal_names0[:2]
 
     # Include other metallicities
     arr0 += list(metal_dict.values())