Author: bugman
Date: Tue Feb 23 02:58:43 2010
New Revision: 10843
URL: http://svn.gna.org/viewcvs/relax?rev=10843&view=rev
Log:
Merged revisions 10838,10841-10842 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r10838 | bugman | 2010-02-23 02:41:04 +0100 (Tue, 23 Feb 2010) | 3 lines
Fixes for the N_state_model.test_stereochem_analysis system test for the
new normalised NOE plots.
........
r10841 | bugman | 2010-02-23 02:52:08 +0100 (Tue, 23 Feb 2010) | 3 lines
Fix for the Info_box.package_info() method for when a package is not
installed.
........
r10842 | bugman | 2010-02-23 02:55:39 +0100 (Tue, 23 Feb 2010) | 3 lines
Info_box.sys_info() no longer prints the computer's URL!
........
Modified:
branches/multi_processor_merge/ (props changed)
branches/multi_processor_merge/info.py
branches/multi_processor_merge/test_suite/system_tests/n_state_model.py
branches/multi_processor_merge/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py
Propchange: branches/multi_processor_merge/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 23 02:58:43 2010
@@ -1,1 +1,1 @@
-/1.3:1-10836
+/1.3:1-10842
Modified: branches/multi_processor_merge/info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/info.py?rev=10843&r1=10842&r2=10843&view=diff
==============================================================================
--- branches/multi_processor_merge/info.py (original)
+++ branches/multi_processor_merge/info.py Tue Feb 23 02:58:43 2010
@@ -185,7 +185,7 @@
pkg_info = working_set.find(Requirement.parse(package))
# The package name.
- text = text + (format % ("Name: ", pkg_info.project_name))
+ text = text + (format % ("Name: ", package))
# Not installed.
if pkg_info == None:
@@ -252,7 +252,6 @@
text = text + (format % ("Python revision: ",
platform.python_revision()))
text = text + (format % ("Numpy version: ", numpy.__version__))
text = text + (format % ("Libc version: ", (platform.libc_ver()[0] +
" " + platform.libc_ver()[1])))
- text = text + (format % ("Network name: ", platform.node()))
# Python packages.
text = text + self.package_info(format=format)
Modified:
branches/multi_processor_merge/test_suite/system_tests/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/test_suite/system_tests/n_state_model.py?rev=10843&r1=10842&r2=10843&view=diff
==============================================================================
--- branches/multi_processor_merge/test_suite/system_tests/n_state_model.py
(original)
+++ branches/multi_processor_merge/test_suite/system_tests/n_state_model.py
Tue Feb 23 02:58:43 2010
@@ -238,7 +238,8 @@
# Check the base directory files.
files = listdir(ds.tmpdir)
for file in files:
- self.assert_(file in ['NOE_viol_S_sorted',
'ensembles_superimposed', 'RDC_PAN_dist.agr', 'Q_factors_S',
'NOE_viol_curve.agr', 'NOE_viol_dist.agr', 'RDC_PAN_curve.agr', 'NOE_viol_S',
'Q_factors_R_sorted', 'NOE_results', 'Q_factors_R', 'NOE_viol_R_sorted',
'logs', 'NOE_viol_R', 'Q_factors_S_sorted', 'RDC_PAN_results',
'correlation_plot.agr'])
+ print("Checking file %s." % file)
+ self.assert_(file in ['NOE_viol_S_sorted',
'ensembles_superimposed', 'RDC_PAN_dist.agr', 'Q_factors_S',
'NOE_viol_curve.agr', 'NOE_viol_dist.agr', 'RDC_PAN_curve.agr', 'NOE_viol_S',
'Q_factors_R_sorted', 'NOE_results', 'Q_factors_R', 'NOE_viol_R_sorted',
'logs', 'NOE_viol_R', 'Q_factors_S_sorted', 'RDC_PAN_results',
'correlation_plot.agr', 'correlation_plot_scaled.agr'])
# Check the sub-directory files.
subdirs = ['ensembles_superimposed', 'logs', 'NOE_results',
'RDC_PAN_results']
@@ -248,4 +249,5 @@
['S_results_0.bz2', 'S_results_1.bz2', 'R_results_2.bz2',
'R_results_0.bz2', 'S_results_2.bz2', 'R_results_1.bz2']]
for i in range(len(subdirs)):
for file in listdir(ds.tmpdir + sep + subdirs[i]):
+ print("Checking file %s." % file)
self.assert_(file in files[i])
Modified:
branches/multi_processor_merge/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py?rev=10843&r1=10842&r2=10843&view=diff
==============================================================================
---
branches/multi_processor_merge/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py
(original)
+++
branches/multi_processor_merge/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py
Tue Feb 23 02:58:43 2010
@@ -87,8 +87,9 @@
["Q10", ["@H23", "@H24", "@H25"]]
]
-# NOE file.
+# NOE info.
NOE_FILE = path_noe + "phthalic_acid"
+NOE_NORM = 50 * 4**2
# RDC file info.
RDC_NAME = "PAN"
@@ -129,6 +130,7 @@
snapshot_max=SNAPSHOT_MAX,
pseudo=PSEUDO,
noe_file=NOE_FILE,
+ noe_norm=NOE_NORM,
rdc_name=RDC_NAME,
rdc_file=RDC_FILE,
rdc_spin_id_col=RDC_SPIN_ID_COL,
r10843 - in /branches/multi_processor_merge: ./ test_suite/system_tests/ test_suite/system_tests/scripts/n_state_model/