Author: bugman
Date: Wed Feb 20 10:11:10 2013
New Revision: 18516
URL: http://svn.gna.org/viewcvs/relax?rev=18516&view=rev
Log:
Merged revisions 18513-18514 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r18513 | bugman | 2013-02-20 09:57:26 +0100 (Wed, 20 Feb 2013) | 5 lines
The spectrometer frequency is now set in the
Mf.test_bug_20531_molmol_macro_write_relaxfault system test.
This is needed for the Rex scaling.
........
r18514 | bugman | 2013-02-20 10:03:36 +0100 (Wed, 20 Feb 2013) | 8 lines
Fix for the classic_style() method of the model-free specific Macro class.
This was identified by the new
Mf.test_bug_20531_molmol_macro_write_relaxfault system test, but
would probably never be encountered by users. It is not related to the bug
this test is trying to
catch. The problem is if spins have model-free parameters set up but there
is no model-free model
initialised - then the Molmol and PyMOL macro creation would fail.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/specific_fns/model_free/macro_base.py
branches/frame_order_testing/test_suite/system_tests/model_free.py
Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb 20 10:11:10 2013
@@ -1,1 +1,1 @@
-/trunk:1-18511
+/trunk:1-18514
Modified: branches/frame_order_testing/specific_fns/model_free/macro_base.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/macro_base.py?rev=18516&r1=18515&r2=18516&view=diff
==============================================================================
--- branches/frame_order_testing/specific_fns/model_free/macro_base.py
(original)
+++ branches/frame_order_testing/specific_fns/model_free/macro_base.py Wed
Feb 20 10:11:10 2013
@@ -85,8 +85,8 @@
if data_type == 's2':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# Skip spins which don't have an S2 value.
@@ -104,8 +104,8 @@
elif data_type == 's2f':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# The backbone NH.
@@ -125,8 +125,8 @@
elif data_type == 's2s':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# The backbone NH.
@@ -146,8 +146,8 @@
elif data_type == 'amp_fast':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# The model.
@@ -185,8 +185,8 @@
elif data_type == 'amp_slow':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# The model.
@@ -215,8 +215,8 @@
elif data_type == 'te':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# Skip spins which don't have a te value.
@@ -234,8 +234,8 @@
elif data_type == 'tf':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# Skip spins which don't have a tf value.
@@ -253,8 +253,8 @@
elif data_type == 'ts':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# Skip spins which don't have a ts value.
@@ -278,8 +278,8 @@
elif data_type == 'time_fast':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# The model.
@@ -310,8 +310,8 @@
elif data_type == 'time_slow':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# The model.
@@ -347,8 +347,8 @@
elif data_type == 'rex':
# Loop over the spins.
for spin, mol_name, res_num, res_name in spin_loop(spin_id,
full_info=True):
- # Skip deselected spins.
- if not spin.select:
+ # Skip deselected spins or spins with no model information
set.
+ if not spin.select or not hasattr(spin, 'model'):
continue
# The backbone NH.
Modified: branches/frame_order_testing/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/model_free.py?rev=18516&r1=18515&r2=18516&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/model_free.py
(original)
+++ branches/frame_order_testing/test_suite/system_tests/model_free.py Wed
Feb 20 10:11:10 2013
@@ -301,6 +301,9 @@
# The models to create.
models = ['m0', 'm1', 'm2', 'm3', 'm4', 'm5', 'm6', 'm7', 'm8',
'm9'] + ['tm0', 'tm1', 'tm2', 'tm3', 'tm4', 'tm5', 'tm6', 'tm7', 'tm8', 'tm9']
+
+ # Set the spectrometer frequency.
+ self.interpreter.frq.set(id='600', frq=600000000.1)
# Loop over the models.
for i in range(len(models)):
r18516 - in /branches/frame_order_testing: ./ specific_fns/model_free/macro_base.py test_suite/system_tests/model_free.py