Skip to content

Commit

Permalink
Merge pull request #1179 from jamesmkrieger/prody-master
Browse files Browse the repository at this point in the history
Final changes before making release v1.11
  • Loading branch information
jamesmkrieger authored Sep 30, 2020
2 parents c74532c + 073ca2f commit 597779d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions prody/database/dali.py
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ def __init__(self, url, pdbId, chain, subset='fullPDB', localFile=False, **kwarg
self._title = pdbId + '-' + chain
self._alignPDB = None
self._filterDict = None
self._max_index = None
self.isSuccess = self.fetch(self._url, localFile=localFile, timeout=timeout, **kwargs)

def fetch(self, url=None, localFile=False, **kwargs):
Expand Down Expand Up @@ -377,6 +378,10 @@ def filter(self, cutoff_len=None, cutoff_rmsd=None, cutoff_Z=None, cutoff_identi
(3) Z score < cutoff_Z (must be a positive number);
(4) Identity > cutoff_identity (must be an integer or a float between 0 and 1).
"""
if self._max_index is None:
LOGGER.warn('DaliRecord has no data. Please use the fetch() method.')
return None

if cutoff_len == None:
# cutoff_len = int(0.8*self._max_index)
cutoff_len = 0
Expand Down
6 changes: 3 additions & 3 deletions prody/dynamics/plotting.py
Original file line number Diff line number Diff line change
Expand Up @@ -1148,9 +1148,9 @@ def showPerturbResponse(model, atoms=None, show_matrix=True, select=None, **kwar
*model* and *atoms* must have the same number of atoms. *atoms* must
be an :class:`.Atomic` instance.
:arg model: any object with a calcCovariance method
e.g. :class:`.ANM` instance
:type model: :class:`.NMA`
:arg model: any object with a calcCovariance method from which to calculate
a PRS matrix (e.g. :class:`.ANM` instance) or a PRS matrix itself
:type model: :class:`.NMA`, :class:`~numpy.ndarray`
:arg atoms: a :class: `AtomGroup` instance for matching residue numbers and chain
identifiers
Expand Down

0 comments on commit 597779d

Please sign in to comment.