r8169 - in /branches/ave_noe: generic_fns/noesy.py prompt/noe.py -- December 09, 2008 - 10:47

Author: bugman
Date: Tue Dec  9 10:47:29 2008
New Revision: 8169

URL: http://svn.gna.org/viewcvs/relax?rev=8169&view=rev
Log:
Renamed 'constraints' to 'restraints' for the NOEs.


Modified:
    branches/ave_noe/generic_fns/noesy.py
    branches/ave_noe/prompt/noe.py

Modified: branches/ave_noe/generic_fns/noesy.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/ave_noe/generic_fns/noesy.py?rev=8169&r1=8168&r2=8169&view=diff
==============================================================================
--- branches/ave_noe/generic_fns/noesy.py (original)
+++ branches/ave_noe/generic_fns/noesy.py Tue Dec  9 10:47:29 2008
@@ -24,7 +24,7 @@
 """Module for NOESY related operations."""
 
 
-def read_constraints(file=None, dir=None, proton1_col=None, 
proton2_col=None, lower_col=None, upper_col=None, sep=None):
+def read_restraints(file=None, dir=None, proton1_col=None, proton2_col=None, 
lower_col=None, upper_col=None, sep=None):
     """Load NOESY or ROESY constraint information from file.
 
     If the input file is a pre-formatted Xplor file, the column number and 
separator arguments will

Modified: branches/ave_noe/prompt/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/ave_noe/prompt/noe.py?rev=8169&r1=8168&r2=8169&view=diff
==============================================================================
--- branches/ave_noe/prompt/noe.py (original)
+++ branches/ave_noe/prompt/noe.py Tue Dec  9 10:47:29 2008
@@ -47,8 +47,8 @@
         self.__relax__ = relax
 
 
-    def read_constraints(self, file=None, dir=None, proton1_col=None, 
proton2_col=None, lower_col=None, upper_col=None, sep=None):
-        """Read NOESY or ROESY constraints from a file.
+    def read_restraints(self, file=None, dir=None, proton1_col=None, 
proton2_col=None, lower_col=None, upper_col=None, sep=None):
+        """Read NOESY or ROESY restraints from a file.
 
         Keyword Arguments
         ~~~~~~~~~~~~~~~~~
@@ -72,7 +72,7 @@
         ~~~~~~~~~~~
 
         This function can automatically determine the format of the file, 
for example Xplor
-        formatted constraint files.  A generically formatted file is also 
supported if it contains
+        formatted restraint files.  A generically formatted file is also 
supported if it contains
         minimally four columns with the two proton names and the upper and 
lower bounds, as
         specified by the *_col arguments.
 
@@ -80,20 +80,20 @@
         Examples
         ~~~~~~~~
 
-        To read the Xplor formatted constraint file 'NOE.xpl', type one of:
+        To read the Xplor formatted restraint file 'NOE.xpl', type one of:
 
-        relax> noe.read_constraints('NOE.xpl')
-        relax> noe.read_constraints(file='NOE.xpl')
+        relax> noe.read_restraints('NOE.xpl')
+        relax> noe.read_restraints(file='NOE.xpl')
 
 
         To read the generic formatted file 'noes', type one of:
 
-        relax> noe.read_constraints(file='NOE.xpl', proton1_col=0, 
proton2_col=1, lower_col=2, upper_col=3)
+        relax> noe.read_restraints(file='NOE.xpl', proton1_col=0, 
proton2_col=1, lower_col=2, upper_col=3)
         """
 
         # Function intro text.
         if self.__relax__.interpreter.intro:
-            text = sys.ps3 + "noe.read_constraints("
+            text = sys.ps3 + "noe.read_restraints("
             text = text + "file=" + `file`
             text = text + ", dir=" + `dir`
             text = text + ", proton1_col=" + `proton1_col`
@@ -132,7 +132,7 @@
             raise RelaxNoneStrError, ('column separator', sep)
 
         # Execute the functional code.
-        noesy.read_constraints(frq=frq, file=file, dir=dir, 
proton1_col=proton1_col, proton2_col=proton2_col, lower_col=lower_col, 
upper_col=upper_col, sep=sep)
+        noesy.read_restraints(frq=frq, file=file, dir=dir, 
proton1_col=proton1_col, proton2_col=proton2_col, lower_col=lower_col, 
upper_col=upper_col, sep=sep)
 
 
     def spectrum_type(self, spectrum_type=None, spectrum_id=None):