From b377d366d244f8cc68c208db6aaaba43ea0a85fb Mon Sep 17 00:00:00 2001 From: Keitaro Yamashita Date: Thu, 30 Nov 2023 19:52:58 +0900 Subject: [PATCH] refmacat: don't prepare crd if unrestrained refinement requested --- servalcat/__init__.py | 4 ++-- servalcat/refmac/refmac_keywords.py | 4 ++-- servalcat/refmac/refmac_wrapper.py | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/servalcat/__init__.py b/servalcat/__init__.py index 442d716..6cf4fc6 100644 --- a/servalcat/__init__.py +++ b/servalcat/__init__.py @@ -6,5 +6,5 @@ Mozilla Public License, version 2.0; see LICENSE. """ -__version__ = '0.4.40' -__date__ = '2023-11-18' +__version__ = '0.4.41' +__date__ = '2023-11-30' diff --git a/servalcat/refmac/refmac_keywords.py b/servalcat/refmac/refmac_keywords.py index dffc065..ddf99b7 100644 --- a/servalcat/refmac/refmac_keywords.py +++ b/servalcat/refmac/refmac_keywords.py @@ -452,7 +452,7 @@ def parse_line(l, ret): while itk < ntok: if s[itk].startswith("type"): if itk+1 < ntok and s[itk+1].startswith("unre"): - ret["refi"] = {"type": "unre"} + ret["refi"]["type"] = "unre" itk += 2 else: itk += 1 @@ -507,7 +507,7 @@ def get_lines(lines): # get_lines() def parse_keywords(inputs): - ret = {"make":{}, "ridge":{}} + ret = {"make":{}, "ridge":{}, "refi":{}} for l in get_lines(inputs): if l.split()[0].lower().startswith("end"): break diff --git a/servalcat/refmac/refmac_wrapper.py b/servalcat/refmac/refmac_wrapper.py index f4e3100..16e3a7b 100644 --- a/servalcat/refmac/refmac_wrapper.py +++ b/servalcat/refmac/refmac_wrapper.py @@ -46,7 +46,7 @@ def parse_args(arg_list): def read_stdin(stdin): print("Waiting for input..") # these make keywords will be ignored (just passed to refmac): ribo,valu,spec,form,sdmi,segi - ret = {"make":{}, "ridge":{}} + ret = {"make":{}, "ridge":{}, "refi":{}} inputs = [] for l in refmac_keywords.get_lines(stdin): if l.split()[0].lower().startswith("end"): @@ -235,7 +235,7 @@ def main(args): crdout = None refmac_fixes = None cispeps = [] - if xyzin is not None: + if xyzin is not None and keywords["refi"].get("type") != "unre": #tmpfd, crdout = tempfile.mkstemp(prefix="gemmi_", suffix=".crd") # TODO use dir=CCP4_SCR #os.close(tmpfd) st = utils.fileio.read_structure(xyzin)