Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
schwede
openstructure
Commits
4124e051
Commit
4124e051
authored
7 years ago
by
Rafal Gumienny
Browse files
Options
Downloads
Patches
Plain Diff
fix: SCHWED-3121 Use fault_tolerant and c_alph_only options
parent
cb0ad0d6
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
actions/ost-compare-structures
+44
-21
44 additions, 21 deletions
actions/ost-compare-structures
with
44 additions
and
21 deletions
actions/ost-compare-structures
+
44
−
21
View file @
4124e051
...
@@ -198,8 +198,22 @@ def _ParseArgs():
...
@@ -198,8 +198,22 @@ def _ParseArgs():
default=".compare.structures.pdb",
default=".compare.structures.pdb",
help=("Use this suffix to dump structures.\n"
help=("Use this suffix to dump structures.\n"
"Defaults to .compare.structures.pdb."))
"Defaults to .compare.structures.pdb."))
parser.add_argument(
"-ca",
"--c-alpha-only",
dest="c_alpha_only",
default=False,
action="store_true",
help=("Use C-alpha atoms only."))
parser.add_argument(
"-ft",
"--fault-tolerant",
dest="fault_tolerant",
default=False,
action="store_true",
help=("Fault tolerant parsing."))
#
#
# QS-score options
# QS-score
r
options
#
#
parser.add_argument(
parser.add_argument(
"-qs",
"-qs",
...
@@ -242,13 +256,6 @@ def _ParseArgs():
...
@@ -242,13 +256,6 @@ def _ParseArgs():
dest="selection",
dest="selection",
default="",
default="",
help=("Selection performed on reference."))
help=("Selection performed on reference."))
parser.add_argument(
"-ca",
"--c-alpha-only",
dest="c_alpha_only",
default=False,
action="store_true",
help=("Use C-alpha atoms only."))
parser.add_argument(
parser.add_argument(
"-sc",
"-sc",
"--structural-checks",
"--structural-checks",
...
@@ -256,13 +263,6 @@ def _ParseArgs():
...
@@ -256,13 +263,6 @@ def _ParseArgs():
default=False,
default=False,
action="store_true",
action="store_true",
help=("Perform structural checks and filter input data."))
help=("Perform structural checks and filter input data."))
parser.add_argument(
"-ft",
"--fault-tolerant",
dest="fault_tolerant",
default=False,
action="store_true",
help=("Fault tolerant parsing."))
parser.add_argument(
parser.add_argument(
"-p",
"-p",
"--parameter-file",
"--parameter-file",
...
@@ -469,7 +469,7 @@ def _GetAlignmentsAsFasta(alignments):
...
@@ -469,7 +469,7 @@ def _GetAlignmentsAsFasta(alignments):
return strings
return strings
def _ReadStructureFile(path):
def _ReadStructureFile(path
, c_alpha_only=False, fault_tolerant=False
):
"""Safely read structure file into OST entity.
"""Safely read structure file into OST entity.
The functin can read both PDB and mmCIF files.
The functin can read both PDB and mmCIF files.
...
@@ -479,18 +479,25 @@ def _ReadStructureFile(path):
...
@@ -479,18 +479,25 @@ def _ReadStructureFile(path):
:returns: Entity
:returns: Entity
:rtype: :class:`~ost.mol.EntityHandle`
:rtype: :class:`~ost.mol.EntityHandle`
"""
"""
calpha_messag = "Selecting only C-alpha atoms"
entities = list()
entities = list()
if not os.path.isfile(path):
if not os.path.isfile(path):
raise IOError("%s is not a file" % path)
raise IOError("%s is not a file" % path)
try:
try:
entity = LoadPDB(path)
entity = LoadPDB(path
, fault_tolerant=fault_tolerant
)
if not entity.IsValid():
if not entity.IsValid():
raise IOError("Provided file does not contain valid entity.")
raise IOError("Provided file does not contain valid entity.")
entity.SetName(os.path.basename(path))
entity.SetName(os.path.basename(path))
if c_alpha_only:
ost.LogInfo(calpha_messag)
entity = entity.Select("aname=CA")
entities.append(entity)
entities.append(entity)
except Exception:
except Exception:
try:
try:
tmp_entity, cif_info = LoadMMCIF(path, info=True)
tmp_entity, cif_info = LoadMMCIF(
path,
info=True,
fault_tolerant=fault_tolerant)
if len(cif_info.biounits) == 0:
if len(cif_info.biounits) == 0:
tbu = MMCifInfoBioUnit()
tbu = MMCifInfoBioUnit()
tbu.id = 'ASU of ' + entity.pdb_id
tbu.id = 'ASU of ' + entity.pdb_id
...
@@ -504,6 +511,9 @@ def _ReadStructureFile(path):
...
@@ -504,6 +511,9 @@ def _ReadStructureFile(path):
entity = tbu.PDBize(tmp_entity, min_polymer_size=0)
entity = tbu.PDBize(tmp_entity, min_polymer_size=0)
entity.SetName(os.path.basename(path) + ".au")
entity.SetName(os.path.basename(path) + ".au")
_RevertChainNames(entity)
_RevertChainNames(entity)
if c_alpha_only:
ost.LogInfo(calpha_messag)
entity = entity.Select("aname=CA")
entities.append(entity)
entities.append(entity)
elif len(cif_info.biounits) > 1:
elif len(cif_info.biounits) > 1:
for i, biounit in enumerate(cif_info.biounits, 1):
for i, biounit in enumerate(cif_info.biounits, 1):
...
@@ -513,6 +523,9 @@ def _ReadStructureFile(path):
...
@@ -513,6 +523,9 @@ def _ReadStructureFile(path):
"Provided file does not contain valid entity.")
"Provided file does not contain valid entity.")
entity.SetName(os.path.basename(path) + "." + str(i))
entity.SetName(os.path.basename(path) + "." + str(i))
_RevertChainNames(entity)
_RevertChainNames(entity)
if c_alpha_only:
ost.LogInfo(calpha_messag)
entity = entity.Select("aname=CA")
entities.append(entity)
entities.append(entity)
else:
else:
biounit = cif_info.biounits[0]
biounit = cif_info.biounits[0]
...
@@ -522,6 +535,9 @@ def _ReadStructureFile(path):
...
@@ -522,6 +535,9 @@ def _ReadStructureFile(path):
"Provided file does not contain valid entity.")
"Provided file does not contain valid entity.")
entity.SetName(os.path.basename(path))
entity.SetName(os.path.basename(path))
_RevertChainNames(entity)
_RevertChainNames(entity)
if c_alpha_only:
ost.LogInfo(calpha_messag)
entity = entity.Select("aname=CA")
entities.append(entity)
entities.append(entity)
except Exception as exc:
except Exception as exc:
...
@@ -553,11 +569,18 @@ def _Main():
...
@@ -553,11 +569,18 @@ def _Main():
#
#
# Read the input files
# Read the input files
ost.LogInfo("#" * 80)
ost.LogInfo("#" * 80)
ost.LogInfo("Reading input files")
ost.LogInfo("Reading input files (fault_tolerant=%s)" %
str(opts.fault_tolerant))
ost.LogInfo(" --> reading model from %s" % opts.model)
ost.LogInfo(" --> reading model from %s" % opts.model)
models = _ReadStructureFile(opts.model)
models = _ReadStructureFile(
opts.model,
c_alpha_only=opts.c_alpha_only,
fault_tolerant=opts.fault_tolerant)
ost.LogInfo(" --> reading reference from %s" % opts.reference)
ost.LogInfo(" --> reading reference from %s" % opts.reference)
references = _ReadStructureFile(opts.reference)
references = _ReadStructureFile(
opts.reference,
c_alpha_only=opts.c_alpha_only,
fault_tolerant=opts.fault_tolerant)
if opts.molck:
if opts.molck:
ost.LogInfo("#" * 80)
ost.LogInfo("#" * 80)
ost.LogInfo("Cleaning up input with Molck")
ost.LogInfo("Cleaning up input with Molck")
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment