Author: bugman
Date: Wed Jul 9 11:08:10 2008
New Revision: 6858
URL: http://svn.gna.org/viewcvs/relax?rev=6858&view=rev
Log:
Merged revisions 6838,6840 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r6838 | semor | 2008-07-08 20:25:14 +0200 (Tue, 08 Jul 2008) | 7 lines
Changes some calls to R to calls to CoM.
A discussion on this topic is available at:
https://mail.gna.org/public/relax-devel/2008-07/msg00024.html (message ID:
48736C7F.5040304@xxxxxxxxx)
........
r6840 | semor | 2008-07-08 20:51:04 +0200 (Tue, 08 Jul 2008) | 3 lines
Switched from os.devnull to devnull from relax_io.open_write_file().
........
Modified:
branches/rdc_analysis/ (props changed)
branches/rdc_analysis/generic_fns/structure/geometric.py
branches/rdc_analysis/test_suite/system_tests/scripts/consistency_tests.py
branches/rdc_analysis/test_suite/system_tests/scripts/jw_mapping.py
Propchange: branches/rdc_analysis/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 9 11:08:10 2008
@@ -1,1 +1,1 @@
-/1.3:1-6835
+/1.3:1-6857
Modified: branches/rdc_analysis/generic_fns/structure/geometric.py
URL:
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/generic_fns/structure/geometric.py?rev=6858&r1=6857&r2=6858&view=diff
==============================================================================
--- branches/rdc_analysis/generic_fns/structure/geometric.py (original)
+++ branches/rdc_analysis/generic_fns/structure/geometric.py Wed Jul 9
11:08:10 2008
@@ -260,7 +260,7 @@
sim_vectors = None
# Generate the axes representation.
- res_num = generate_vector_residues(structure=structure,
vector=pipe.diff_tensor.Dpar*pipe.diff_tensor.Dpar_unit, atom_name='Dpar',
res_name_vect='AXS', sim_vectors=sim_vectors, chain_id=chain_id,
res_num=res_num, origin=R, scale=scale, neg=True)
+ res_num = generate_vector_residues(structure=structure,
vector=pipe.diff_tensor.Dpar*pipe.diff_tensor.Dpar_unit, atom_name='Dpar',
res_name_vect='AXS', sim_vectors=sim_vectors, chain_id=chain_id,
res_num=res_num, origin=CoM, scale=scale, neg=True)
# Create the three axes of the ellipsoid.
@@ -280,9 +280,9 @@
sim_Dz_vectors = None
# Generate the axes representation.
- res_num = generate_vector_residues(structure=structure,
vector=pipe.diff_tensor.Dx*pipe.diff_tensor.Dx_unit, atom_name='Dpar',
res_name_vect='AXS', sim_vectors=sim_Dx_vectors, chain_id=chain_id,
res_num=res_num, origin=R, scale=scale, neg=True)
- res_num = generate_vector_residues(structure=structure,
vector=pipe.diff_tensor.Dy*pipe.diff_tensor.Dy_unit, atom_name='Dpar',
res_name_vect='AXS', sim_vectors=sim_Dy_vectors, chain_id=chain_id,
res_num=res_num, origin=R, scale=scale, neg=True)
- res_num = generate_vector_residues(structure=structure,
vector=pipe.diff_tensor.Dz*pipe.diff_tensor.Dz_unit, atom_name='Dpar',
res_name_vect='AXS', sim_vectors=sim_Dz_vectors, chain_id=chain_id,
res_num=res_num, origin=R, scale=scale, neg=True)
+ res_num = generate_vector_residues(structure=structure,
vector=pipe.diff_tensor.Dx*pipe.diff_tensor.Dx_unit, atom_name='Dpar',
res_name_vect='AXS', sim_vectors=sim_Dx_vectors, chain_id=chain_id,
res_num=res_num, origin=CoM, scale=scale, neg=True)
+ res_num = generate_vector_residues(structure=structure,
vector=pipe.diff_tensor.Dy*pipe.diff_tensor.Dy_unit, atom_name='Dpar',
res_name_vect='AXS', sim_vectors=sim_Dy_vectors, chain_id=chain_id,
res_num=res_num, origin=CoM, scale=scale, neg=True)
+ res_num = generate_vector_residues(structure=structure,
vector=pipe.diff_tensor.Dz*pipe.diff_tensor.Dz_unit, atom_name='Dpar',
res_name_vect='AXS', sim_vectors=sim_Dz_vectors, chain_id=chain_id,
res_num=res_num, origin=CoM, scale=scale, neg=True)
# Create the PDB file.
Modified:
branches/rdc_analysis/test_suite/system_tests/scripts/consistency_tests.py
URL:
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/test_suite/system_tests/scripts/consistency_tests.py?rev=6858&r1=6857&r2=6858&view=diff
==============================================================================
---
branches/rdc_analysis/test_suite/system_tests/scripts/consistency_tests.py
(original)
+++
branches/rdc_analysis/test_suite/system_tests/scripts/consistency_tests.py
Wed Jul 9 11:08:10 2008
@@ -3,6 +3,8 @@
# Python module imports.
from os import devnull
import sys
+# relax module imports.
+from relax_io import open_write_file
# Create the run.
name = 'consistency'
@@ -43,10 +45,10 @@
monte_carlo.error_analysis()
# Create grace files.
-grace.write(y_data_type='j0', file=devnull, force=True)
-grace.write(y_data_type='f_eta', file=devnull, force=True)
-grace.write(y_data_type='f_r2', file=devnull, force=True)
+grace.write(y_data_type='j0', file='devnull', force=True)
+grace.write(y_data_type='f_eta', file='devnull', force=True)
+grace.write(y_data_type='f_r2', file='devnull', force=True)
# Finish.
-results.write(file=devnull, force=True)
-state.save(devnull, force=True)
+results.write(file='devnull', force=True)
+state.save('devnull', force=True)
Modified: branches/rdc_analysis/test_suite/system_tests/scripts/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/test_suite/system_tests/scripts/jw_mapping.py?rev=6858&r1=6857&r2=6858&view=diff
==============================================================================
--- branches/rdc_analysis/test_suite/system_tests/scripts/jw_mapping.py
(original)
+++ branches/rdc_analysis/test_suite/system_tests/scripts/jw_mapping.py Wed
Jul 9 11:08:10 2008
@@ -3,6 +3,8 @@
# Python module imports.
from os import devnull
import sys
+# relax module imports.
+from relax_io import open_write_file
# Create the run.
name = 'jw_mapping'
@@ -37,10 +39,10 @@
monte_carlo.error_analysis()
# Create grace files.
-grace.write(y_data_type='j0', file=devnull, force=True)
-grace.write(y_data_type='jwx', file=devnull, force=True)
-grace.write(y_data_type='jwh', file=devnull, force=True)
+grace.write(y_data_type='j0', file='devnull', force=True)
+grace.write(y_data_type='jwx', file='devnull', force=True)
+grace.write(y_data_type='jwh', file='devnull', force=True)
# Finish.
-results.write(file=devnull, force=True)
-state.save(devnull, force=True)
+results.write(file='devnull', force=True)
+state.save('devnull', force=True)
r6858 - in /branches/rdc_analysis: ./ generic_fns/structure/ test_suite/system_tests/scripts/