r10331 - in /branches/bieri_gui: ./ auto_analyses/dauvergne_protocol.py -- January 25, 2010 - 21:09

Author: bugman
Date: Mon Jan 25 21:09:52 2010
New Revision: 10331

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

........
  r10330 | bugman | 2010-01-25 21:01:23 +0100 (Mon, 25 Jan 2010) | 3 lines
  
  As a precaution, the spins will always be named in the automatic model-free 
protocol.
........

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

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 25 21:09:52 2010
@@ -1,1 +1,1 @@
-/1.3:1-10326
+/1.3:1-10330

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=10331&r1=10330&r2=10331&view=diff
==============================================================================
--- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original)
+++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Mon Jan 25 
21:09:52 2010
@@ -273,6 +273,10 @@
                     if self.exclude:
                         self.interpreter.deselect.read(file=self.exclude)
 
+                    # Name the spins if necessary.
+                    if self.seq_args[6] == None:
+                        self.interpreter.spin.name(name=self.het_name)
+
                     # Load the PDB file and calculate the unit vectors 
parallel to the XH bond.
                     if self.pdb_file:
                         self.interpreter.structure.read_pdb(self.pdb_file)