r18003 - /branches/frame_order_testing/specific_fns/frame_order.py -- November 16, 2012 - 18:23

Author: bugman
Date: Fri Nov 16 18:23:21 2012
New Revision: 18003

URL: http://svn.gna.org/viewcvs/relax?rev=18003&view=rev
Log:
Fixes for the frame order specific analysis methods for the Monte Carlo 
simulations.

The parameter names are now skipped if the parameter is not part of the 
model.  This allows the
correct errors and simulation structures to be created.


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=18003&r1=18002&r2=18003&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Fri Nov 16 
18:23:21 2012
@@ -2194,6 +2194,10 @@
 
         # Loop over the residue specific parameters.
         for param in self.data_names(set='params'):
+            # Not a parameter of the model.
+            if param not in cdp.params:
+                continue
+
             # Return the parameter array.
             if index == inc:
                 setattr(cdp, param + "_err", error)
@@ -2239,6 +2243,10 @@
 
         # 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:
+                continue
+
             # Name for the simulation object.
             sim_object_name = object_name + '_sim'
 
@@ -2252,8 +2260,8 @@
 
         # Loop over all the data names.
         for object_name in param_names:
-            # Skip non-existent objects.
-            if not hasattr(cdp, object_name):
+            # Not a parameter of the model.
+            if object_name not in cdp.params:
                 continue
 
             # Name for the simulation object.
@@ -2348,8 +2356,8 @@
 
         # Loop over the parameters.
         for param in param_names:
-            # Skip non-existent objects.
-            if not hasattr(cdp, param):
+            # Not a parameter of the model.
+            if param not in cdp.params:
                 continue
 
             # Return the parameter array.