From fd942672df9e54007d9720478f6b7612f6fd3ef6 Mon Sep 17 00:00:00 2001 From: Ivan Usov Date: Fri, 30 Oct 2020 14:48:56 +0100 Subject: [PATCH] Rename number_of_measurements -> n_points --- pyzebra/ccl_io.py | 12 ++++++------ pyzebra/param_study_moduls.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pyzebra/ccl_io.py b/pyzebra/ccl_io.py index aa34cee..fbac1dc 100644 --- a/pyzebra/ccl_io.py +++ b/pyzebra/ccl_io.py @@ -81,7 +81,7 @@ CCL_FIRST_LINE_NB = ( ) CCL_SECOND_LINE = ( - ("number_of_measurements", int), + ("n_points", int), ("angle_step", float), ("monitor", float), ("temperature", float), @@ -151,14 +151,14 @@ def parse_1D(fileobj, data_type): d[param_name] = param_type(param) d["om"] = np.linspace( - d["omega_angle"] - (d["number_of_measurements"] / 2) * d["angle_step"], - d["omega_angle"] + (d["number_of_measurements"] / 2) * d["angle_step"], - d["number_of_measurements"], + d["omega_angle"] - (d["n_points"] / 2) * d["angle_step"], + d["omega_angle"] + (d["n_points"] / 2) * d["angle_step"], + d["n_points"], ) # subsequent lines with counts counts = [] - while len(counts) < d["number_of_measurements"]: + while len(counts) < d["n_points"]: counts.extend(map(int, next(fileobj).split())) d["Counts"] = counts @@ -193,7 +193,7 @@ def parse_1D(fileobj, data_type): print("Mag_field not present in dat file") data_cols["omega_angle"] = metadata["omega"] - data_cols["number_of_measurements"] = len(data_cols["om"]) + data_cols["n_points"] = len(data_cols["om"]) data_cols["monitor"] = data_cols["Monitor1"][0] data_cols["twotheta_angle"] = metadata["2-theta"] data_cols["chi_angle"] = metadata["chi"] diff --git a/pyzebra/param_study_moduls.py b/pyzebra/param_study_moduls.py index 1a2a506..2f62dd4 100644 --- a/pyzebra/param_study_moduls.py +++ b/pyzebra/param_study_moduls.py @@ -418,7 +418,7 @@ def variables(dictionary): "h_index", "l_index", "k_index", - "number_of_measurements", + "n_points", "monitor", "Time", "omega_angle",