Author: semor Date: Mon Jan 12 15:39:04 2009 New Revision: 8420 URL: http://svn.gna.org/viewcvs/relax?rev=8420&view=rev Log: Reverted revision 8418 as the file modified was not the good one... Yes ! I modified 'relax_fit.py' instead of 'relax_disp.py'... The command used was: svn merge -r8418:8417 . Modified: branches/relax_disp/specific_fns/relax_fit.py Modified: branches/relax_disp/specific_fns/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_fns/relax_fit.py?rev=8420&r1=8419&r2=8420&view=diff ============================================================================== --- branches/relax_disp/specific_fns/relax_fit.py (original) +++ branches/relax_disp/specific_fns/relax_fit.py Mon Jan 12 15:39:04 2009 @@ -165,22 +165,6 @@ # Return the correct peak height. return results[relax_time_index] - - - def calc_r2eff(self, exp_type='cpmg', id=None, delayT=None, int_cpmg=0, int_ref=0): - """Calculate the effective transversal relaxation rate from the peak intensities. The - equation depends on the experiment type chosen, either 'cpmg' or 'r1rho'. - - If 'cpmg' is chosen, the equation used is: - r2eff = - ( 1 / delayT ) * log ( int_cpmg / int_ref ) - - If 'r1rho' is chosen, nothing happens yet, as the code is not implemented. - """ - - if exp_type == 'cpmg': - r2eff = - ( 1 / delayT ) * log ( int_cpmg / int_ref ) - - return r2eff def create_mc_data(self, spin_id):