Author: bugman
Date: Mon Jan 10 13:44:58 2011
New Revision: 12173
URL: http://svn.gna.org/viewcvs/relax?rev=12173&view=rev
Log:
The type of spheroid is now being checked in all of the oblate and prolate
system tests.
Modified:
1.3/test_suite/system_tests/diffusion_tensor.py
Modified: 1.3/test_suite/system_tests/diffusion_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/diffusion_tensor.py?rev=12173&r1=12172&r2=12173&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/diffusion_tensor.py (original)
+++ 1.3/test_suite/system_tests/diffusion_tensor.py Mon Jan 10 13:44:58 2011
@@ -667,7 +667,7 @@
self.interpreter.diffusion_tensor.init((tm, Da, theta, phi),
param_types=0, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='oblate')
def test_init_oblate_spheroid_param_types_1(self):
@@ -684,7 +684,7 @@
self.interpreter.diffusion_tensor.init((Diso, Da, theta, phi),
param_types=1, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='oblate')
def test_init_oblate_spheroid_param_types_1_deg(self):
@@ -701,7 +701,7 @@
self.interpreter.diffusion_tensor.init((Diso, Da,
theta/2.0/pi*360.0, phi/2.0/pi*360.0), param_types=1, angle_units='deg')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='oblate')
def test_init_oblate_spheroid_param_types_2(self):
@@ -718,7 +718,7 @@
self.interpreter.diffusion_tensor.init((tm, Dratio, theta, phi),
param_types=2, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='oblate')
def test_init_oblate_spheroid_param_types_3(self):
@@ -735,7 +735,7 @@
self.interpreter.diffusion_tensor.init((Dpar, Dper, theta, phi),
param_types=3, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='oblate')
def test_init_oblate_spheroid_param_types_4(self):
@@ -752,7 +752,7 @@
self.interpreter.diffusion_tensor.init((Diso, Dratio, theta, phi),
param_types=4, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='oblate')
def test_init_prolate_spheroid_as_ellipsoid(self):
@@ -786,7 +786,7 @@
self.interpreter.diffusion_tensor.init((tm, Da, theta, phi),
spheroid_type='prolate', param_types=0, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='prolate')
def test_init_prolate_spheroid_param_types_0b(self):
@@ -820,7 +820,7 @@
self.interpreter.diffusion_tensor.init((Diso, Da, theta, phi),
param_types=1, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='prolate')
def test_init_prolate_spheroid_param_types_1_deg(self):
@@ -837,7 +837,7 @@
self.interpreter.diffusion_tensor.init((Diso, Da,
theta/2.0/pi*360.0, phi/2.0/pi*360.0), param_types=1, angle_units='deg')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='prolate')
def test_init_prolate_spheroid_param_types_2(self):
@@ -854,7 +854,7 @@
self.interpreter.diffusion_tensor.init((tm, Dratio, theta, phi),
param_types=2, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='prolate')
def test_init_prolate_spheroid_param_types_3(self):
@@ -871,7 +871,7 @@
self.interpreter.diffusion_tensor.init((Dpar, Dper, theta, phi),
param_types=3, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='prolate')
def test_init_prolate_spheroid_param_types_4(self):
@@ -888,7 +888,7 @@
self.interpreter.diffusion_tensor.init((Diso, Dratio, theta, phi),
param_types=4, angle_units='rad')
# Check the spheroid.
- self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R)
+ self.check_spheroid(tm, Dpar, Dper, Diso, Da, Dratio, theta, phi, D,
D_prime, R, spheroid_type='prolate')
def test_opt_ellipsoid(self):
r12173 - /1.3/test_suite/system_tests/diffusion_tensor.py