Merge branch 'devel'

# Conflicts: # .coverage # .idea/Empirical_Isochrones.iml # test/test_Simulation_functions.py
rottenstea · Feb 22, 2024 · 1332c53 · 1332c53
2 parents 25f4f5a + 00e1c09
commit 1332c53
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 16 deletions.
diff --git a/.coverage b/.coverage
diff --git a/.idea/Empirical_Isochrones.iml b/.idea/Empirical_Isochrones.iml
diff --git a/test/test_Simulation_functions.py b/test/test_Simulation_functions.py
@@ -208,11 +208,9 @@ def test_add_field_unallowed_vals(initialized_class_object):
     obj = initialized_class_object
     binarity_frac = -0.1
     with pytest.raises(ValueError, match="Fraction needs to be between 0 and 1."):
-        obj.add_field_contamination(binarity_frac)
         obj.add_field_contamination(binarity_frac, field_data_path=file_path)
     binarity_frac = 1.1
     with pytest.raises(ValueError, match="Fraction needs to be between 0 and 1."):
-        obj.add_field_contamination(binarity_frac)
         obj.add_field_contamination(binarity_frac, field_data_path=file_path)
 
 
@@ -224,7 +222,6 @@ def test_add_field_contamination_sampling(initialized_class_object):
     obj.add_parallax_uncertainty(0.1)
     obj.add_binary_fraction(0.3)
     obj.add_extinction(0.5)
-    obj.add_field_contamination(contamination_frac)
     obj.add_field_contamination(contamination_frac, field_data_path=file_path)
 
     # Check if the correct number of entries is sampled
@@ -240,7 +237,6 @@ def test_add_field_contamination_conversion(initialized_class_object):
     obj.add_parallax_uncertainty(0.1)
     obj.add_binary_fraction(0.3)
     obj.add_extinction(0.5)
-    obj.add_field_contamination(contamination_frac)
     obj.add_field_contamination(contamination_frac, field_data_path=file_path)
 
     # Check if the conversion is done correctly for the sampled field data
@@ -257,7 +253,6 @@ def test_add_field_contamination_merging(initialized_class_object):
     obj.add_parallax_uncertainty(0.1)
     obj.add_binary_fraction(0.3)
     obj.add_extinction(0.5)
-    obj.add_field_contamination(contamination_frac)
     obj.add_field_contamination(contamination_frac, field_data_path=file_path)
 
     # Check if the merging is done correctly
@@ -292,7 +287,6 @@ def test_plot_verification_returns_figure_and_axes(initialized_class_object):
     obj.add_parallax_uncertainty(uncertainties[0])
     obj.add_binary_fraction(uncertainties[1])
     obj.add_extinction(uncertainties[2])
-    obj.add_field_contamination(uncertainties[3])
     obj.add_field_contamination(uncertainties[3], field_data_path=file_path)
     fig, axes = obj.plot_verification(uncertainties)
 
@@ -309,7 +303,6 @@ def test_plot_verification_plots_correct_data(initialized_class_object):
     obj.add_parallax_uncertainty(uncertainties[0])
     obj.add_binary_fraction(uncertainties[1])
     obj.add_extinction(uncertainties[2])
-    obj.add_field_contamination(uncertainties[3])
     obj.add_field_contamination(uncertainties[3], field_data_path=file_path)
     fig, axes = obj.plot_verification(uncertainties)
 
@@ -372,4 +365,3 @@ def test_RSS():
 
 
 
-