r17992 - /branches/frame_order_testing/specific_fns/frame_order.py -- November 16, 2012 - 11:22

Author: bugman
Date: Fri Nov 16 11:22:39 2012
New Revision: 17992

URL: http://svn.gna.org/viewcvs/relax?rev=17992&view=rev
Log:
Bug fixes for the frame order specific analysis eliminate() method.


Modified:
    branches/frame_order_testing/specific_fns/frame_order.py

Modified: branches/frame_order_testing/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/frame_order.py?rev=17992&r1=17991&r2=17992&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/frame_order.py (original)
+++ branches/frame_order_testing/specific_fns/frame_order.py Fri Nov 16 
11:22:39 2012
@@ -1702,7 +1702,6 @@
             if cdp.cone_theta < 0.0:
                 print(text % ("cone opening angle theta", cdp.cone_theta, 
"less", 0))
                 return True
-            return True
 
         # Pseudo-ellipse cone angles out of range (0.001 instead of 0.0 
because of truncation in the numerical integration).
         if name == 'cone_theta_x' and hasattr(cdp, 'cone_theta_x'):
@@ -1712,7 +1711,6 @@
             if cdp.cone_theta_x < 0.001:
                 print(text % ("cone opening angle theta x", 
cdp.cone_theta_x, "less", 0.001))
                 return True
-            return True
         if name == 'cone_theta_y' and hasattr(cdp, 'cone_theta_y'):
             if cdp.cone_theta_y >= pi:
                 print(text % ("cone opening angle theta y", 
cdp.cone_theta_y, "greater", pi))
@@ -1720,7 +1718,6 @@
             if cdp.cone_theta_y < 0.001:
                 print(text % ("cone opening angle theta y", 
cdp.cone_theta_y, "less", 0.001))
                 return True
-            return True
 
         # Torsion angle out of range.
         if name == 'cone_sigma_max' and hasattr(cdp, 'cone_sigma_max'):
@@ -1730,7 +1727,6 @@
             if cdp.cone_sigma_max < 0.0:
                 print(text % ("torsion angle sigma_max", cdp.cone_sigma_max, 
"less", 0.0))
                 return True
-            return True
 
         # No failure.
         return False