Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package/MDAnalysis/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,9 @@
9.72062
....

.. SeeAlso:: :class:`MDAnalysis.core.universe.Universe` for details
See Also
--------
:class:`MDAnalysis.core.universe.Universe` for details


Examples
Expand Down
26 changes: 14 additions & 12 deletions package/MDAnalysis/analysis/align.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
The :ref:`RMS-fitting-tutorial` shows how to do the individual steps
manually and explains the intermediate steps.

.. SeeAlso::

:mod:`MDAnalysis.analysis.rms`
contains functions to compute RMSD (when structural alignment is not
required)
:mod:`MDAnalysis.lib.qcprot`
implements the fast RMSD algorithm.
See Also
--------
:mod:`MDAnalysis.analysis.rms`
contains functions to compute RMSD (when structural alignment is not
required)
:mod:`MDAnalysis.lib.qcprot`
implements the fast RMSD algorithm.


.. _RMS-fitting-tutorial:
Expand Down Expand Up @@ -401,8 +401,9 @@ def alignto(mobile, reference, select="all", mass_weighted=None, weights=None,
new_rmsd : float
RMSD after spatial alignment

.. SeeAlso::
AlignTraj: More efficient method for RMSD-fitting trajectories.
See Also
--------
AlignTraj: More efficient method for RMSD-fitting trajectories.


.. _ClustalW: http://www.clustal.org/
Expand Down Expand Up @@ -985,9 +986,10 @@ def fasta2select(fastafilename, is_aligned=False,
``select=select_dict``.


.. SeeAlso::
:func:`sequence_alignment`, which does not require external
programs.
See Also
--------
:func:`sequence_alignment`, which does not require external
programs.


.. _ClustalW: http://www.clustal.org/
Expand Down
4 changes: 3 additions & 1 deletion package/MDAnalysis/analysis/distances.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@
:func:`dist` and :func:`between` can take atom groups that do not even
have to be from the same :class:`~MDAnalysis.core.universe.Universe`.

.. SeeAlso:: :mod:`MDAnalysis.lib.distances`
See Also
--------
:mod:`MDAnalysis.lib.distances`
"""

from __future__ import absolute_import
Expand Down
31 changes: 19 additions & 12 deletions package/MDAnalysis/analysis/hbonds/hbond_analysis.py
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,10 @@ class HydrogenBondAnalysis(object):
*GLYCAM06*
N,NT,O,O2,OH,OS,OW,OY,P,S,SM

.. SeeAlso:: Table :ref:`Default atom names for hydrogen bonding analysis`
See Also
--------
:ref:`Default atom names for hydrogen bonding analysis`


.. versionchanged:: 0.7.6
DEFAULT_DONORS/ACCEPTORS is now embedded in a dict to switch between
Expand Down Expand Up @@ -541,6 +544,7 @@ def __init__(self, universe, selection1='protein', selection2='all', selection1_
is raised for each static selection without the required
donors and/or acceptors.


.. versionchanged:: 0.7.6
New *verbose* keyword (and per-frame debug logging disabled by
default).
Expand Down Expand Up @@ -704,9 +708,11 @@ def _get_bonded_hydrogens(self, atom, **kwargs):
:class:`~MDAnalysis.core.groups.AtomGroup`) or empty list
``[]`` if none were found.

.. SeeAlso::
See Also
--------
:meth:`_get_bonded_hydrogens_dist`
:meth:`_get_bonded_hydrogens_list`

:meth:`_get_bonded_hydrogens_dist` and :meth:`_get_bonded_hydrogens_list`

.. versionchanged:: 0.7.6
Can switch algorithm by using the *detect_hydrogens* keyword to the
Expand Down Expand Up @@ -848,8 +854,10 @@ def run(self, **kwargs):
:class:`~MDAnalysis.lib.log.ProgressMeter`) and *debug* which can
be used to change the debug value provided to the class constructor.

.. SeeAlso:: :meth:`HydrogenBondAnalysis.generate_table` for processing
the data into a different format.
Note
----
Use :meth:`HydrogenBondAnalysis.generate_table` for processing the data into a different format.


.. versionchanged:: 0.7.6
Results are not returned, only stored in
Expand Down Expand Up @@ -1068,7 +1076,6 @@ def save_table(self, filename="hbond_table.pickle"):
import cPickle
table = cPickle.load(open(filename))

.. SeeAlso:: :mod:`cPickle` module and :class:`numpy.recarray`
"""
if self.table is None:
self.generate_table()
Expand Down Expand Up @@ -1270,12 +1277,12 @@ def _donor_lookup_table_byindex(self):

heavy_atom_name = h2donor[index]

.. Note::

*index* is the 0-based MDAnalysis index
(:attr:`MDAnalysis.core.groups.Atom.index`). The
tables generated by :class:`HydrogenBondAnalysis` contain
1-based indices and zero-based indices.
Note
----
*index* is the 0-based MDAnalysis index
(:attr:`MDAnalysis.core.groups.Atom.index`). The
tables generated by :class:`HydrogenBondAnalysis` contain
1-based indices and zero-based indices.

.. deprecated:: 0.15.0
The 1-based indices are deprecated in favor of the zero-based indices
Expand Down
72 changes: 23 additions & 49 deletions package/MDAnalysis/analysis/hole.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,12 @@
keyword argument and load an arbitrary order parameter for each
frame. In that case, the key becomes the orderparameter.

.. Note::
The profiles dict is not ordered and hence one typically needs to manually
order the keys first. Furthermore, duplicate keys are not possible:
In the case of *duplicate orderparameters*, the last one read will
be stored in the dict.
Notes
-----
The profiles dict is not ordered and hence one typically needs to manually
order the keys first. Furthermore, duplicate keys are not possible:
In the case of *duplicate orderparameters*, the last one read will
be stored in the dict.


Analysis
Expand Down Expand Up @@ -624,7 +625,6 @@ def __init__(self, filename, **kwargs):
are read. Note that if water molecules or ions are present in the
channel these can be ignored on read by the use of the
`ignore_residues` keyword.

**Wildcard pattern**. A new feature (in release 2.1 of HOLE) was
the option to include a wild card (``*``) in the filename. e.g.,
``filename="ab*.pdb"`` will apply hole to all files in the
Expand All @@ -639,18 +639,10 @@ def __init__(self, filename, **kwargs):
atoms or atom order etc. (though they should be sufficiently
similar for a HOLE run from identical starting conditions to be
useful).

.. SeeAlso::

An alternative way to load in multiple files is a direct read
from a CHARMM binary dynamics DCD coordinate file - using the
`dcd` keyword or use :class:`HOLEtraj`.

dcd : string, optional
File name of DCD trajectory (must be supplied together with a
matching PDB file `filename`) and then HOLE runs its analysis on
each frame.

It does multiple HOLE runs on positions taken from a CHARMM binary
dynamics format DCD trajectory file. The `dcd` file must have
exactly the same number of atoms in exactly the same order as the
Expand All @@ -663,21 +655,12 @@ def __init__(self, filename, **kwargs):
controlled by the `step` keyword and/or setting
:attr:`HOLE.dcd_iniskip` to the number of frames to be skipped
initially.

.. Note::

HOLE is very picky and does not read all DCD-like
formats [#HOLEDCD]_. If in doubt, look into the `logfile` for
error diagnostics.

logfile : string, optional
file name of the file collecting HOLE's output (which can be
parsed using :meth:`HOLE.collect`); the default is "hole.out".

sphpdb : string, optional
path to the HOLE sph file, a PDB-like file containig the
coordinates of the pore centers; the default is "hole.sph".

This keyword specifies the filename for output of the sphere centre
information in pdb form. Its typical suffix is ".sph". The
co-ordinates are set to the sphere centres and the occupancies are
Expand All @@ -689,20 +672,16 @@ def __init__(self, filename, **kwargs):
objects are best displayed as "Points". Displaying .sph objects
rather than rendered or dot surfaces can be useful to analyze the
distance of particular atoms from the sphere-centre line.

Most usefully .sph files can be used to produce molecular graphical
output from a hole run. This is achieved by using the
:program:`sph_process` program to read the .sph file.

step : int, optional
step size for going through the trajectory (skips `step` - 1
frames); the default is 1.

cpoint : array_like, optional
coordinates of a point inside the pore, e.g. ``[12.3, 0.7,
18.55]``. If set to ``None`` (the default) then HOLE's own search
algorithm is used.

`cpoint` specifies a point which lies within the channel. For
simple channels such as gramicidin results do not show great
sensitivity to the exact point taken. An easy way to produce an
Expand All @@ -712,7 +691,6 @@ def __init__(self, filename, **kwargs):
then take the coordinates of one of these (and use the
`ignore_residues` keyword to ignore them in the pore radius
calculation).

If this card is not specified then HOLE now (from version 2.2)
attempts to make a guess where the channel will be. The procedure
assumes the channel is reasonably symmetric. The initial guess on
Expand All @@ -721,88 +699,84 @@ def __init__(self, filename, **kwargs):
Å from the original position. This procedure works most of the
time but is clearly far from infallible — results should be
careful checked (with molecular graphics) if it is used.

cvect : array_like, optional
Search direction, should be parallel to the pore axis,
e.g. ``[0,0,1]`` for the z-axis. The default is ``None`` so that
HOLE's built-in procedure is used.

If this keyword is ``None`` then HOLE attempts to make a guess
where the channel will be. The procedure assumes the channel is
reasonably symmetric. The guess will be either along the X axis
(1,0,0), Y axis (0,1,0) or Z axis (0,0,1). If the structure is not
aligned on one of these axis the results will clearly be
approximate. If a guess is used then results should be carefully
checked.

sample : float, optional
distance of sample points in Å; the default is 0.2 Å.

Specifies the distance between the planes used in the HOLE
procedure. The default value should be reasonable for most
purposes. However, if you wish to visualize a very tight
constriction then specify a smaller value.

This value determines how many points in the pore profile are
calculated.

dotden : int, optional
density of facettes for generating a 3D pore representation;
default is 15.

This number controls the density of dots which will be used by
the program. A sphere of dots is placed on each centre
determined in the Monte Carlo procedure. Only dots which do not
lie within any other sphere are considered. The actual number of
dots written is therefore controlled by `dotden` and
`sample`. `dotden` should be set to between 5 (few dots per
sphere) and 35 (large number of dots per sphere).

endrad : float, optional
Radius which is considered to be the end of the pore. This
keyword can be used to specify the radius above which the
program regards a result as indicating that the end of the pore
has been reached. The default value is 22.0 Å. This may need to
be increased for large channels or reduced for small.

shorto : int, optional
Determines the output of output in the `logfile`; for automated processing
this must be < 3. The default is 0, which shows all output.

- 0: Full text output
- 1: All text output given except "run in progress" (i.e.,
detailed contemporary description of what HOLE is doing).
- 2: Ditto plus no graph type output - only leaving minimum
radius and conductance calculations.
- 3: All text output other than input card mirroring and error messages
turned off.

0: Full text output,
1: All text output given except "run in progress" (i.e.,
detailed contemporary description of what HOLE is doing).
2: Ditto plus no graph type output - only leaving minimum
radius and conductance calculations.
3: All text output other than input card mirroring and error messages
turned off.
ignore_residues : array_like, optional
sequence of three-letter residues that are not taken into
account during the calculation; wildcards are *not*
supported. The default is ``["SOL","WAT", "TIP", "HOH", "K ",
"NA ", "CL "]``.

radius : string, optional
path to the file specifying van der Waals radii for each atom. If
set to ``None`` (the default) then a set of default radii,
:data:`SIMPLE2_RAD`, is used (an extension of ``simple.rad`` from
the HOLE distribution)

executable : string, optional
Path to the :program:`hole` executable
(e.g. ``~/hole2/exe/hole``); the other programs
:program:`sph_process` and :program:`sos_triangle` are assumed
to live in the same directory as :program:`hole`. If
:program:`hole` is found on the :envvar:`PATH` then the bare
executable name is sufficient. The default is "hole".

raseed : int, optional
integer number to start the random number generator; by default,
:program:`hole` will use the time of the day (default value
``None``) but for reproducible runs (e.g., for testing) set it to
an integer.


Notes
-----
- An alternative way to load in multiple files is a direct read
from a CHARMM binary dynamics DCD coordinate file - using the
`dcd` keyword or use :class:`HOLEtraj`.
- HOLE is very picky and does not read all DCD-like
formats [#HOLEDCD]_. If in doubt, look into the `logfile` for
error diagnostics.

"""

# list of temporary files, to be cleaned up on __del__
Expand Down
5 changes: 4 additions & 1 deletion package/MDAnalysis/analysis/leaflet.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,10 @@ def groups(self, component_index=None):

If no argument is supplied, then a list of all leaflet groups is returned.

.. SeeAlso:: :meth:`LeafletFinder.group` and :meth:`LeafletFinder.groups_iter`
See Also
--------
:meth:`LeafletFinder.group`
:meth:`LeafletFinder.groups_iter`
"""
if component_index is None:
return list(self.groups_iter())
Expand Down
8 changes: 6 additions & 2 deletions package/MDAnalysis/analysis/legacy/x3dna.py
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,9 @@ def __init__(self, filename, **kwargs):
Write output from X3DNA to `logfile` (default: "bp_step.par")


.. SeeAlso:: :class:`X3DNAtraj`
See Also
--------
:class:`X3DNAtraj`
"""
# list of temporary files, to be cleaned up on __del__
self.tempfiles = [
Expand Down Expand Up @@ -755,7 +757,9 @@ def __init__(self, universe, **kwargs):
for description).


.. SeeAlso:: :class:`X3DNA`
See Also
--------
:class:`X3DNA`

"""
self.universe = universe
Expand Down
Loading