Re: r7789 - /1.3/generic_fns/intensity.py -- October 16, 2008 - 22:58

On Thu, Oct 16, 2008 at 10:47 PM,  <sebastien.morin.1@xxxxxxxxx> wrote:
> Author: semor
> Date: Thu Oct 16 22:47:52 2008
> New Revision: 7789
>
> URL: http://svn.gna.org/viewcvs/relax?rev=7789&view=rev
> Log:
> Corrected the passing of the 'int_col' variable to the intensity extraction 
> functions.
>
>
> Modified:
>    1.3/generic_fns/intensity.py
>
> Modified: 1.3/generic_fns/intensity.py
> URL: 
> http://svn.gna.org/viewcvs/relax/1.3/generic_fns/intensity.py?rev=7789&r1=7788&r2=7789&view=diff
> ==============================================================================
> --- 1.3/generic_fns/intensity.py (original)
> +++ 1.3/generic_fns/intensity.py Thu Oct 16 22:47:52 2008
> @@ -73,7 +73,7 @@
>             break
>
>
> -def intensity_sparky(line, int_col=None):
> +def intensity_sparky(line, int_col):
>     """Function for returning relevant data from the Sparky peak intensity 
> line.
>
>     The residue number, heteronucleus and proton names, and peak intensity 
> will be returned.
> @@ -122,7 +122,7 @@
>     return res_num, h_name, x_name, intensity
>
>
> -def intensity_xeasy(line, int_col=None, H_dim='w1'):
> +def intensity_xeasy(line, int_col, H_dim='w1'):
>     """Function for returning relevant data from the XEasy peak intensity 
> line.
>
>     The residue number, heteronucleus and proton names, and peak intensity 
> will be returned.
> @@ -168,7 +168,7 @@
>     return res_num, h_name, x_name, intensity
>
>
> -def intensity_nmrview(line, int_col=None):
> +def intensity_nmrview(line, int_col):
>     """Function for returning relevant data from the NMRView peak intensity 
> line.
>
>     The residue number, heteronucleus and proton names, and peak intensity 
> will be returned.
> @@ -365,7 +365,7 @@
>     # Loop over the peak intensity data.
>     for i in xrange(len(file_data)):
>         # Extract the data.
> -        res_num, H_name, X_name, intensity = intensity_fn(file_data[i])
> +        res_num, H_name, X_name, intensity = intensity_fn(file_data[i], 
> int_col=int_col)

It's almost there, the XEasy support is getting close to coming back.
Here there's a minor issue.  Because you converted int_col from a
keyword argument to a normal arg, you shouldn't use 'int_col=int_col'.

Regards,

Edward