r14148 - /branches/gui_testing/gui/analyses/auto_model_free.py -- August 04, 2011 - 18:14

Author: bugman
Date: Thu Aug  4 18:14:08 2011
New Revision: 14148

URL: http://svn.gna.org/viewcvs/relax?rev=14148&view=rev
Log:
Unit vectors are now only checked for in the model-free GUI auto-analysis 
when needed.


Modified:
    branches/gui_testing/gui/analyses/auto_model_free.py

Modified: branches/gui_testing/gui/analyses/auto_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/gui/analyses/auto_model_free.py?rev=14148&r1=14147&r2=14148&view=diff
==============================================================================
--- branches/gui_testing/gui/analyses/auto_model_free.py (original)
+++ branches/gui_testing/gui/analyses/auto_model_free.py Thu Aug  4 18:14:08 
2011
@@ -360,6 +360,11 @@
         else:
             data.global_models = [mode]
 
+        # Check for vectors.
+        vector_check = False
+        if 'prolate' in data.global_models or 'oblate' in data.global_models 
or 'ellipsoid' in data.global_models:
+            vector_check = True
+
         # Spin vars.
         for spin, spin_id in spin_loop(return_id=True):
             # Skip deselected spins.
@@ -386,7 +391,7 @@
                 missing.append(msg % ("proton type data", "value.set"))
 
             # Test if the unit vectors have been loaded.
-            if not hasattr(spin, 'unit_vect') or spin.unit_vect == None:
+            if vector_check and (not hasattr(spin, 'unit_vect') or 
spin.unit_vect == None):
                 missing.append(msg % ("unit vectors", "structure.vectors"))
 
         # Return the container and list of missing data.