Skip to content

Commit dec53f5

Browse files
committed
Use micrometers for particle sizes
Signed-off-by: Patrick Avery <[email protected]>
1 parent 2631aed commit dec53f5

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

hexrdgui/calibration/wppf_options_dialog.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1368,14 +1368,18 @@ def recursively_format_mat(mat, this_config, this_template):
13681368
min_max_inverted = False
13691369
prefix = sanitized_mat
13701370
if v == f'{prefix}_X':
1371-
wlen = HexrdConfig().beam_wavelength
1371+
# Provide wavelength in micrometers
1372+
wlen = HexrdConfig().beam_wavelength / 1e4
1373+
units = ' µm'
13721374
conversion_funcs = mat_lx_to_p_funcs_factory(wlen)
13731375
min_max_inverted = True
13741376
elif v == f'{prefix}_Y':
13751377
units = '%'
13761378
conversion_funcs = mat_ly_to_s_funcs
13771379
elif v == f'{prefix}_P':
1378-
wlen = HexrdConfig().beam_wavelength
1380+
# Provide wavelength in micrometers
1381+
wlen = HexrdConfig().beam_wavelength / 1e4
1382+
units = ' µm'
13791383
conversion_funcs = mat_gp_to_p_funcs_factory(wlen)
13801384
min_max_inverted = True
13811385
elif v in [f'{prefix}_{k}' for k in ('a', 'b', 'c')]:
@@ -2503,6 +2507,7 @@ def to_display_stderr(lx: float, lx_stderr: float) -> float:
25032507

25042508
def mat_gp_to_p_funcs_factory(wlen: float) -> dict:
25052509
k = 0.91
2510+
25062511
def to_display(gp: float) -> float:
25072512
if abs(gp) <= 1e-8:
25082513
return np.inf

0 commit comments

Comments
 (0)