r11378 - /branches/bieri_gui/auto_analyses/dauvergne_protocol.py -- July 28, 2010 - 07:03

Author: michaelbieri
Date: Wed Jul 28 07:03:36 2010
New Revision: 11378

URL: http://svn.gna.org/viewcvs/relax?rev=11378&view=rev
Log:
List of unresolved spins are allowed to be a dummy file object.

Modified:
    branches/bieri_gui/auto_analyses/dauvergne_protocol.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=11378&r1=11377&r2=11378&view=diff
==============================================================================
--- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original)
+++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Wed Jul 28 
07:03:36 2010
@@ -151,6 +151,7 @@
 from generic_fns import selection
 from prompt.interpreter import Interpreter
 from relax_errors import RelaxError
+from relax_io import DummyFileObject
 from status import Status
 
 
@@ -522,8 +523,8 @@
             raise RelaxError("Relaxation data at multiple magnetic field 
strengths is essential for this analysis.")
 
         # Unresolved and exclude files. FIXME
-        #if self.unres and not isinstance(self.unres, str):
-        #    raise RelaxError("The unres user variable '%s' is incorrectly 
set.  It should either be a string or None." % self.unres)
+        if self.unres and not isinstance(self.unres, str) and not 
isinstance(self.unres, DummyFileObject):
+            raise RelaxError("The unres user variable '%s' is incorrectly 
set.  It should either be a string or None." % self.unres)
         if self.exclude and not isinstance(self.exclude, str):
             raise RelaxError("The exclude user variable '%s' is incorrectly 
set.  It should either be a string or None." % self.exclude)