Re: r10959 - /branches/bieri_gui/auto_analyses/dauvergne_protocol.py -- March 11, 2010 - 13:32

Hi Michael,

In the commit messages, could you please include the exact svn command
you used?  The source code management is defined in little blocks, the
revisions, and we need to keep careful track of which revisions are
included and which are missing.  For an example of the commit message
format, see:

https://mail.gna.org/public/relax-commits/2009-07/msg00000.html

Could you reply to your commit messages and include the svn command
used?  I would like to carefully check that only what you would like
to change has been changed.  My worry is that one of the earlier
'svnmerge merge' commands has been accidentally reverted.  I have to
be 100% sure that this is not the case.  If it is the case, then when
I merge the branch back into the 1.3 line, a number of my changes to
the 1.3 line will be lost (and I won't even know).  With the svn
command, I can then check the svn logs "$ svn log -v | less" and make
sure that there won't be damage to the 1.3 line.

Cheers,

Edward



On 10 March 2010 01:18,  <michael.bieri@xxxxxx> wrote:
> Author: michaelbieri
> Date: Wed Mar 10 01:18:16 2010
> New Revision: 10959
>
> URL: http://svn.gna.org/viewcvs/relax?rev=10959&view=rev
> Log:
> Reverted r10918 to restore dauvergne_protocol.py as set up by Edward 
> d'Auvergne.
>
> The revision was reported at: 
> http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/dauvergne_protocol.py?rev=10918&view=log.
>
> Modified:
>    branches/bieri_gui/auto_analyses/dauvergne_protocol.py
>
> Modified: branches/bieri_gui/auto_analyses/dauvergne_protocol.py
> URL: 
> http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/dauvergne_protocol.py?rev=10959&r1=10958&r2=10959&view=diff
> ==============================================================================
> --- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original)
> +++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Wed Mar 10 
> 01:18:16 2010
> @@ -143,7 +143,6 @@
>  from os import getcwd, listdir, sep
>  from re import search
>  from string import lower
> -from time import sleep
>
>  # relax module imports.
>  from float import floatAsByteArray
> @@ -155,7 +154,7 @@
>
>
>  class dAuvergne_protocol:
> -    def __init__(self, progress = 0, diff_model=None, mf_models=['m0', 
> 'm1', 'm2', 'm3', 'm4', 'm5', 'm6', 'm7', 'm8', 'm9'], 
> local_tm_models=['tm0', 'tm1', 'tm2', 'tm3', 'tm4', 'tm5', 'tm6', 'tm7', 
> 'tm8', 'tm9'], pdb_file=None, seq_args=None, het_name=None, 
> relax_data=None, unres=None, exclude=None, bond_length=None, csa=None, 
> hetnuc=None, proton='1H', grid_inc=11, min_algor='newton', mc_num=500, 
> user_fns=None, conv_loop=True):
> +    def __init__(self, diff_model=None, mf_models=['m0', 'm1', 'm2', 'm3', 
> 'm4', 'm5', 'm6', 'm7', 'm8', 'm9'], local_tm_models=['tm0', 'tm1', 'tm2', 
> 'tm3', 'tm4', 'tm5', 'tm6', 'tm7', 'tm8', 'tm9'], pdb_file=None, 
> seq_args=None, het_name=None, relax_data=None, unres=None, exclude=None, 
> bond_length=None, csa=None, hetnuc=None, proton='1H', grid_inc=11, 
> min_algor='newton', mc_num=500, user_fns=None, conv_loop=True):
>         """Perform the full model-free analysis protocol of d'Auvergne and 
> Gooley, 2008b.
>
>         @keyword diff_model:        The global diffusion model to optimise. 
>  This can be one of 'local_tm', 'sphere', 'oblate', 'prolate', 'ellipsoid', 
> or 'final'.
> @@ -214,7 +213,6 @@
>         self.min_algor = min_algor
>         self.mc_num = mc_num
>         self.conv_loop = conv_loop
> -        self.progress = progress
>
>         # User variable checks.
>         self.check_vars()
> @@ -232,7 +230,6 @@
>
>         # MI - Local tm.
>         ################
> -
>
>         if self.diff_model == 'local_tm':
>             # Base directory to place files into.
> @@ -743,13 +740,6 @@
>             if pipes.has_pipe(name):
>                 self.interpreter.pipe.delete(name)
>             self.interpreter.pipe.create(name, 'mf')
> -
> -            # Update progress.
> -            print'\nProgress: '+ str(self.progress)
> -            if local_tm:
> -                self.progress = self.progress + (100/len(self.pipes))
> -            else:
> -                self.progress = self.progress + 5
>
>             # Load the sequence.
>             self.interpreter.sequence.read(file=self.seq_args[0], 
> dir=self.seq_args[1], mol_name_col=self.seq_args[2], 
> res_num_col=self.seq_args[3], res_name_col=self.seq_args[4], 
> spin_num_col=self.seq_args[5], spin_name_col=self.seq_args[6], 
> sep=self.seq_args[7])
>
>
> _______________________________________________
> 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