Skip to content

Commit

Permalink
Hopefully finally fixed the bug
Browse files Browse the repository at this point in the history
  • Loading branch information
rottenstea committed Jan 31, 2024
1 parent 2624836 commit 6ce4de8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions EmpiricalArchive/IsoModulator/Simulation_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/test_Simulation_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 6ce4de8

Please sign in to comment.