Author: bugman
Date: Sat Feb 19 14:36:23 2011
New Revision: 12578
URL: http://svn.gna.org/viewcvs/relax?rev=12578&view=rev
Log:
Merged revisions 7043-7044,7046 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/bmrb
........
r7043 | bugman | 2008-07-31 11:29:45 +0200 (Thu, 31 Jul 2008) | 8 lines
Initial support for the bmrb user functions.
The following BNMRB related user functions now exist (the back end does not
yet exist):
bmrb.display()
bmrb.read()
bmrb.write()
........
r7044 | bugman | 2008-07-31 11:36:29 +0200 (Thu, 31 Jul 2008) | 3 lines
Activated the bmrb user functions.
........
r7046 | bugman | 2008-07-31 11:52:39 +0200 (Thu, 31 Jul 2008) | 6 lines
Added some basic BMRB file format displaying/reading/writing functions.
The STAR format parser and model-free specific code needs to be implemented
before this code will
work.
........
Added:
1.3/generic_fns/bmrb.py
- copied unchanged from r7046, branches/bmrb/generic_fns/bmrb.py
1.3/prompt/bmrb.py
- copied unchanged from r7046, branches/bmrb/prompt/bmrb.py
Modified:
1.3/ (props changed)
1.3/generic_fns/__init__.py
1.3/prompt/__init__.py
1.3/prompt/interpreter.py
Propchange: 1.3/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Feb 19 14:36:23 2011
@@ -1,1 +1,1 @@
-/branches/bmrb:1-7041
+/branches/bmrb:1-7041,7043-7046
Modified: 1.3/generic_fns/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/__init__.py?rev=12578&r1=12577&r2=12578&view=diff
==============================================================================
--- 1.3/generic_fns/__init__.py (original)
+++ 1.3/generic_fns/__init__.py Sat Feb 19 14:36:23 2011
@@ -23,6 +23,7 @@
__all__ = [ 'align_tensor',
'angles',
+ 'bmrb',
'dasha',
'diffusion_tensor',
'eliminate',
Modified: 1.3/prompt/__init__.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/prompt/__init__.py?rev=12578&r1=12577&r2=12578&view=diff
==============================================================================
--- 1.3/prompt/__init__.py (original)
+++ 1.3/prompt/__init__.py Sat Feb 19 14:36:23 2011
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2003-2005, 2009-2011 Edward d'Auvergne
#
+# Copyright (C) 2003-2011 Edward d'Auvergne
#
#
#
# This file is part of the program relax.
#
#
#
@@ -24,6 +24,7 @@
__all__ = ['align_tensor',
'angles',
'base_class',
+ 'bmrb',
'command',
'consistency_tests',
'dasha',
Modified: 1.3/prompt/interpreter.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/prompt/interpreter.py?rev=12578&r1=12577&r2=12578&view=diff
==============================================================================
--- 1.3/prompt/interpreter.py (original)
+++ 1.3/prompt/interpreter.py Sat Feb 19 14:36:23 2011
@@ -63,7 +63,8 @@
from temperature import Temp
# User classes.
-from align_tensor import Align_tensor
+from bmrb import Align_tensor
+from bmrb import BMRB
from consistency_tests import Consistency_tests
from dasha import Dasha
from diffusion_tensor import Diffusion_tensor
@@ -186,6 +187,7 @@
# Place the user classes in the local namespace.
objects['align_tensor'] = Align_tensor(self._exec_info)
+ objects['bmrb'] = BMRB(self._exec_info)
objects['consistency_tests'] = Consistency_tests(self._exec_info)
objects['dasha'] = Dasha(self._exec_info)
objects['deselect'] = Deselect(self._exec_info)
r12578 - in /1.3: ./ generic_fns/__init__.py generic_fns/bmrb.py prompt/__init__.py prompt/bmrb.py prompt/interpreter.py