Re: r11361 - in /branches/bieri_gui: auto_analyses/dauvergne_protocol.py gui_bieri/analyses/auto_model_free.py -- July 27, 2010 - 10:17

Hi Michael,

I have now committed r11366 to the 1.3 line.  This allows
select.read() and deselect.read() to have the DummyFileObject (or any
file handle) passed into them.  Therefore this change is not
necessary.  These types of print statements should also not exist.
Therefore, could you please revert this commit?

Cheers,

Edward


On 27 July 2010 06:05,  <michael.bieri@xxxxxxxxxxxxx> wrote:
> Author: michaelbieri
> Date: Tue Jul 27 06:05:14 2010
> New Revision: 11361
>
> URL: http://svn.gna.org/viewcvs/relax?rev=11361&view=rev
> Log:
> Function to exclude unresolved spins uses direct relax API commands, as the 
> GUI uses a relax dummy file.
>
> Modified:
>    branches/bieri_gui/auto_analyses/dauvergne_protocol.py
>    branches/bieri_gui/gui_bieri/analyses/auto_model_free.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=11361&r1=11360&r2=11361&view=diff
> ==============================================================================
> --- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original)
> +++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Tue Jul 27 
> 06:05:14 2010
> @@ -148,6 +148,7 @@
>  from float import floatAsByteArray
>  from generic_fns.mol_res_spin import generate_spin_id, spin_index_loop, 
> spin_loop
>  from generic_fns import pipes
> +from generic_fns import selection
>  from prompt.interpreter import Interpreter
>  from relax_errors import RelaxError
>  from status import Status
> @@ -815,7 +816,8 @@
>
>             # Deselect spins to be excluded (including unresolved and 
> specifically excluded spins).
>             if self.unres:
> -                self.interpreter.deselect.read(file=self.unres, 
> spin_id_col=1)
> +                selection.desel_read(file=self.unres, dir=None, 
> spin_id_col=None, mol_name_col=None, res_num_col=1, res_name_col=None, 
> spin_num_col=None, spin_name_col=None, sep=None, spin_id=None, 
> boolean='AND', change_all=None)
> +                print 'relax> deselect.read(selected residues)'
>             if self.exclude:
>                 self.interpreter.deselect.read(file=self.exclude, 
> spin_id_col=1)
>
>
> Modified: branches/bieri_gui/gui_bieri/analyses/auto_model_free.py
> URL: 
> http://svn.gna.org/viewcvs/relax/branches/bieri_gui/gui_bieri/analyses/auto_model_free.py?rev=11361&r1=11360&r2=11361&view=diff
> ==============================================================================
> --- branches/bieri_gui/gui_bieri/analyses/auto_model_free.py (original)
> +++ branches/bieri_gui/gui_bieri/analyses/auto_model_free.py Tue Jul 27 
> 06:05:14 2010
> @@ -847,7 +847,7 @@
>         # Redirect relax output and errors to the controller.
>         redir = Redirect_text(self.gui.controller)
>         sys.stdout = redir
> -        sys.stderr = redir
> +        #sys.stderr = redir
>
>         # Print a header in the controller.
>         wx.CallAfter(self.gui.controller.log_panel.AppendText, ('Starting 
> Model-free calculation\n------------------------------------------\n\n') )
>
>
> _______________________________________________
> 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