From d2ebb0baa9e9d840929c533701dd6840c00ad036 Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Wed, 9 Jul 2025 08:03:04 +0000 Subject: [PATCH 1/3] [DATALAD] Added subdataset --- .gitmodules | 5 +++++ projects/tmp | 1 + 2 files changed, 6 insertions(+) create mode 100644 .gitmodules create mode 160000 projects/tmp diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..d41b9e5 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,5 @@ +[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/projects/tmp b/projects/tmp new file mode 160000 index 0000000..216fe4e --- /dev/null +++ b/projects/tmp @@ -0,0 +1 @@ +Subproject commit 216fe4ed3467ed486390735f8072856cf3d0a409 From e259a21d3965d26989de4b7fb429dfbf49f407a7 Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Tue, 2 Sep 2025 10:24:40 +0000 Subject: [PATCH 2/3] Add K_1 and K_V0 --- corrlib/input/sfcf.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/corrlib/input/sfcf.py b/corrlib/input/sfcf.py index bd4ae4d..c8a5d46 100644 --- a/corrlib/input/sfcf.py +++ b/corrlib/input/sfcf.py @@ -49,6 +49,7 @@ bb_corrs: list = [ 'f_1', 'F1ll', 'k_1', + 'K_1', 'F_AA_a', 'F_AA_d', 'F_AdP_a', @@ -65,6 +66,7 @@ bb_corrs: list = [ bib_corrs: list = [ 'F_V0', + 'K_V0', ] corr_types: dict[str, str] = {} From 498f986de757325e4aafc990d3faa2925d236df7 Mon Sep 17 00:00:00 2001 From: Justus Kuhlmann Date: Tue, 2 Sep 2025 10:25:49 +0000 Subject: [PATCH 3/3] better replacements --- corrlib/toml.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/corrlib/toml.py b/corrlib/toml.py index def5394..abb5545 100644 --- a/corrlib/toml.py +++ b/corrlib/toml.py @@ -29,12 +29,11 @@ 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(): - 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']) + 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) return measurements def fill_cons(measurements, constants):