r9104 - /branches/frame_order/maths_fns/frame_order_models.py -- June 19, 2009 - 16:09

Author: bugman
Date: Fri Jun 19 16:09:33 2009
New Revision: 9104

URL: http://svn.gna.org/viewcvs/relax?rev=9104&view=rev
Log:
Added a check for incorrectly supplied arguments.


Modified:
    branches/frame_order/maths_fns/frame_order_models.py

Modified: branches/frame_order/maths_fns/frame_order_models.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order/maths_fns/frame_order_models.py?rev=9104&r1=9103&r2=9104&view=diff
==============================================================================
--- branches/frame_order/maths_fns/frame_order_models.py (original)
+++ branches/frame_order/maths_fns/frame_order_models.py Fri Jun 19 16:09:33 
2009
@@ -73,12 +73,16 @@
                 raise RelaxError, "Tensors and Frame Order matrices cannot 
be supplied together."
 
             # Tensor optimisation.
-            if full_tensors != None:
+            elif full_tensors != None:
                 self.__init_iso_cone_elements(full_tensors, red_tensors, 
red_errors)
 
             # Optimisation to the 2nd degree Frame Order matrix components 
directly.
-            if frame_order_2nd != None:
+            elif frame_order_2nd != None:
                 self.__init_iso_cone_elements(frame_order_2nd)
+
+            # Badly supplied arguments.
+            else:
+                raise RelaxError, "The arguments have been incorrectly 
supplied, cannot determine the optimisation mode."
 
 
     def __init_iso_cone(self, full_tensors, red_tensors, red_errors):