Commit a5595e8b authored by Médéric Boquien's avatar Médéric Boquien
Browse files

It should not be the job of the save procedure to sort the column names. Better do that before.

parent 155786e0
...@@ -159,8 +159,9 @@ class PdfAnalysis(AnalysisModule): ...@@ -159,8 +159,9 @@ class PdfAnalysis(AnalysisModule):
# Retrieve an arbitrary SED to obtain the list of output parameters # Retrieve an arbitrary SED to obtain the list of output parameters
warehouse = SedWarehouse() warehouse = SedWarehouse()
sed = warehouse.get_sed(creation_modules, params.from_index(0)) sed = warehouse.get_sed(creation_modules, params.from_index(0))
info = sed.info info = list(sed.info.keys())
n_info = len(sed.info) info.sort()
n_info = len(info)
del warehouse, sed del warehouse, sed
print("Computing the models fluxes...") print("Computing the models fluxes...")
...@@ -231,7 +232,7 @@ class PdfAnalysis(AnalysisModule): ...@@ -231,7 +232,7 @@ class PdfAnalysis(AnalysisModule):
analysed_std) analysed_std)
save_table_best('best_models.txt', obs_table['id'], best_chi2, save_table_best('best_models.txt', obs_table['id'], best_chi2,
best_chi2_red, best_parameters, best_fluxes, filters, best_chi2_red, best_parameters, best_fluxes, filters,
info.keys()) info)
if mock_flag is True: if mock_flag is True:
...@@ -295,7 +296,7 @@ class PdfAnalysis(AnalysisModule): ...@@ -295,7 +296,7 @@ class PdfAnalysis(AnalysisModule):
analysed_std) analysed_std)
save_table_best('best_mock_models.txt', mock_table['id'], save_table_best('best_mock_models.txt', mock_table['id'],
best_chi2, best_chi2_red, best_parameters, best_chi2, best_chi2_red, best_parameters,
best_fluxes, filters, info.keys()) best_fluxes, filters, info)
print("Run completed!") print("Run completed!")
......
...@@ -170,8 +170,6 @@ def save_table_best(filename, obsid, chi2, chi2_red, variables, fluxes, ...@@ -170,8 +170,6 @@ def save_table_best(filename, obsid, chi2, chi2_red, variables, fluxes,
best_model_table.add_column(Column(np_chi2, name="chi_square")) best_model_table.add_column(Column(np_chi2, name="chi_square"))
best_model_table.add_column(Column(np_chi2_red, name="reduced_chi_square")) best_model_table.add_column(Column(np_chi2_red, name="reduced_chi_square"))
info_keys = list(info_keys)
info_keys.sort()
for index, name in enumerate(info_keys): for index, name in enumerate(info_keys):
column = Column(np_variables[:, index], name=name) column = Column(np_variables[:, index], name=name)
best_model_table.add_column(column) best_model_table.add_column(column)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment