Author: bugman
Date: Tue Nov 11 17:28:08 2014
New Revision: 26536
URL: http://svn.gna.org/viewcvs/relax?rev=26536&view=rev
Log:
Python 3 fixes via 2to3 - the spacing around commas has been fixed.
The command used was:
2to3 -j 4 -w -f ws_comma .
Modified:
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_solution.py
branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_iso_cone.py
branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_pseudo_ellipse.py
branches/frame_order_cleanup/test_suite/system_tests/frame_order.py
Modified:
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py?rev=26536&r1=26535&r2=26536&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py
(original)
+++
branches/frame_order_cleanup/test_suite/shared_data/frame_order/cam/rotor/frame_order_free_start.py
Tue Nov 11 17:28:08 2014
@@ -76,7 +76,7 @@
value.set(param='ave_pos_gamma', val=AVE_POS_GAMMA)
# Free the pivot, and set it to the CoM of both domains which is far enough
away from the real pivot.
-frame_order.pivot([ 34.721619683345111, -2.63891199102997 ,
12.941974078087899], fix=False)
+frame_order.pivot([ 34.721619683345111, -2.63891199102997,
12.941974078087899], fix=False)
# Zooming grid search (low quality for speed).
time()
Modified:
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py?rev=26536&r1=26535&r2=26536&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
(original)
+++
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_simulate.py
Tue Nov 11 17:28:08 2014
@@ -71,9 +71,9 @@
# Build the frame.
EIG_FRAME = zeros((3, 3), float64)
- EIG_FRAME[:,0] = vect_x
- EIG_FRAME[:,1] = vect_y
- EIG_FRAME[:,2] = vect_z
+ EIG_FRAME[:, 0] = vect_x
+ EIG_FRAME[:, 1] = vect_y
+ EIG_FRAME[:, 2] = vect_z
Modified:
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_solution.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_solution.py?rev=26536&r1=26535&r2=26536&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_solution.py
(original)
+++
branches/frame_order_cleanup/test_suite/shared_data/frame_order/sim_vs_pred_matrix/frame_order_solution.py
Tue Nov 11 17:28:08 2014
@@ -219,9 +219,9 @@
# Build the frame.
self.eigenframe = zeros((3, 3), float64)
- self.eigenframe[:,0] = vect_x
- self.eigenframe[:,1] = vect_y
- self.eigenframe[:,2] = vect_z
+ self.eigenframe[:, 0] = vect_x
+ self.eigenframe[:, 1] = vect_y
+ self.eigenframe[:, 2] = vect_z
def write_data(self, file_name=None, model=None, model_text=None,
var=None):
Modified:
branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_iso_cone.py?rev=26536&r1=26535&r2=26536&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_iso_cone.py
(original)
+++
branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_iso_cone.py
Tue Nov 11 17:28:08 2014
@@ -70,7 +70,7 @@
align_tensor.reduction(full_tensor='Er N-dom', red_tensor='Er C-dom')
frame_order.select_model(model='iso cone')
frame_order.ref_domain(ref='N')
-frame_order.pivot(pivot=array([ 37.254001617431641, 0.5 ,
16.746500015258789], dtype=float64), order=1, fix=True)
+frame_order.pivot(pivot=array([ 37.254001617431641, 0.5,
16.746500015258789], dtype=float64), order=1, fix=True)
paramag.centre(pos=[35.934, 12.194, -4.206], atom_id=None, pipe=None,
verbosity=1, fix=True, ave_pos=True, force=False)
frame_order.num_int_pts(num=2000)
value.set(val=-21.269217407269576, param='ave_pos_x', index=0, spin_id=None,
error=False)
Modified:
branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_pseudo_ellipse.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_pseudo_ellipse.py?rev=26536&r1=26535&r2=26536&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_pseudo_ellipse.py
(original)
+++
branches/frame_order_cleanup/test_suite/shared_data/frame_order/timings/profiling_pseudo_ellipse.py
Tue Nov 11 17:28:08 2014
@@ -70,7 +70,7 @@
align_tensor.reduction(full_tensor='Er N-dom', red_tensor='Er C-dom')
frame_order.select_model(model='pseudo-ellipse')
frame_order.ref_domain(ref='N')
-frame_order.pivot(pivot=array([ 37.254001617431641, 0.5 ,
16.746500015258789], dtype=float64), order=1, fix=True)
+frame_order.pivot(pivot=array([ 37.254001617431641, 0.5,
16.746500015258789], dtype=float64), order=1, fix=True)
paramag.centre(pos=[35.934, 12.194, -4.206], atom_id=None, pipe=None,
verbosity=1, fix=True, ave_pos=True, force=False)
frame_order.num_int_pts(num=600)
value.set(val=-21.269217407269576, param='ave_pos_x', index=0, spin_id=None,
error=False)
Modified: branches/frame_order_cleanup/test_suite/system_tests/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/frame_order.py?rev=26536&r1=26535&r2=26536&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/frame_order.py
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/frame_order.py Tue
Nov 11 17:28:08 2014
@@ -302,7 +302,7 @@
# The optimised Eigenframe.
frame = array([[ 0.519591643135168, -0.302150522797118,
-0.799205596800676],
- [ 0.62357991685585 , -0.505348769456744,
0.596465177946379],
+ [ 0.62357991685585, -0.505348769456744,
0.596465177946379],
[-0.584099830232939, -0.808286881485765,
-0.074159999594586]], float64)
# Manually permute the frame, and then obtain the Euler angles.
@@ -345,7 +345,7 @@
# The optimised Eigenframe.
frame = array([[ 0.519591643135168, -0.302150522797118,
-0.799205596800676],
- [ 0.62357991685585 , -0.505348769456744,
0.596465177946379],
+ [ 0.62357991685585, -0.505348769456744,
0.596465177946379],
[-0.584099830232939, -0.808286881485765,
-0.074159999594586]], float64)
# Manually permute the frame, and then obtain the Euler angles.
@@ -388,7 +388,7 @@
# The optimised Eigenframe.
frame = array([[ 0.519591643135168, -0.302150522797118,
-0.799205596800676],
- [ 0.62357991685585 , -0.505348769456744,
0.596465177946379],
+ [ 0.62357991685585, -0.505348769456744,
0.596465177946379],
[-0.584099830232939, -0.808286881485765,
-0.074159999594586]], float64)
# Manually permute the frame, and then obtain the Euler angles.
@@ -431,7 +431,7 @@
# The optimised Eigenframe.
frame = array([[ 0.519591643135168, -0.302150522797118,
-0.799205596800676],
- [ 0.62357991685585 , -0.505348769456744,
0.596465177946379],
+ [ 0.62357991685585, -0.505348769456744,
0.596465177946379],
[-0.584099830232939, -0.808286881485765,
-0.074159999594586]], float64)
# Manually permute the frame, and then obtain the Euler angles.
@@ -472,7 +472,7 @@
# The optimised Eigenframe.
frame = array([[ 0.519591643135168, -0.302150522797118,
-0.799205596800676],
- [ 0.62357991685585 , -0.505348769456744,
0.596465177946379],
+ [ 0.62357991685585, -0.505348769456744,
0.596465177946379],
[-0.584099830232939, -0.808286881485765,
-0.074159999594586]], float64)
# Manually permute the frame, and then obtain the Euler angles.
@@ -513,7 +513,7 @@
# The optimised Eigenframe.
frame = array([[ 0.519591643135168, -0.302150522797118,
-0.799205596800676],
- [ 0.62357991685585 , -0.505348769456744,
0.596465177946379],
+ [ 0.62357991685585, -0.505348769456744,
0.596465177946379],
[-0.584099830232939, -0.808286881485765,
-0.074159999594586]], float64)
# Manually permute the frame, and then obtain the Euler angles.
r26536 - in /branches/frame_order_cleanup/test_suite: shared_data/frame_order/cam/rotor/ shared_data/frame_order/sim_vs_pred...