Re: r8974 - /1.3/specific_fns/model_free/main.py -- March 12, 2009 - 18:55

Exactly ;)

Cheers,

Edward


On Thu, Mar 12, 2009 at 6:32 PM, Sébastien Morin
<sebastien.morin.1@xxxxxxxxx> wrote:
> Hi,
>
> Ok, but function return_data_desc() calls function return_units() which
> is why I modified it...
>
> So, the solution might be to remove calls to function return_units()
> within return_data_desc() ?
>
> For example:
>
>    return 'Bond length (' + self.return_units('r') + ')'
>
> would become
>
>    return 'Bond length (meters)'
>
> ?
>
> Regards,
>
>
> Séb  :)
>
>
>
> Edward d'Auvergne wrote:
> > Hi,
> >
> > This is actually the wrong method to change.  This is used by other
> > parts of the program where the conversion factors are used.  The only
> > method that needs changing, and is only used by the XML code, is
> > return_data_desc().
> >
> > Regards,
> >
> > Edward
> >
> >
> > On Thu, Mar 12, 2009 at 6:17 PM,  <sebastien.morin.1@xxxxxxxxx> wrote:
> >
> > > Author: semor
> > > Date: Thu Mar 12 18:17:30 2009
> > > New Revision: 8974
> > >
> > > URL: http://svn.gna.org/viewcvs/relax?rev=8974&view=rev
> > > Log:
> > > Fix for bug 13162: Rex values in XML results file not in s-1.
> > >
> > > The units are now correctly given in the XML results fiel as discussed in 
> > > a thread at:
> > > https://mail.gna.org/public/relax-devel/2009-03/msg00010.html
> > > (Message-id: <20090310-141629.sv7147.79009@xxxxxxx>)
> > >
> > >
> > > Modified:
> > >    1.3/specific_fns/model_free/main.py
> > >
> > > Modified: 1.3/specific_fns/model_free/main.py
> > > URL: 
> > > http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=8974&r1=8973&r2=8974&view=diff
> > > ==============================================================================
> > > --- 1.3/specific_fns/model_free/main.py (original)
> > > +++ 1.3/specific_fns/model_free/main.py Thu Mar 12 18:17:30 2009
> > > @@ -2370,25 +2370,25 @@
> > >             if not spin:
> > >                 spin = return_spin(spin_id)
> > >
> > > -        # tm (nanoseconds).
> > > +        # tm (seconds).
> > >         if object_name == 'tm' or object_name == 'local_tm':
> > > -            return 'ns'
> > > -
> > > -        # te, tf, and ts (picoseconds).
> > > +            return 's'
> > > +
> > > +        # te, tf, and ts (seconds).
> > >         elif object_name in ['te', 'tf', 'ts']:
> > > -            return 'ps'
> > > -
> > > -        # Rex (value at 1st field strength).
> > > +            return 's'
> > > +
> > > +        # Rex (field independant value).
> > >         elif object_name == 'rex' and hasattr(spin, 'frq_labels') and 
> > > spin.frq_labels != None and len(spin.frq_labels):
> > > -            return spin.frq_labels[0] + ' MHz'
> > > -
> > > -        # Bond length (Angstrom).
> > > +            return 'sigma_ex = Rex / omega**2'
> > > +
> > > +        # Bond length (meters).
> > >         elif object_name == 'r':
> > > -            return 'Angstrom'
> > > -
> > > -        # CSA (ppm).
> > > +            return 'm'
> > > +
> > > +        # CSA (unitless).
> > >         elif object_name == 'csa':
> > > -            return 'ppm'
> > > +            return 'unitless'
> > >
> > >
> > >     def select_model(self, model=None, spin_id=None):
> > >
> > >
> > > _______________________________________________
> > > relax (http://nmr-relax.com)
> > >
> > > This is the relax-commits mailing list
> > > relax-commits@xxxxxxx
> > >
> > > To unsubscribe from this list, get a password
> > > reminder, or change your subscription options,
> > > visit the list information page at
> > > https://mail.gna.org/listinfo/relax-commits
> >
> > _______________________________________________
> > relax (http://nmr-relax.com)
> >
> > This is the relax-devel mailing list
> > relax-devel@xxxxxxx
> >
> > To unsubscribe from this list, get a password
> > reminder, or change your subscription options,
> > visit the list information page at
> > https://mail.gna.org/listinfo/relax-devel
>
>
> --
> Sébastien Morin
> PhD Student
> S. Gagné NMR Laboratory
> Université Laval & PROTEO
> Québec, Canada