Author: bugman
Date: Tue Oct 2 16:54:57 2012
New Revision: 17678
URL: http://svn.gna.org/viewcvs/relax?rev=17678&view=rev
Log:
Python 3 fix for the frame order system tests - float to string conversions
behave differently.
Now the explicit %.1f formatting is used to force only a single decimal place
float.
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py?rev=17678&r1=17677&r2=17678&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py
(original)
+++ trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone.py
Tue Oct 2 16:54:57 2012
@@ -46,7 +46,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_alpha = cdp.ave_pos_alpha2 = 0.0
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py?rev=17678&r1=17677&r2=17678&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
Tue Oct 2 16:54:57 2012
@@ -46,7 +46,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_beta = 78.75 / 360.0 * 2.0 * pi
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py?rev=17678&r1=17677&r2=17678&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor_eigenframe.py
Tue Oct 2 16:54:57 2012
@@ -42,7 +42,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_beta = 101.25 / 360.0 * 2.0 * pi
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py?rev=17678&r1=17677&r2=17678&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse.py
Tue Oct 2 16:54:57 2012
@@ -46,7 +46,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_alpha = cdp.ave_pos_alpha2 = 0.0
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py?rev=17678&r1=17677&r2=17678&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_free_rotor.py
Tue Oct 2 16:54:57 2012
@@ -62,7 +62,7 @@
# Loop over the cones.
for i in range(INC):
# Switch data pipes.
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
get_angle(i, incs=INC, deg=True))
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
get_angle(i, incs=INC, deg=True))
# Data init.
for j in range(len(params)):
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py?rev=17678&r1=17677&r2=17678&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/pseudo_ellipse_torsionless.py
Tue Oct 2 16:54:57 2012
@@ -46,7 +46,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_alpha = 1.0
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py?rev=17678&r1=17677&r2=17678&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py
(original)
+++ trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py
Tue Oct 2 16:54:57 2012
@@ -44,7 +44,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_beta = cdp.ave_pos_beta2 = 123.75 / 360.0 * 2.0 * pi
Modified:
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py?rev=17678&r1=17677&r2=17678&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor_eigenframe.py
Tue Oct 2 16:54:57 2012
@@ -38,7 +38,7 @@
for i in range(INC):
# Switch data pipes.
ds.angles.append(get_angle(i, incs=INC, deg=True))
- self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%s_deg' %
ds.angles[-1])
+ self._execute_uf(uf_name='pipe.switch', pipe_name='cone_%.1f_deg' %
ds.angles[-1])
# Data init.
cdp.ave_pos_beta = cdp.ave_pos_beta2 = 22.5 / 360.0 * 2.0 * pi
r17678 - /trunk/test_suite/system_tests/scripts/frame_order/model_calcs/