r6743 - /1.3/test_suite/system_tests/scripts/omp_model_free.py -- July 05, 2008 - 15:29

Author: bugman
Date: Sat Jul  5 14:47:44 2008
New Revision: 6743

URL: http://svn.gna.org/viewcvs/relax?rev=6743&view=rev
Log:
Expanded the OMP model-free optimisation system test.

The initial round of spherical diffusion optimisation (removal of tm and 
diffusion tensor opt) is
now tested.  The first round of normal optimisation is also implemented with 
the optimisation of the
model-free models and model selection.


Modified:
    1.3/test_suite/system_tests/scripts/omp_model_free.py

Modified: 1.3/test_suite/system_tests/scripts/omp_model_free.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/test_suite/system_tests/scripts/omp_model_free.py?rev=6743&r1=6742&r2=6743&view=diff
==============================================================================
--- 1.3/test_suite/system_tests/scripts/omp_model_free.py (original)
+++ 1.3/test_suite/system_tests/scripts/omp_model_free.py Sat Jul  5 14:47:44 
2008
@@ -43,6 +43,41 @@
 
         # Sequential optimisation of all model-free models (function must be 
modified to suit).
         self.multi_model(local_tm=True)
+
+        # Model selection.
+        self.model_selection(pipe='aic')
+
+
+        #######################
+        # Spherical diffusion #
+        #######################
+
+        # Initial round of optimisation.
+        ################################
+
+        # Copy the model selection data pipe to a new pipe for the spherical 
diffusion tensor.
+        pipe.copy('aic', 'sphere')
+
+        # Remove the tm parameter.
+        model_free.remove_tm()
+
+        # Set up the diffusion tensor.
+        diffusion_tensor.init(10e-9, fixed=False)
+
+        # Minimise just the diffusion tensor.
+        fix('all_res')
+        grid_search(inc=GRID_INC)
+        minimise(MIN_ALGOR)
+
+        # Write the results.
+        results.write(file='devnull', force=True)
+
+
+        # Normal optimisation.
+        ######################
+
+        # Sequential optimisation of all model-free models.
+        self.multi_model(local_tm=False)
 
         # Model selection.
         self.model_selection(pipe='aic')