r23069 - in /trunk/test_suite/system_tests: relax_disp.py scripts/relax_disp/cpmg_synthetic.py -- May 07, 2014 - 22:01

Author: tlinnet
Date: Wed May  7 22:01:03 2014
New Revision: 23069

URL: http://svn.gna.org/viewcvs/relax?rev=23069&view=rev
Log:
Fixed systemtest Relax_disp.test_cpmg_synthetic_cr72 and 
Relax_disp.test_cpmg_synthetic_cr72_full_noise_cluster.

This was after change of the synthetic script.

Modified:
    trunk/test_suite/system_tests/relax_disp.py
    trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py

Modified: trunk/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=23069&r1=23068&r2=23069&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Wed May  7 22:01:03 2014
@@ -965,7 +965,8 @@
         #self.interpreter.reset()
 
         ## Set Experiments.
-        model = "CR72"
+        model_create = 'CR72'
+        model_analyse = 'CR72'
         # Exp 1
         sfrq_1 = 599.8908617*1E6
         r20_key_1 = generate_r20_key(exp_type=EXP_TYPE_CPMG_SQ, frq=sfrq_1)
@@ -989,7 +990,7 @@
             ]
 
         # Collect the data to be used.
-        ds.data = [model, spins, exps]
+        ds.data = [model_create, model_analyse, spins, exps]
 
         # The tmp directory. None is the local directory.
         ds.tmpdir = ds.tmpdir
@@ -1042,7 +1043,7 @@
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp'+sep+'cpmg_synthetic.py')
 
-        cur_spins = ds.data[1]
+        cur_spins = ds.data[2]
         # Compare results.
         for i in range(len(cur_spins)):
             res_name, res_num, spin_name, params = cur_spins[i]
@@ -1096,7 +1097,9 @@
         #self.interpreter.reset()
 
         ## Set Experiments.
-        model = "CR72"
+        model_create = 'CR72'
+        model_analyse = 'CR72'
+
         # Exp 1
         sfrq_1 = 599.8908617*1E6
         r20_key_1 = generate_r20_key(exp_type=EXP_TYPE_CPMG_SQ, frq=sfrq_1)
@@ -1123,7 +1126,7 @@
             ]
 
         # Collect the data to be used.
-        ds.data = [model, spins, exps]
+        ds.data = [model_create, model_analyse, spins, exps]
 
         # The tmp directory. None is the local directory.
         ds.tmpdir = ds.tmpdir
@@ -1176,7 +1179,7 @@
         # Execute the script.
         self.interpreter.run(script_file=status.install_path + 
sep+'test_suite'+sep+'system_tests'+sep+'scripts'+sep+'relax_disp'+sep+'cpmg_synthetic.py')
 
-        cur_spins = ds.data[1]
+        cur_spins = ds.data[2]
         # Compare results.
         for i in range(len(cur_spins)):
             res_name, res_num, spin_name, params = cur_spins[i]

Modified: trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py?rev=23069&r1=23068&r2=23069&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py  
(original)
+++ trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py  Wed 
May  7 22:01:03 2014
@@ -164,7 +164,7 @@
 
 # Extract the models
 model_create = ds.data[0]
-model_analyse = model_analyse
+model_analyse = ds.data[1]
 
 # Create the data pipe.
 pipe_name = 'base pipe'