From 1d663e977686f9831b28d0b8b19add163f6f17f3 Mon Sep 17 00:00:00 2001 From: Orso Meneghini Date: Wed, 13 Nov 2024 20:26:48 -0800 Subject: [PATCH] test_machine_mapping_functions under each machine mappings --- omas/machine_mappings/d3d.py | 2 ++ omas/machine_mappings/east.py | 2 +- omas/machine_mappings/mast.py | 2 +- omas/machine_mappings/nstxu.py | 2 +- omas/machine_mappings/profiles_db_ccfe.py | 2 +- omas/machine_mappings/sample.py | 2 +- omas/omas_machine.py | 4 +--- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/omas/machine_mappings/d3d.py b/omas/machine_mappings/d3d.py index a5b503b91..fa9cab440 100644 --- a/omas/machine_mappings/d3d.py +++ b/omas/machine_mappings/d3d.py @@ -1523,3 +1523,5 @@ def core_profiles_global_quantities_data(ods, pulse): # ================================ +if __name__ == '__main__': + test_machine_mapping_functions('d3d', ["core_profiles_profile_1d"], globals(), locals()) diff --git a/omas/machine_mappings/east.py b/omas/machine_mappings/east.py index 0dd897cc7..471a31e3f 100644 --- a/omas/machine_mappings/east.py +++ b/omas/machine_mappings/east.py @@ -218,4 +218,4 @@ def port_angle(port): if __name__ == '__main__': - test_machine_mapping_functions(__all__, globals(), locals()) + test_machine_mapping_functions("east", __all__, globals(), locals()) diff --git a/omas/machine_mappings/mast.py b/omas/machine_mappings/mast.py index 00147fa5d..ff5751b78 100644 --- a/omas/machine_mappings/mast.py +++ b/omas/machine_mappings/mast.py @@ -438,4 +438,4 @@ def mse_data(ods, pulse, server=None, port=None): # ===================== if __name__ == '__main__': - test_machine_mapping_functions(__all__, globals(), locals()) + test_machine_mapping_functions("mast", __all__, globals(), locals()) diff --git a/omas/machine_mappings/nstxu.py b/omas/machine_mappings/nstxu.py index d02353135..912233b56 100644 --- a/omas/machine_mappings/nstxu.py +++ b/omas/machine_mappings/nstxu.py @@ -590,4 +590,4 @@ def charge_exchange_data(ods, pulse, edition='CT1'): # ===================== if __name__ == '__main__': - test_machine_mapping_functions(__all__, globals(), locals()) + test_machine_mapping_functions("nstxu", __all__, globals(), locals()) diff --git a/omas/machine_mappings/profiles_db_ccfe.py b/omas/machine_mappings/profiles_db_ccfe.py index ce416348b..04ced834e 100644 --- a/omas/machine_mappings/profiles_db_ccfe.py +++ b/omas/machine_mappings/profiles_db_ccfe.py @@ -139,4 +139,4 @@ def profile_db_to_ODS(ods, pulse, tok, db, ngrid): # ===================== if __name__ == '__main__': - test_machine_mapping_functions(__all__, globals(), locals()) + test_machine_mapping_functions("profiles_db_ccfe", __all__, globals(), locals()) diff --git a/omas/machine_mappings/sample.py b/omas/machine_mappings/sample.py index 02f232d7a..ade8e9610 100644 --- a/omas/machine_mappings/sample.py +++ b/omas/machine_mappings/sample.py @@ -22,4 +22,4 @@ def sample_function(ods, pulse, user_argument='this is a test'): # ===================== if __name__ == '__main__': - test_machine_mapping_functions(__all__, globals(), locals()) + test_machine_mapping_functions("sample", __all__, globals(), locals()) diff --git a/omas/omas_machine.py b/omas/omas_machine.py index a8f31de3c..52003449f 100644 --- a/omas/omas_machine.py +++ b/omas/omas_machine.py @@ -647,7 +647,7 @@ def test_machine_mapping_functions(machine, __all__, global_namespace, local_nam pprint(regression_kw) print('=' * len(func_name)) ods = ODS() #consistency_check= not break_schema - func = eval(machine + "." + func_name, global_namespace, local_namespace) + func = eval(func_name, global_namespace, local_namespace) try: try: regression_kw["update_callback"] = update_mapping @@ -776,5 +776,3 @@ def load_omas_machine( machine_to_omas(ods, machine, pulse, location, options, branch) return ods -if __name__ == '__main__': - test_machine_mapping_functions('d3d', ["core_profiles_profile_1d"], globals(), locals())