r24128 - /branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py -- June 18, 2014 - 19:15

Author: tlinnet
Date: Wed Jun 18 19:15:19 2014
New Revision: 24128

URL: http://svn.gna.org/viewcvs/relax?rev=24128&view=rev
Log:
Modified profiling script for B14, to R20A=R20B.

Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.

Modified:
    
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py

Modified: 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py?rev=24128&r1=24127&r2=24128&view=diff
==============================================================================
--- 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
       (original)
+++ 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
       Wed Jun 18 19:15:19 2014
@@ -436,7 +436,7 @@
         return chi2
 
 
-def single(num_spins=1, model=MODEL_B14_FULL, iter=None):
+def single(num_spins=1, model=MODEL_B14, iter=None):
     """Calculate for a single spin.
 
     @keyword num_spins:     Number of spins in the cluster.
@@ -450,7 +450,7 @@
     """
 
     # Instantiate class
-    C1 = Profile(num_spins=num_spins, model=model, r2a=5.0, r2b=10.0, 
dw=3.0, pA=0.9, kex=1000.0, spins_params=['r2a', 'r2b', 'dw', 'pA', 'kex'])
+    C1 = Profile(num_spins=num_spins, model=model, r2=5.0, dw=3.0, pA=0.9, 
kex=1000.0, spins_params=['r2', 'dw', 'pA', 'kex'])
 
     # Loop 100 times for each spin in the clustered analysis (to make the 
timing numbers equivalent).
     for spin_index in xrange(100):
@@ -460,7 +460,7 @@
     print("chi2 single:", chi2)
 
 
-def cluster(num_spins=100, model=MODEL_B14_FULL, iter=None):
+def cluster(num_spins=100, model=MODEL_B14, iter=None):
     """Calculate for a number of clustered spins.
 
     @keyword num_spins:     Number of spins in the cluster.