From d009758e71a412692f5c95eba7fa544be2f7c8dd Mon Sep 17 00:00:00 2001 From: Esteban Martinez Date: Thu, 28 Nov 2019 13:50:56 +0100 Subject: [PATCH 1/3] Added register_params argument to doNd functions. --- qdev_wrappers/dataset/doNd.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/qdev_wrappers/dataset/doNd.py b/qdev_wrappers/dataset/doNd.py index aadde4e9..654da60d 100644 --- a/qdev_wrappers/dataset/doNd.py +++ b/qdev_wrappers/dataset/doNd.py @@ -120,6 +120,7 @@ def do1d( enter_actions: ActionsT = (), exit_actions: ActionsT = (), write_period: Optional[float] = None, + register_params=None, do_plot: bool = True ) -> AxesTupleListWithRunId: """ @@ -148,8 +149,10 @@ def do1d( The run_id of the DataSet created """ meas = Measurement() - _register_parameters(meas, (param_set,)) - _register_parameters(meas, param_meas, setpoints=(param_set,)) + setpoint_params = (param_set,) + tuple(register_params) + _register_parameters(meas, setpoint_params) + _register_parameters(meas, param_meas, setpoints=setpoint_params) + params_to_measure = param_meas + tuple(register_params) _set_write_period(meas, write_period) _register_actions(meas, enter_actions, exit_actions) param_set.post_delay = delay @@ -161,7 +164,7 @@ def do1d( for set_point in np.linspace(start, stop, num_points): param_set.set(set_point) datasaver.add_result((param_set, set_point), - *_process_params_meas(param_meas)) + *_process_params_meas(params_to_measure)) return _handle_plotting(datasaver, do_plot, interrupted()) @@ -178,6 +181,7 @@ def do2d( after_inner_actions: ActionsT = (), write_period: Optional[float] = None, flush_columns: bool = False, + register_params=None, do_plot: bool=True ) -> AxesTupleListWithRunId: @@ -217,8 +221,10 @@ def do2d( """ meas = Measurement() - _register_parameters(meas, (param_set1, param_set2)) - _register_parameters(meas, param_meas, setpoints=(param_set1, param_set2)) + setpoint_params = (param_set1, param_set2,) + tuple(register_params) + _register_parameters(meas, setpoint_params) + _register_parameters(meas, param_meas, setpoints=setpoint_params) + params_to_measure = param_meas + tuple(register_params) _set_write_period(meas, write_period) _register_actions(meas, enter_actions, exit_actions) From a7da4dbac4fd60dbaa9435bf17a1826011771017 Mon Sep 17 00:00:00 2001 From: Esteban Martinez Date: Thu, 28 Nov 2019 13:52:22 +0100 Subject: [PATCH 2/3] Minor bug fix. --- qdev_wrappers/dataset/doNd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qdev_wrappers/dataset/doNd.py b/qdev_wrappers/dataset/doNd.py index 654da60d..decdccd3 100644 --- a/qdev_wrappers/dataset/doNd.py +++ b/qdev_wrappers/dataset/doNd.py @@ -248,7 +248,7 @@ def do2d( datasaver.add_result((param_set1, set_point1), (param_set2, set_point2), - *_process_params_meas(param_meas)) + *_process_params_meas(params_to_measure)) for action in after_inner_actions: action() if flush_columns: From b94bcdd56e553fc41b3be51ad05df013d5ed6595 Mon Sep 17 00:00:00 2001 From: Esteban Martinez Date: Thu, 28 Nov 2019 15:43:05 +0100 Subject: [PATCH 3/3] Added types to register_params and docstrings. --- qdev_wrappers/dataset/doNd.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/qdev_wrappers/dataset/doNd.py b/qdev_wrappers/dataset/doNd.py index decdccd3..dae5c4c4 100644 --- a/qdev_wrappers/dataset/doNd.py +++ b/qdev_wrappers/dataset/doNd.py @@ -120,7 +120,7 @@ def do1d( enter_actions: ActionsT = (), exit_actions: ActionsT = (), write_period: Optional[float] = None, - register_params=None, + register_params: Optional[_BaseParameter] = None, do_plot: bool = True ) -> AxesTupleListWithRunId: """ @@ -142,6 +142,8 @@ def do1d( called before the measurements start exit_actions: A list of functions taking no arguments that will be called after the measurements ends + register_params: A list of setpoint parameters to be registered in the + measurement but not scanned. do_plot: should png and pdf versions of the images be saved after the run. @@ -149,6 +151,8 @@ def do1d( The run_id of the DataSet created """ meas = Measurement() + if register_params is None: + register_params = tuple() setpoint_params = (param_set,) + tuple(register_params) _register_parameters(meas, setpoint_params) _register_parameters(meas, param_meas, setpoints=setpoint_params) @@ -181,7 +185,7 @@ def do2d( after_inner_actions: ActionsT = (), write_period: Optional[float] = None, flush_columns: bool = False, - register_params=None, + register_params: Optional[_BaseParameter] = None, do_plot: bool=True ) -> AxesTupleListWithRunId: @@ -213,6 +217,8 @@ def do2d( called after the measurements ends before_inner_actions: Actions executed before each run of the inner loop after_inner_actions: Actions executed after each run of the inner loop + register_params: A list of setpoint parameters to be registered in the + measurement but not scanned. do_plot: should png and pdf versions of the images be saved after the run. @@ -221,6 +227,8 @@ def do2d( """ meas = Measurement() + if register_params is None: + register_params = tuple() setpoint_params = (param_set1, param_set2,) + tuple(register_params) _register_parameters(meas, setpoint_params) _register_parameters(meas, param_meas, setpoints=setpoint_params)