r5596 - /1.3/specific_fns/jw_mapping.py -- April 12, 2008 - 02:05

Author: semor
Date: Sat Apr 12 02:05:26 2008
New Revision: 5596

URL: http://svn.gna.org/viewcvs/relax?rev=5596&view=rev
Log:
Converted some more 'instance' arguments to calls to 'spin' and removed some 
now unused 'cdp' calls.

This is a small part of what Edward d'Auvergne noticed in a post at:
https://mail.gna.org/public/relax-devel/2008-04/msg00010.html (# Message-id:
<7f080ed10804030909m3b540ee3y1d60009542c09694@xxxxxxxxxxxxxx>)


Modified:
    1.3/specific_fns/jw_mapping.py

Modified: 1.3/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=5596&r1=5595&r2=5596&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Sat Apr 12 02:05:26 2008
@@ -418,27 +418,24 @@
             spin.jwh_err = error
 
 
-    def sim_return_param(self, instance, index):
+    def sim_return_param(self, index, spin):
         """Function for returning the array of simulation parameter 
values."""
 
-        # Alias the current data pipe.
-        cdp = relax_data_store[relax_data_store.current_pipe]
-
         # Skip unselected residues.
-        if not cdp.res[instance].select:
+        if not spin.select:
                 return
 
         # Return J(0) sim data.
         if index == 0:
-            return cdp.res[instance].j0_sim
+            return spin.j0_sim
 
         # Return J(wX) sim data.
         if index == 1:
-            return cdp.res[instance].jwx_sim
+            return spin.jwx_sim
 
         # Return J(wH) sim data.
         if index == 2:
-            return cdp.res[instance].jwh_sim
+            return spin.jwh_sim
 
 
     def sim_return_selected(self, instance):