r16521 - /branches/uf_redesign/specific_fns/frame_order.py -- May 29, 2012 - 18:01

Author: bugman
Date: Tue May 29 18:01:58 2012
New Revision: 16521

URL: http://svn.gna.org/viewcvs/relax?rev=16521&view=rev
Log:
Fixes for the frame order specific code for the changes to the parameter list 
object.

The get_param_names() method had to be changed as the base API data_names() 
method now returns all
parameters of all models.


Modified:
    branches/uf_redesign/specific_fns/frame_order.py

Modified: branches/uf_redesign/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/specific_fns/frame_order.py?rev=16521&r1=16520&r2=16521&view=diff
==============================================================================
--- branches/uf_redesign/specific_fns/frame_order.py (original)
+++ branches/uf_redesign/specific_fns/frame_order.py Tue May 29 18:01:58 2012
@@ -79,6 +79,7 @@
         self.PARAMS.add('cone_theta', scope='global', units='rad', desc='The 
isotropic cone opening half-angle', py_type=float, set='params', err=True, 
sim=True)
         self.PARAMS.add('cone_s1', scope='global', units='', desc='The 
isotropic cone order parameter', py_type=float, set='params', err=True, 
sim=True)
         self.PARAMS.add('cone_sigma_max', scope='global', units='rad', 
desc='The torsion angle', py_type=float, set='params', err=True, sim=True)
+        self.PARAMS.add('params', scope='global', desc='The model 
parameters', py_type=list)
 
         # Set up the spin parameters.
         self.PARAMS.add('heteronuc_type', scope='spin', default='15N', 
desc='The heteronucleus type', py_type=str)
@@ -933,9 +934,11 @@
         @rtype:                 list of str
         """
 
-        # Return the parameter object names.
-        param_names = self.data_names(set='params')
-        return param_names
+        # First update the model, if needed.
+        self._update_model()
+
+        # Return the parameter list object.
+        return cdp.params
 
 
     def get_param_values(self, model_info=None, sim_index=None):