sf-mx/crystfel_tools
0
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed state bug - added try block

Browse Source
This commit is contained in:
Beale John Henry
2025-01-26 21:32:08 +01:00
parent 6f9605d801
commit 3fbfa5c31f
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
reduction_tools/partialator.py
View File

@@ -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()