Author: semor Date: Sat Apr 12 16:41:34 2008 New Revision: 5600 URL: http://svn.gna.org/viewcvs/relax?rev=5600&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/consistency_tests.py Modified: 1.3/specific_fns/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/1.3/specific_fns/consistency_tests.py?rev=5600&r1=5599&r2=5600&view=diff ============================================================================== --- 1.3/specific_fns/consistency_tests.py (original) +++ 1.3/specific_fns/consistency_tests.py Sat Apr 12 16:41:34 2008 @@ -475,27 +475,24 @@ spin.f_r2_err = error - def sim_return_param(self, instance, spin): + 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 F_eta sim data. if index == 1: - return cdp.res[instance].f_eta_sim + return spin.f_eta_sim # Return F_R2 sim data. if index == 2: - return cdp.res[instance].f_r2_sim + return spin.f_r2_sim def sim_return_selected(self, instance):