r18014 - /branches/frame_order_testing/specific_fns/frame_order.py -- November 21, 2012 - 08:43

Author: bugman
Date: Wed Nov 21 08:43:48 2012
New Revision: 18014

URL: http://svn.gna.org/viewcvs/relax?rev=18014&view=rev
Log:
Bug fix for the free-rotor isotropic cone frame order model.

The cone_theta parameter is not an optimised parameter, but a Monte Carlo 
'*_sim' data structure
needs to be set up for it.


Modified:
    branches/frame_order_testing/specific_fns/frame_order.py

Modified: branches/frame_order_testing/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=18014&r1=18013&r2=18014&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Wed Nov 21 
08:43:48 2012
@@ -2230,9 +2230,13 @@
         # Get the parameter object names.
         param_names = self.data_names(set='params')
 
+        # The model parameters.
+        model_params = deepcopy(cdp.params)
+
         # Add some additional parameters.
         if cdp.model == 'iso cone, free rotor':
             param_names.append('cone_theta')
+            model_params.append('cone_theta')
 
         # Get the minimisation statistic object names.
         min_names = self.data_names(set='min')
@@ -2244,7 +2248,7 @@
         # Loop over all the parameter names.
         for object_name in param_names:
             # Not a parameter of the model.
-            if object_name not in cdp.params:
+            if object_name not in model_params:
                 continue
 
             # Name for the simulation object.
@@ -2261,7 +2265,7 @@
         # Loop over all the data names.
         for object_name in param_names:
             # Not a parameter of the model.
-            if object_name not in cdp.params:
+            if object_name not in model_params:
                 continue
 
             # Name for the simulation object.