Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Expansion of dihedrals analysis module #2033

Merged
merged 21 commits into from
Aug 13, 2018
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions package/CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ Enhancements

* Added a wrapper of lib.nsgrid in lib.distances.self_capped_distance
and lib.distances.capped_distanceto automatically chose the fastest
method for distance based calculations. (PR #2008)
method for distance based calculations. (PR #2008)
* Added Grid search functionality in lib.nsgrid for faster distance based
calculations. (PR #2008)
calculations. (PR #2008)
* Modified around selections to work with KDTree and periodic boundary
conditions. Should reduce memory usage (#974 PR #2022)
* Modified topology.guessers.guess_bonds to automatically select the
Expand Down Expand Up @@ -64,7 +64,9 @@ Enhancements
generated with gromacs -noappend (PR #1728)
* MDAnalysis.lib.mdamath now supports triclinic boxes and rewrote in Cython (PR #1965)
* AtomGroup.write can write a trajectory of selected frames (Issue #1037)
* Added analysis.dihedrals with Ramachandran class to analysis module (PR #1997)
* Added dihedrals.py with Dihedral, Ramachandran, and Janin classes to
analysis module (PR #1997, PR #2033)
* Added the analysis.data module for reference data used in analysis (PR #2033)

Fixes
* rewind in the SingleFrameReader now reads the frame from the file (Issue #1929)
Expand Down
Empty file.
59 changes: 59 additions & 0 deletions package/MDAnalysis/analysis/data/filenames.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
# -*- Mode: python; tab-width: 4; indent-tabs-mode:nil; coding:utf-8 -*-
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The data directory also needs an empty file __init__.py to mark it as an importable module. Just add it with

touch analysis/data/__init__.py
git add analysis/data/__init__.py

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The absence of the file is the reason for the test failures.

# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 fileencoding=utf-8
#
# MDAnalysis --- https://www.mdanalysis.org
# Copyright (c) 2006-2017 The MDAnalysis Development Team and contributors
# (see the file AUTHORS for the full list of names)
#
# Released under the GNU Public Licence, v2 or any higher version
#
# Please cite your use of MDAnalysis in published work:
#
# R. J. Gowers, M. Linke, J. Barnoud, T. J. E. Reddy, M. N. Melo, S. L. Seyler,
# D. L. Dotson, J. Domanski, S. Buchoux, I. M. Kenney, and O. Beckstein.
# MDAnalysis: A Python package for the rapid analysis of molecular dynamics
# simulations. In S. Benthall and S. Rostrup editors, Proceedings of the 15th
# Python in Science Conference, pages 102-109, Austin, TX, 2016. SciPy.
#
# N. Michaud-Agrawal, E. J. Denning, T. B. Woolf, and O. Beckstein.
# MDAnalysis: A Toolkit for the Analysis of Molecular Dynamics Simulations.
# J. Comput. Chem. 32 (2011), 2319--2327, doi:10.1002/jcc.21787
#
"""
Analysis data files
===================

:mod:`MDAnalysis.analysis.data` contains data files that are used as part of
analysis. These can be experimental or theoretical data. Files are stored
inside the package and made accessible via variables in
:mod:`MDAnalysis.analysis.data.filenames`. These variables are documented
below, including references to the literature and where they are used
inside :mod:`MDAnalysis.analysis`.

Data files
----------

.. data:: Rama_ref

Reference Ramachandran histogram for :class:`MDAnalysis.analysis.dihedrals.Ramachandran`.
The data were calculated on a data set of 500 PDB structures taken from [Lovell2003]_.

.. data:: Janin_ref

Reference Ramachandran histogram for :class:`MDAnalysis.analysis.dihedrals.Ramachandran`.
The data were calculated on a data set of 500 PDB structures taken from [Lovell2003]_.

"""
from __future__ import absolute_import

__all__ = [
"Rama_ref", "Janin_ref" # reference plots for Ramachandran and Janin classes
]

from pkg_resources import resource_filename

Rama_ref = resource_filename(__name__, 'rama_ref_data.npy')
Janin_ref = resource_filename(__name__, 'janin_ref_data.npy')

# This should be the last line: clean up namespace
del resource_filename
Binary file not shown.
Binary file not shown.