r6230 - /1.3/specific_fns/base_class.py -- May 22, 2008 - 00:21

Author: bugman
Date: Thu May 22 00:16:08 2008
New Revision: 6230

URL: http://svn.gna.org/viewcvs/relax?rev=6230&view=rev
Log:
Updated the sim_return_param() method to the new design.


Modified:
    1.3/specific_fns/base_class.py

Modified: 1.3/specific_fns/base_class.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/base_class.py?rev=6230&r1=6229&r2=6230&view=diff
==============================================================================
--- 1.3/specific_fns/base_class.py (original)
+++ 1.3/specific_fns/base_class.py Thu May 22 00:16:08 2008
@@ -321,14 +321,20 @@
                     sim_object.append(deepcopy(getattr(spin, object_name)))
 
 
-    def sim_return_param(self, run, instance, index):
-        """Function for returning the array of simulation parameter 
values."""
-
-        # Arguments.
-        self.run = run
-
-        # Skip deselected residues.
-        if not relax_data_store.res[self.run][instance].select:
+    def sim_return_param(self, instance, index):
+        """Return the array of simulation parameter values.
+ 
+        @param instance:    The optimisation instance index.
+        @type instance:     int
+        @param index:       The index of the parameter to return the array 
of values for.
+        @type index:        int
+        """
+
+        # Get the SpinContainer.
+        spin = return_spin_from_index(instance)
+
+        # Skip deselected spins.
+        if not spin.select:
             return
 
         # Parameter increment counter.
@@ -338,7 +344,7 @@
         for param in self.data_names(set='params'):
             # Return the parameter array.
             if index == inc:
-                return getattr(relax_data_store.res[self.run][instance], 
param + "_sim")
+                return getattr(spin, param + "_sim")
 
             # Increment.
             inc = inc + 1