r13418 - in /branches/gui_testing: ./ auto_analyses/dauvergne_protocol.py -- July 05, 2011 - 16:33

Author: bugman
Date: Tue Jul  5 16:33:58 2011
New Revision: 13418

URL: http://svn.gna.org/viewcvs/relax?rev=13418&view=rev
Log:
Merged revisions 13411 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r13411 | michaelbieri | 2011-07-04 01:15:43 +0200 (Mon, 04 Jul 2011) | 2 
lines
  
  Argument change_all for deselecting residues in the d'Auvergne protocol has 
to be boolean.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/auto_analyses/dauvergne_protocol.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jul  5 16:33:58 2011
@@ -1,1 +1,1 @@
-/1.3:1-13359
+/1.3:1-13417

Modified: branches/gui_testing/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/auto_analyses/dauvergne_protocol.py?rev=13418&r1=13417&r2=13418&view=diff
==============================================================================
--- branches/gui_testing/auto_analyses/dauvergne_protocol.py (original)
+++ branches/gui_testing/auto_analyses/dauvergne_protocol.py Tue Jul  5 
16:33:58 2011
@@ -805,7 +805,7 @@
 
             # Deselect spins to be excluded (including unresolved and 
specifically excluded spins).
             if self.unres:
-                self.interpreter.deselect.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)
+                self.interpreter.deselect.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=False)
             if self.exclude:
                 self.interpreter.deselect.read(file=self.exclude, 
spin_id_col=1)