diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index d41b9e5..0000000 --- a/.gitmodules +++ /dev/null @@ -1,5 +0,0 @@ -[submodule "projects/tmp"] - path = projects/tmp - url = git@kuhl-mann.de:lattice/charm_SF_data.git - datalad-id = 5f402163-77f2-470e-b6f1-64d7bf9f87d4 - datalad-url = git@kuhl-mann.de:lattice/charm_SF_data.git diff --git a/corrlib/input/sfcf.py b/corrlib/input/sfcf.py index c8a5d46..bd4ae4d 100644 --- a/corrlib/input/sfcf.py +++ b/corrlib/input/sfcf.py @@ -49,7 +49,6 @@ bb_corrs: list = [ 'f_1', 'F1ll', 'k_1', - 'K_1', 'F_AA_a', 'F_AA_d', 'F_AdP_a', @@ -66,7 +65,6 @@ bb_corrs: list = [ bib_corrs: list = [ 'F_V0', - 'K_V0', ] corr_types: dict[str, str] = {} diff --git a/corrlib/toml.py b/corrlib/toml.py index abb5545..def5394 100644 --- a/corrlib/toml.py +++ b/corrlib/toml.py @@ -29,11 +29,12 @@ def replace_in_meas(measurements: dict, vars: dict[str, str]): for name, value in vars.items(): for m in measurements.keys(): for key in measurements[m].keys(): - if isinstance(measurements[m][key], str): - measurements[m][key] = replace_string(measurements[m][key], name, value) - elif isinstance(measurements[m][key], list): - for i in range(len(measurements[m][key])): - measurements[m][key][i] = replace_string(measurements[m][key][i], name, value) + measurements[m][key] = replace_string(measurements[m][key], name, value) + # replace ensemble name + for m in measurements.keys(): + for key in measurements[m].keys(): + if not key == 'ensemble': + measurements[m][key] = replace_string(measurements[m][key], 'ensemble', measurements[m]['ensemble']) return measurements def fill_cons(measurements, constants): diff --git a/projects/tmp b/projects/tmp deleted file mode 160000 index 216fe4e..0000000 --- a/projects/tmp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 216fe4ed3467ed486390735f8072856cf3d0a409