r22695 - in /trunk/specific_analyses: frame_order/parameter_object.py n_state_model/parameter_object.py parameter_object.py -- April 10, 2014 - 18:34

Author: bugman
Date: Thu Apr 10 18:34:54 2014
New Revision: 22695

URL: http://svn.gna.org/viewcvs/relax?rev=22695&view=rev
Log:
Added the PCS and RDC as parameters for the frame order and N-state model 
analyses.

These are now defined in the respective parameter list objects.  The base 
method add_align_data()
has been created to avoid code duplication.


Modified:
    trunk/specific_analyses/frame_order/parameter_object.py
    trunk/specific_analyses/n_state_model/parameter_object.py
    trunk/specific_analyses/parameter_object.py

Modified: trunk/specific_analyses/frame_order/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/parameter_object.py?rev=22695&r1=22694&r2=22695&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/parameter_object.py     (original)
+++ trunk/specific_analyses/frame_order/parameter_object.py     Thu Apr 10 
18:34:54 2014
@@ -41,6 +41,9 @@
         # Add the model variables.
         self.add_model_info()
 
+        # Add the base data.
+        self.add_align_data()
+
         # Add the parameters of all models.
         self.add('ave_pos_x', scope='global', units='Angstrom', desc='The 
average position x translation', py_type=float, set='params', err=True, 
sim=True)
         self.add('ave_pos_y', scope='global', units='Angstrom', desc='The 
average position y translation', py_type=float, set='params', err=True, 
sim=True)

Modified: trunk/specific_analyses/n_state_model/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/n_state_model/parameter_object.py?rev=22695&r1=22694&r2=22695&view=diff
==============================================================================
--- trunk/specific_analyses/n_state_model/parameter_object.py   (original)
+++ trunk/specific_analyses/n_state_model/parameter_object.py   Thu Apr 10 
18:34:54 2014
@@ -39,6 +39,7 @@
         Param_list.__init__(self)
 
         # Add the base data.
+        self.add_align_data()
         self.add_csa()
 
         # Add the minimisation data.

Modified: trunk/specific_analyses/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/parameter_object.py?rev=22695&r1=22694&r2=22695&view=diff
==============================================================================
--- trunk/specific_analyses/parameter_object.py (original)
+++ trunk/specific_analyses/parameter_object.py Thu Apr 10 18:34:54 2014
@@ -141,6 +141,20 @@
             self._grace_string[name] = name
 
 
+    def add_align_data(self):
+        """Add the PCS and RDC data.
+
+        This is the equivalent of calling:
+
+            add('pcs', scope='spin', grace_string='Pseudo-contact shift', 
units='ppm', desc='The pseudo-contact shift (PCS)', py_type=float)
+            add('rdc', scope='spin', grace_string='Residual dipolar 
coupling', units='Hz', desc='The residual dipolar coupling (RDC)', 
py_type=float)
+        """
+
+        # Add the data.
+        self.add('pcs', scope='spin', grace_string='Pseudo-contact shift', 
units='ppm', desc='The pseudo-contact shift (PCS)', py_type=float)
+        self.add('rdc', scope='spin', grace_string='Residual dipolar 
coupling', units='Hz', desc='The residual dipolar coupling (RDC)', 
py_type=float)
+
+
     def add_csa(self, default=None, set='generic', err=False, sim=False):
         """Add the CSA parameter 'csa'.