r10838 - in /1.3/test_suite/system_tests: n_state_model.py scripts/n_state_model/stereochem_analysis.py -- February 23, 2010 - 02:41

Author: bugman
Date: Tue Feb 23 02:41:04 2010
New Revision: 10838

URL: http://svn.gna.org/viewcvs/relax?rev=10838&view=rev
Log:
Fixes for the N_state_model.test_stereochem_analysis system test for the new 
normalised NOE plots.


Modified:
    1.3/test_suite/system_tests/n_state_model.py
    1.3/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py

Modified: 1.3/test_suite/system_tests/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/n_state_model.py?rev=10838&r1=10837&r2=10838&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/n_state_model.py (original)
+++ 1.3/test_suite/system_tests/n_state_model.py Tue Feb 23 02:41:04 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: 
1.3/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py?rev=10838&r1=10837&r2=10838&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py 
(original)
+++ 1.3/test_suite/system_tests/scripts/n_state_model/stereochem_analysis.py 
Tue Feb 23 02:41:04 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,