r24111 - /branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_m61.py -- June 18, 2014 - 17:31

Author: tlinnet
Date: Wed Jun 18 17:31:55 2014
New Revision: 24111

URL: http://svn.gna.org/viewcvs/relax?rev=24111&view=rev
Log:
Modified profiling script for M61.

This is the last one.

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_m61.py

Modified: 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_m61.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_m61.py?rev=24111&r1=24110&r2=24111&view=diff
==============================================================================
--- 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_m61.py
       (original)
+++ 
branches/disp_spin_speed/test_suite/shared_data/dispersion/profiling/profiling_m61.py
       Wed Jun 18 17:31:55 2014
@@ -63,7 +63,7 @@
 def main():
     if True:
         # Nr of iterations.
-        nr_iter = 1000
+        nr_iter = 100
 
         # Print statistics.
         verbose = True
@@ -523,11 +523,11 @@
         """
 
         # Return chi2 value.
-        chi2 = self.model.func_DPL94(params)
+        chi2 = self.model.func_M61(params)
         return chi2
 
 
-def single(num_spins=1, model=MODEL_DPL94, iter=None):
+def single(num_spins=1, model=MODEL_M61, iter=None):
     """Calculate for a single spin.
 
     @keyword num_spins:     Number of spins in the cluster.
@@ -551,7 +551,7 @@
     print("chi2 single:", chi2)
 
 
-def cluster(num_spins=100, model=MODEL_DPL94, iter=None):
+def cluster(num_spins=100, model=MODEL_M61, iter=None):
     """Calculate for a number of clustered spins.
 
     @keyword num_spins:     Number of spins in the cluster.