From 6ce4de8e531e68c66d62c6c02c3e2ed311f11485 Mon Sep 17 00:00:00 2001 From: rottenstea Date: Wed, 31 Jan 2024 16:05:25 +0100 Subject: [PATCH] Hopefully finally fixed the bug --- EmpiricalArchive/IsoModulator/Simulation_functions.py | 5 +++-- test/test_Simulation_functions.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/EmpiricalArchive/IsoModulator/Simulation_functions.py b/EmpiricalArchive/IsoModulator/Simulation_functions.py index ead0792..894fd8b 100644 --- a/EmpiricalArchive/IsoModulator/Simulation_functions.py +++ b/EmpiricalArchive/IsoModulator/Simulation_functions.py @@ -225,7 +225,8 @@ def add_field_contamination(self, contamination_frac: float, self.abs_mag_incl_plx_binarity_extinction_field = pd.concat( [self.abs_mag_incl_plx_binarity_extinction, field_df[common_columns]], axis=0) - def simulate(self, uncertainties: list) -> pd.DataFrame: + def simulate(self, uncertainties: list, field_file: str = + '/Users/alena/PycharmProjects/PaperI/EmpiricalArchive/data/Gaia_DR3/Gaia_DR3_500pc_1percent.csv') -> pd.DataFrame: """ Method that automatically adds all four implemented uncertainties (parallax, binary fraction, extinction level, field contamination) to the simulated CMD data in the recommended order. A column with the cluster name is also @@ -239,7 +240,7 @@ def simulate(self, uncertainties: list) -> pd.DataFrame: self.add_parallax_uncertainty(delta_plx=u_plx) self.add_binary_fraction(binarity_frac=binarity) self.add_extinction(extinction_level=extinction) - self.add_field_contamination(contamination_frac=field) + self.add_field_contamination(contamination_frac=field, field_data_path=field_file) star_cluster_object = self.abs_mag_incl_plx_binarity_extinction_field star_cluster_object["Cluster_id"] = self.name diff --git a/test/test_Simulation_functions.py b/test/test_Simulation_functions.py index 9da52d0..2579a55 100644 --- a/test/test_Simulation_functions.py +++ b/test/test_Simulation_functions.py @@ -266,7 +266,7 @@ def test_simulate_calls_add_methods_correctly(initialized_class_object): obj.set_CMD_type(1) # Call simulate method - result = obj.simulate(uncertainties) + result = obj.simulate(uncertainties, field_file=file_path) # Verify that add_ methods are called with correct uncertainties assert obj.abs_mag_incl_plx_binarity_extinction_field is not None