Author: bugman Date: Sun Apr 13 11:06:36 2008 New Revision: 5612 URL: http://svn.gna.org/viewcvs/relax?rev=5612&view=rev Log: Removed some code for handling corrupt mfout files which was made redundant by the bug fix in r5611. Modified: 1.3/generic_fns/palmer.py Modified: 1.3/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/1.3/generic_fns/palmer.py?rev=5612&r1=5611&r2=5612&view=diff ============================================================================== --- 1.3/generic_fns/palmer.py (original) +++ 1.3/generic_fns/palmer.py Sun Apr 13 11:06:36 2008 @@ -586,13 +586,8 @@ # Get the Rex data. if 'Rex' in spin.params: spin.rex, spin.rex_err = self.get_mf_data(self.mfout_Rex_pos + pos) - try: - spin.rex = spin.rex / (2.0 * pi * spin.frq[0])**2 - spin.rex_err = spin.rex_err / (2.0 * pi * spin.frq[0])**2 - except TypeError: - # Bug in Modelfree4's mfout output file (fusion of columns). - spin.rex = None - spin_rex_err = None + spin.rex = spin.rex / (2.0 * pi * spin.frq[0])**2 + spin.rex_err = spin.rex_err / (2.0 * pi * spin.frq[0])**2 # Get the chi-squared data. if not sims: