r11616 - /branches/bieri_gui/auto_analyses/relax_fit.py -- September 29, 2010 - 13:35

Author: bugman
Date: Wed Sep 29 13:34:59 2010
New Revision: 11616

URL: http://svn.gna.org/viewcvs/relax?rev=11616&view=rev
Log:
The sequence file data is not needed if a PDB is specified.

The checks no longer fail.


Modified:
    branches/bieri_gui/auto_analyses/relax_fit.py

Modified: branches/bieri_gui/auto_analyses/relax_fit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/relax_fit.py?rev=11616&r1=11615&r2=11616&view=diff
==============================================================================
--- branches/bieri_gui/auto_analyses/relax_fit.py (original)
+++ branches/bieri_gui/auto_analyses/relax_fit.py Wed Sep 29 13:34:59 2010
@@ -182,14 +182,15 @@
         """Check that the user has set the variables correctly."""
 
         # Sequence data.
-        if not isinstance(self.seq_args, list):
-            raise RelaxError("The seq_args user variable '%s' must be a 
list." % self.seq_args)
-        if len(self.seq_args) != 8:
-            raise RelaxError("The seq_args user variable '%s' must be a list 
with eight elements." % self.seq_args)
-        if not isinstance(self.seq_args[0], str):
-            raise RelaxError("The file name component of the seq_args user 
variable '%s' must be a string." % self.seq_args)
-        for i in range(1, 8):
-            if self.seq_args[i] != None and not isinstance(self.seq_args[i], 
int):
-                raise RelaxError("The column components of the seq_args user 
variable '%s' must be either None or integers." % self.seq_args)
+        if not self.pdb_file:
+            if not isinstance(self.seq_args, list):
+                raise RelaxError("The seq_args user variable '%s' must be a 
list if a PDB file is not specified." % self.seq_args)
+            if len(self.seq_args) != 8:
+                raise RelaxError("The seq_args user variable '%s' must be a 
list with eight elements." % self.seq_args)
+            if not isinstance(self.seq_args[0], str):
+                raise RelaxError("The file name component of the seq_args 
user variable '%s' must be a string." % self.seq_args)
+            for i in range(1, 8):
+                if self.seq_args[i] != None and not 
isinstance(self.seq_args[i], int):
+                    raise RelaxError("The column components of the seq_args 
user variable '%s' must be either None or integers." % self.seq_args)