"...src/git@developer.sourcefind.cn:OpenDAS/dynamo.git" did not exist on "99cd9d85a943de0eba06fba89c0e7b5311ea45bb"
Commit d8c2a979 authored by Christina Floristean's avatar Christina Floristean
Browse files

Fix naming error in alignment runner, add error message for missing uniprot files.

parent 7e2b36e0
...@@ -448,7 +448,7 @@ class AlignmentRunner: ...@@ -448,7 +448,7 @@ class AlignmentRunner:
n_cpu=no_cpus, n_cpu=no_cpus,
) )
self._uniprot_msa_runner = None self.jackhmmer_uniprot_runner = None
if(uniprot_database_path is not None): if(uniprot_database_path is not None):
self.jackhmmer_uniprot_runner = jackhmmer.Jackhmmer( self.jackhmmer_uniprot_runner = jackhmmer.Jackhmmer(
binary_path=jackhmmer_binary_path, binary_path=jackhmmer_binary_path,
...@@ -1180,15 +1180,20 @@ class DataPipelineMultimer: ...@@ -1180,15 +1180,20 @@ class DataPipelineMultimer:
# sequences. # sequences.
if not is_homomer_or_monomer: if not is_homomer_or_monomer:
all_seq_msa_features = self._all_seq_msa_features( all_seq_msa_features = self._all_seq_msa_features(
chain_fasta_path,
chain_alignment_dir chain_alignment_dir
) )
chain_features.update(all_seq_msa_features) chain_features.update(all_seq_msa_features)
return chain_features return chain_features
def _all_seq_msa_features(self, fasta_path, alignment_dir): @staticmethod
def _all_seq_msa_features(alignment_dir):
"""Get MSA features for unclustered uniprot, for pairing.""" """Get MSA features for unclustered uniprot, for pairing."""
uniprot_msa_path = os.path.join(alignment_dir, "uniprot_hits.sto") uniprot_msa_path = os.path.join(alignment_dir, "uniprot_hits.sto")
if not os.path.exists(uniprot_msa_path):
chain_id = os.path.basename(os.path.normpath(alignment_dir))
raise ValueError(f"Missing 'uniprot_hits.sto' for {chain_id}. "
f"This is required for Multimer MSA pairing.")
with open(uniprot_msa_path, "r") as fp: with open(uniprot_msa_path, "r") as fp:
uniprot_msa_string = fp.read() uniprot_msa_string = fp.read()
msa = parsers.parse_stockholm(uniprot_msa_string) msa = parsers.parse_stockholm(uniprot_msa_string)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment