r13259 - in /branches/gui_testing: ./ auto_analyses/noe.py generic_fns/structure/geometric.py -- June 28, 2011 - 12:39

Author: bugman
Date: Tue Jun 28 12:39:33 2011
New Revision: 13259

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

........
  r13153 | bugman | 2011-06-21 19:18:15 +0200 (Tue, 21 Jun 2011) | 5 lines
  
  Removed a test for the sequence in the user function 
structure.create_diff_tensor_pdb() backend.
  
  The sequence data is not needed for this.
........
  r13258 | bugman | 2011-06-28 12:37:30 +0200 (Tue, 28 Jun 2011) | 6 lines
  
  Bug fix for the NOE auto-analysis - the column numbers for the deselected 
spins file are now assumed.
  
  The residue number is assumed to be in the first column.  This is a hack 
until the spin selection
  part is better designed.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/auto_analyses/noe.py
    branches/gui_testing/generic_fns/structure/geometric.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 28 12:39:33 2011
@@ -1,1 +1,1 @@
-/1.3:1-13046
+/1.3:1-13258

Modified: branches/gui_testing/auto_analyses/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/auto_analyses/noe.py?rev=13259&r1=13258&r2=13259&view=diff
==============================================================================
--- branches/gui_testing/auto_analyses/noe.py (original)
+++ branches/gui_testing/auto_analyses/noe.py Tue Jun 28 12:39:33 2011
@@ -144,7 +144,7 @@
         self.interpreter.spectrum.error_analysis()
 
         # Deselect unresolved spins.
-        self.interpreter.deselect.read(file=self.unresolved)
+        self.interpreter.deselect.read(file=self.unresolved, res_num_col=1)
 
         # Calculate the NOEs.
         self.interpreter.calc()

Modified: branches/gui_testing/generic_fns/structure/geometric.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/generic_fns/structure/geometric.py?rev=13259&r1=13258&r2=13259&view=diff
==============================================================================
--- branches/gui_testing/generic_fns/structure/geometric.py (original)
+++ branches/gui_testing/generic_fns/structure/geometric.py Tue Jun 28 
12:39:33 2011
@@ -442,10 +442,6 @@
         # Test if a structure has been loaded.
         if not hasattr(cdp, 'structure'):
             raise RelaxNoPdbError
-
-        # Test if sequence data is loaded.
-        if not exists_mol_res_spin_data():
-            raise RelaxNoSequenceError
 
 
         # Initialise.