From 6469f500957b19e40eab613bb3db76207249832c Mon Sep 17 00:00:00 2001 From: Anna Bergamaschi Date: Sun, 30 Jun 2024 21:18:30 +0200 Subject: [PATCH] refactor reflection printout --- .../high_level_interface/hkl_hli.py | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/addams_bec/bec_ipython_client/high_level_interface/hkl_hli.py b/addams_bec/bec_ipython_client/high_level_interface/hkl_hli.py index 34e09eb..aab4285 100644 --- a/addams_bec/bec_ipython_client/high_level_interface/hkl_hli.py +++ b/addams_bec/bec_ipython_client/high_level_interface/hkl_hli.py @@ -242,16 +242,7 @@ def orientShow(): reflections = diffract.get_reflections() if reflections: - print('The defined reflections are:') - header = ['h', 'k', 'l'] + diffract.real_position['fields'][:-1] - table = PrettyTable(header, padding=12) - print(' ', table.get_header()) - - for reflection in reflections: - h, k, l, angles = reflection - text = [f'{h:9.4f}', f'{k:9.4f}', f'{l:9.4f}'] + [f'{x:9.4f}' for x in angles] - print(' ', table.get_row(*text)) - + _showReflections(reflections) print("\n------------------------------------------------\n") _showUB() @@ -380,3 +371,14 @@ def _currentPosition(): # which gets serialized to a dictionary by the device server. angles = RealPosition(*(response['values'][axis] for axis in response['fields'])) return angles + +def _showReflections(reflections): + print('The defined reflections are:') + header = ['h', 'k', 'l'] + diffract.real_position['fields'][:-1] + table = PrettyTable(header, padding=12) + print(' ', table.get_header()) + + for reflection in reflections: + h, k, l, angles = reflection + text = [f'{h:9.4f}', f'{k:9.4f}', f'{l:9.4f}'] + [f'{x:9.4f}' for x in angles] + print(' ', table.get_row(*text))