Author: bugman
Date: Mon Apr 8 16:49:17 2013
New Revision: 19404
URL: http://svn.gna.org/viewcvs/relax?rev=19404&view=rev
Log:
Fixes for the change of the grace.write user function data type 'spin' to
'res_num'.
Modified:
trunk/auto_analyses/dauvergne_protocol.py
trunk/sample_scripts/model_free/final_data_extraction.py
trunk/test_suite/system_tests/grace.py
trunk/test_suite/system_tests/model_free.py
Modified: trunk/auto_analyses/dauvergne_protocol.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/dauvergne_protocol.py?rev=19404&r1=19403&r2=19404&view=diff
==============================================================================
--- trunk/auto_analyses/dauvergne_protocol.py (original)
+++ trunk/auto_analyses/dauvergne_protocol.py Mon Apr 8 16:49:17 2013
@@ -888,16 +888,16 @@
# The Grace plots.
dir = self.write_results_dir + 'final' + sep + 'grace'
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2',
file='s2.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2f',
file='s2f.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2s',
file='s2s.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='te',
file='te.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='tf',
file='tf.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='ts',
file='ts.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='rex',
file='rex.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='s2', y_data_type='te',
file='s2_vs_te.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='s2', y_data_type='rex',
file='s2_vs_rex.agr', dir=dir, force=True)
- self.interpreter.grace.write(x_data_type='te', y_data_type='rex',
file='te_vs_rex.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2', file='s2.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2f', file='s2f.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2s', file='s2s.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='te', file='te.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='tf', file='tf.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='ts', file='ts.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='rex', file='rex.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='s2',
y_data_type='te', file='s2_vs_te.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='s2',
y_data_type='rex', file='s2_vs_rex.agr', dir=dir, force=True)
+ self.interpreter.grace.write(x_data_type='te',
y_data_type='rex', file='te_vs_rex.agr', dir=dir, force=True)
# Write the values to text files.
dir = self.write_results_dir + 'final'
Modified: trunk/sample_scripts/model_free/final_data_extraction.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/sample_scripts/model_free/final_data_extraction.py?rev=19404&r1=19403&r2=19404&view=diff
==============================================================================
--- trunk/sample_scripts/model_free/final_data_extraction.py (original)
+++ trunk/sample_scripts/model_free/final_data_extraction.py Mon Apr 8
16:49:17 2013
@@ -118,13 +118,13 @@
#Create Grace Plots
-grace.write(x_data_type='spin', y_data_type='s2', file='s2.agr', force=True)
-grace.write(x_data_type='spin', y_data_type='te', file='te.agr', force=True)
-grace.write(x_data_type='spin', y_data_type='s2f', file='s2f.agr',
force=True)
-grace.write(x_data_type='spin', y_data_type='s2s', file='s2s.agr',
force=True)
-grace.write(x_data_type='spin', y_data_type='ts', file='ts.agr', force=True)
-grace.write(x_data_type='spin', y_data_type='tf', file='tf.agr', force=True)
-grace.write(x_data_type='spin', y_data_type='csa', file='csa.agr',
force=True)
+grace.write(x_data_type='res_num', y_data_type='s2', file='s2.agr',
force=True)
+grace.write(x_data_type='res_num', y_data_type='te', file='te.agr',
force=True)
+grace.write(x_data_type='res_num', y_data_type='s2f', file='s2f.agr',
force=True)
+grace.write(x_data_type='res_num', y_data_type='s2s', file='s2s.agr',
force=True)
+grace.write(x_data_type='res_num', y_data_type='ts', file='ts.agr',
force=True)
+grace.write(x_data_type='res_num', y_data_type='tf', file='tf.agr',
force=True)
+grace.write(x_data_type='res_num', y_data_type='csa', file='csa.agr',
force=True)
grace.write(x_data_type='te', y_data_type='s2', file='s2-te.agr', force=True)
Modified: trunk/test_suite/system_tests/grace.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/grace.py?rev=19404&r1=19403&r2=19404&view=diff
==============================================================================
--- trunk/test_suite/system_tests/grace.py (original)
+++ trunk/test_suite/system_tests/grace.py Mon Apr 8 16:49:17 2013
@@ -46,7 +46,7 @@
self.interpreter.state.load('state_cam_kkalpha',
dir=status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'saved_states')
# Create the plot.
- self.interpreter.grace.write('spin', 's2', file=self.tmpfile,
spin_id='@N', dir=None)
+ self.interpreter.grace.write('res_num', 's2', file=self.tmpfile,
spin_id='@N', dir=None)
# Read the file data.
file = open(self.tmpfile)
Modified: trunk/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/model_free.py?rev=19404&r1=19403&r2=19404&view=diff
==============================================================================
--- trunk/test_suite/system_tests/model_free.py (original)
+++ trunk/test_suite/system_tests/model_free.py Mon Apr 8 16:49:17 2013
@@ -343,16 +343,16 @@
self.interpreter.pymol.macro_write(data_type='rex',
dir=ds.tmpdir, force=True)
# Attempt to create the Grace plots.
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2',
file='s2.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2f',
file='s2f.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2s',
file='s2s.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='te',
file='te.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='tf',
file='tf.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='ts',
file='ts.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='rex',
file='rex.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='s2', y_data_type='te',
file='s2_vs_te.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='s2', y_data_type='rex',
file='s2_vs_rex.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='te', y_data_type='rex',
file='te_vs_rex.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2', file='s2.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2f', file='s2f.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2s', file='s2s.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='te', file='te.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='tf', file='tf.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='ts', file='ts.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='rex', file='rex.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='s2',
y_data_type='te', file='s2_vs_te.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='s2',
y_data_type='rex', file='s2_vs_rex.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='te',
y_data_type='rex', file='te_vs_rex.agr', dir=ds.tmpdir, force=True)
# Attempt to create the text files of the values.
self.interpreter.value.write(param='s2', file='s2.txt',
dir=ds.tmpdir, force=True)
@@ -429,16 +429,16 @@
self.interpreter.pymol.macro_write(data_type='rex',
dir=ds.tmpdir, force=True)
# Attempt to create the Grace plots.
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2',
file='s2.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2f',
file='s2f.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='s2s',
file='s2s.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='te',
file='te.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='tf',
file='tf.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='ts',
file='ts.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='spin', y_data_type='rex',
file='rex.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='s2', y_data_type='te',
file='s2_vs_te.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='s2', y_data_type='rex',
file='s2_vs_rex.agr', dir=ds.tmpdir, force=True)
- self.interpreter.grace.write(x_data_type='te', y_data_type='rex',
file='te_vs_rex.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2', file='s2.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2f', file='s2f.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='s2s', file='s2s.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='te', file='te.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='tf', file='tf.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='ts', file='ts.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='res_num',
y_data_type='rex', file='rex.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='s2',
y_data_type='te', file='s2_vs_te.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='s2',
y_data_type='rex', file='s2_vs_rex.agr', dir=ds.tmpdir, force=True)
+ self.interpreter.grace.write(x_data_type='te',
y_data_type='rex', file='te_vs_rex.agr', dir=ds.tmpdir, force=True)
# Attempt to create the text files of the values.
self.interpreter.value.write(param='s2', file='s2.txt',
dir=ds.tmpdir, force=True)
r19404 - in /trunk: auto_analyses/ sample_scripts/model_free/ test_suite/system_tests/