r22661 - /trunk/specific_analyses/frame_order/parameters.py -- April 07, 2014 - 16:55

Author: bugman
Date: Mon Apr  7 16:55:51 2014
New Revision: 22661

URL: http://svn.gna.org/viewcvs/relax?rev=22661&view=rev
Log:
Replaced the 'elif' statements with 'if' in the frame order update_model() 
function.

This is to avoid possible future bugs as the logic was not consistent.


Modified:
    trunk/specific_analyses/frame_order/parameters.py

Modified: trunk/specific_analyses/frame_order/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order/parameters.py?rev=22661&r1=22660&r2=22661&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order/parameters.py   (original)
+++ trunk/specific_analyses/frame_order/parameters.py   Mon Apr  7 16:55:51 
2014
@@ -308,7 +308,7 @@
         cdp.params.append('eigen_gamma')
 
     # Frame order eigenframe - the isotropic cone axis.
-    elif cdp.model in ['iso cone', 'free rotor', 'iso cone, torsionless', 
'iso cone, free rotor', 'double rotor']:
+    if cdp.model in ['iso cone', 'free rotor', 'iso cone, torsionless', 'iso 
cone, free rotor', 'double rotor']:
         cdp.params.append('axis_theta')
         cdp.params.append('axis_phi')
 
@@ -327,9 +327,9 @@
         cdp.params.append('cone_theta_y')
 
     # Cone parameters - single isotropic angle or order parameter.
-    elif cdp.model in ['iso cone', 'iso cone, torsionless']:
+    if cdp.model in ['iso cone', 'iso cone, torsionless']:
         cdp.params.append('cone_theta')
-    elif cdp.model in ['iso cone, free rotor']:
+    if cdp.model in ['iso cone, free rotor']:
         cdp.params.append('cone_s1')
 
     # Cone parameters - torsion angle.