From 3fbfa5c31f32806e8235171232d7f0b70600e20b Mon Sep 17 00:00:00 2001 From: Beale John Henry Date: Sun, 26 Jan 2025 21:32:08 +0100 Subject: [PATCH] fixed state bug - added try block --- reduction_tools/partialator.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/reduction_tools/partialator.py b/reduction_tools/partialator.py index 0bc3f92..c41486b 100644 --- a/reduction_tools/partialator.py +++ b/reduction_tools/partialator.py @@ -231,7 +231,10 @@ def get_overall_cc(): # regex example = Overall CC = 0.5970865 overcc_pattern = r"Overall\sCC\s=\s(\d\.\d+)" - overcc = re.search( overcc_pattern, cc_log ).group(1) + try: + overcc = re.search( overcc_pattern, cc_log ).group(1) + except AttributeError as e: + overcc = np.nan return overcc @@ -243,7 +246,10 @@ def get_overall_rsplit(): # regex example = Overall Rsplit = 54.58 % overrsplit_pattern = r"Overall\sRsplit\s=\s(\d+\.\d+)" - overrsplit = re.search( overrsplit_pattern, rsplit_log ).group(1) + try: + overrsplit = re.search( overrsplit_pattern, rsplit_log ).group(1) + except AttributeError as e: + overrsplit = np.nan return overrsplit @@ -255,7 +261,10 @@ def get_b(): # regex example = B = 41.63 A^2 b_factor_pattern = r"B\s=\s(\d+\.\d+)\sA" - b_factor = re.search( b_factor_pattern, wilson_log ).group(1) + try: + b_factor = re.search( b_factor_pattern, wilson_log ).group(1) + except AttributeError as e: + b_factor = np.nan return b_factor @@ -375,6 +384,7 @@ def main( cwd, name, stream, pointgroup, model, iterations, cell, shells, part_h logger.info( "resolution at CC* at 0.7 = {0}".format( ccstar_cut ) ) # scrub other metrics + overcc = get_overall_cc() overrsplit = get_overall_rsplit() b_factor = get_b()