From d3886b89f847b0f199010764735690724dcb28ad Mon Sep 17 00:00:00 2001 From: wilsonm <michael.wilson@ed.ac.uk> Date: Wed, 23 Sep 2020 09:50:04 +0100 Subject: [PATCH] update name of action which iterates runcard to properly reflect function --- validphys2/examples/effective_exponents/runcardreport.md | 2 +- validphys2/src/validphys/eff_exponents.py | 4 ++-- validphys2/src/validphys/scripts/vp_nextfitruncard.py | 2 +- validphys2/src/validphys/tests/test_effexponents.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/validphys2/examples/effective_exponents/runcardreport.md b/validphys2/examples/effective_exponents/runcardreport.md index dca5e36c91..d5e7f427c4 100644 --- a/validphys2/examples/effective_exponents/runcardreport.md +++ b/validphys2/examples/effective_exponents/runcardreport.md @@ -1,5 +1,5 @@ % Next runcard: ```yaml -{@next_effective_exponents_yaml@} +{@iterated_runcard_yaml@} ``` diff --git a/validphys2/src/validphys/eff_exponents.py b/validphys2/src/validphys/eff_exponents.py index 2e0cbd3ddc..ba1ac4037d 100644 --- a/validphys2/src/validphys/eff_exponents.py +++ b/validphys2/src/validphys/eff_exponents.py @@ -401,7 +401,7 @@ fmt = lambda a: float(significant_digits(a, 4)) next_fit_eff_exps_table = collect("next_effective_exponents_table", ("fitpdfandbasis",)) -def next_effective_exponents_yaml( +def iterated_runcard_yaml( fit: FitSpec, next_fit_eff_exps_table, _updated_description=None ): """ @@ -427,7 +427,7 @@ def next_effective_exponents_yaml( be written to a file e.g >>> from validphys.api import API - >>> yaml_output = API.next_effective_exponents_yaml( + >>> yaml_output = API.iterated_runcard_yaml( ... fit=<fit name>, ... _updated_description="My iterated fit" ... ) diff --git a/validphys2/src/validphys/scripts/vp_nextfitruncard.py b/validphys2/src/validphys/scripts/vp_nextfitruncard.py index 9b35bf45ab..59cc3ea8e0 100644 --- a/validphys2/src/validphys/scripts/vp_nextfitruncard.py +++ b/validphys2/src/validphys/scripts/vp_nextfitruncard.py @@ -101,7 +101,7 @@ def main(): updated_description = interactive_description(description) - iterated_runcard_yaml = API.next_effective_exponents_yaml( + iterated_runcard_yaml = API.iterated_runcard_yaml( fit=input_fit, _updated_description=updated_description ) diff --git a/validphys2/src/validphys/tests/test_effexponents.py b/validphys2/src/validphys/tests/test_effexponents.py index 54f052058e..1a0d05426c 100644 --- a/validphys2/src/validphys/tests/test_effexponents.py +++ b/validphys2/src/validphys/tests/test_effexponents.py @@ -25,7 +25,7 @@ def test_next_runcard(): ite2_runcard.pop("pdf") # Removing the PDF key, it's an artefact of as_input predicted_ite2_runcard = yaml.safe_load( - API.next_effective_exponents_yaml(fit=FIT) + API.iterated_runcard_yaml(fit=FIT) ) # Remove all seed keys from the runcards since these are randomly generated -- GitLab