zebra/pyzebra
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename number_of_measurements -> n_points

Browse Source
This commit is contained in:
usov_i
2020-10-30 14:48:56 +01:00
parent 60cb733ca7
commit fd942672df
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pyzebra/ccl_io.py
View File

@ -81,7 +81,7 @@ CCL_FIRST_LINE_NB = (
) )
CCL_SECOND_LINE = ( CCL_SECOND_LINE = (
("number_of_measurements", int), ("n_points", int),
("angle_step", float), ("angle_step", float),
("monitor", float), ("monitor", float),
("temperature", float), ("temperature", float),
@ -151,14 +151,14 @@ def parse_1D(fileobj, data_type):
d[param_name] = param_type(param) d[param_name] = param_type(param)
d["om"] = np.linspace( d["om"] = np.linspace(
d["omega_angle"] - (d["number_of_measurements"] / 2) * d["angle_step"], d["omega_angle"] - (d["n_points"] / 2) * d["angle_step"],
d["omega_angle"] + (d["number_of_measurements"] / 2) * d["angle_step"], d["omega_angle"] + (d["n_points"] / 2) * d["angle_step"],
d["number_of_measurements"], d["n_points"],
) )
# subsequent lines with counts # subsequent lines with counts
counts = [] counts = []
while len(counts) < d["number_of_measurements"]: while len(counts) < d["n_points"]:
counts.extend(map(int, next(fileobj).split())) counts.extend(map(int, next(fileobj).split()))
d["Counts"] = counts d["Counts"] = counts
@ -193,7 +193,7 @@ def parse_1D(fileobj, data_type):
print("Mag_field not present in dat file") print("Mag_field not present in dat file")
data_cols["omega_angle"] = metadata["omega"] 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["monitor"] = data_cols["Monitor1"][0]
data_cols["twotheta_angle"] = metadata["2-theta"] data_cols["twotheta_angle"] = metadata["2-theta"]
data_cols["chi_angle"] = metadata["chi"] data_cols["chi_angle"] = metadata["chi"]

2
pyzebra/param_study_moduls.py
View File

@ -418,7 +418,7 @@ def variables(dictionary):
"h_index", "h_index",
"l_index", "l_index",
"k_index", "k_index",
"number_of_measurements", "n_points",
"monitor", "monitor",
"Time", "Time",
"omega_angle", "omega_angle",