r23845 - /branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py -- June 11, 2014 - 17:09

Author: tlinnet
Date: Wed Jun 11 17:09:23 2014
New Revision: 23845

URL: http://svn.gna.org/viewcvs/relax?rev=23845&view=rev
Log:
Merged revisions 23743 via svnmerge from 
svn+ssh://tlinnet@xxxxxxxxxxx/svn/relax/trunk

........
  r23743 | tlinnet | 2014-06-08 22:42:55 +0200 (Sun, 08 Jun 2014) | 6 lines
  
  Updated profiling text for CR72 model.
  
  Now it is tested for 3 fields.
  
  This is related to:
  Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.
........

Added:
    
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
      - copied, changed from r23844, 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py

Copied: 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
 (from r23844, 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py)
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py?p2=branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py&p1=branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py&r1=23844&r2=23845&rev=23845&view=diff
==============================================================================
--- 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_cr72.py
      (original)
+++ 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_b14.py
       Wed Jun 11 17:09:23 2014
@@ -45,7 +45,7 @@
 
 # relax module imports.
 from lib.physical_constants import g1H, g15N
-from lib.dispersion.cr72 import r2eff_CR72
+from lib.dispersion.cr72 import r2eff_B14
 from target_functions.chi2 import chi2
 from target_functions.relax_disp import Dispersion
 from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG_SQ, 
MODEL_B14_FULL, MODEL_CR72, MODEL_CR72_FULL, MODEL_NS_CPMG_2SITE_3D_FULL, 
MODEL_NS_CPMG_2SITE_STAR_FULL