r11519 - /1.3/specific_fns/frame_order.py -- August 16, 2010 - 18:26

Author: bugman
Date: Mon Aug 16 18:26:31 2010
New Revision: 11519

URL: http://svn.gna.org/viewcvs/relax?rev=11519&view=rev
Log:
More fixes for the torsionless isotropic cone frame order model.


Modified:
    1.3/specific_fns/frame_order.py

Modified: 1.3/specific_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/frame_order.py?rev=11519&r1=11518&r2=11519&view=diff
==============================================================================
--- 1.3/specific_fns/frame_order.py (original)
+++ 1.3/specific_fns/frame_order.py Mon Aug 16 18:26:31 2010
@@ -107,9 +107,9 @@
             param_vect.append(cdp.cone_theta_y)
 
         # Cone parameters - single isotropic angle or order parameter.
-        elif cdp.model in ['iso cone']:
+        elif cdp.model in ['iso cone', 'iso cone, torsionless']:
             param_vect.append(cdp.cone_theta)
-        elif cdp.model in ['iso cone, torsionless', 'iso cone, free rotor']:
+        elif cdp.model in ['iso cone, free rotor']:
             param_vect.append(cdp.cone_s1)
 
         # Cone parameters - torsion angle.
@@ -514,9 +514,9 @@
                 cdp.params.append('cone_theta_y')
 
             # Cone parameters - single isotropic angle or order parameter.
-            elif cdp.model in ['iso cone']:
+            elif cdp.model in ['iso cone', 'iso cone, torsionless']:
                 cdp.params.append('cone_theta')
-            elif cdp.model in ['iso cone, torsionless', 'iso cone, free 
rotor']:
+            elif cdp.model in ['iso cone, free rotor']:
                 cdp.params.append('cone_s1')
 
             # Cone parameters - torsion angle.
@@ -810,9 +810,9 @@
                 names.append('cone_theta_y%s' % suffix)
 
             # Cone parameters - single isotropic angle or order parameter.
-            elif cdp.model in ['iso cone']:
+            elif cdp.model in ['iso cone', 'iso cone, torsionless']:
                 names.append('cone_theta%s' % suffix)
-            elif cdp.model in ['iso cone, torsionless', 'iso cone, free 
rotor']:
+            elif cdp.model in ['iso cone, free rotor']:
                 names.append('cone_s1%s' % suffix)
 
             # Cone parameters - torsion angle.