From ac15b620cabfa0db44f9e8f3dafd97fe22e443dd Mon Sep 17 00:00:00 2001 From: rottenstea Date: Wed, 13 Mar 2024 10:16:30 +0100 Subject: [PATCH] Classfile.py: Add self.A_G as attribute because the Gaia extinction information may be needed for shifting the Isochrones in the future. Empirical_iso_reader.py: Changed paths requirements.txt: Updated seaborn version --- EmpiricalArchive/Extraction/Classfile.py | 4 ++++ EmpiricalArchive/Extraction/Empirical_iso_reader.py | 6 +++--- requirements.txt | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/EmpiricalArchive/Extraction/Classfile.py b/EmpiricalArchive/Extraction/Classfile.py index 47ae7b8..589abd3 100644 --- a/EmpiricalArchive/Extraction/Classfile.py +++ b/EmpiricalArchive/Extraction/Classfile.py @@ -91,6 +91,10 @@ def __init__(self, name: str, catalog: pd.DataFrame, dataset_id=None): av_cols = [col for col in self.data.columns if 'av' in col] self.avs = self.data[av_cols].drop_duplicates() + # Gaia DR3 AG + if 'AG' in self.data.columns: + self.A_G = self.data["AG"] + error_cols = [col for col in self.data.columns if str(col).startswith("e_")] self.errors = self.data[error_cols] diff --git a/EmpiricalArchive/Extraction/Empirical_iso_reader.py b/EmpiricalArchive/Extraction/Empirical_iso_reader.py index d353fbb..1f04ade 100644 --- a/EmpiricalArchive/Extraction/Empirical_iso_reader.py +++ b/EmpiricalArchive/Extraction/Empirical_iso_reader.py @@ -55,8 +55,8 @@ def build_empirical_df(csv_folder: str, age_file: pd.DataFrame, col_names: list, if __name__ == "__main__": # ---------------------------------------------------------------------------------------------------------------------- # set paths - empirical_iso_path = "//data/Isochrones/Empirical/" - reference_ages = pd.read_csv("//data/Isochrones/Empirical/") + empirical_iso_path = "../data/Isochrones/Empirical/" + reference_ages = pd.read_csv("../data/Reference_ages_new.csv") output_path = my_utility.set_output_path() save_table = True @@ -128,6 +128,6 @@ def build_empirical_df(csv_folder: str, age_file: pd.DataFrame, col_names: list, # save the table if save_table: - mastertable.to_csv("/Users/alena/PycharmProjects/Empirical_Isochrones/data/Isochrones/Mastertable_Archive.csv", + mastertable.to_csv("../data/Isochrones/Mastertable_Archive_TW-Hydrae.csv", mode="w", header=True) # ---------------------------------------------------------------------------------------------------------------------- \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 8d37381..f5b6f1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ numpy~=1.23.4 plotly~=5.9.0 scipy~=1.10.0 scikit-learn~=1.1.3 -seaborn~=0.12.1 +seaborn~=0.13.0 myst-nb~=0.17.2 sphinx-rtd-theme~=1.3.0