r9228 - /1.3/test_suite/system_tests/scripts/omp_model_free.py -- July 14, 2009 - 15:26

Author: bugman
Date: Tue Jul 14 15:26:28 2009
New Revision: 9228

URL: http://svn.gna.org/viewcvs/relax?rev=9228&view=rev
Log:
Bug fixes for the OMP model-free system test.

The diffusion tensor MC simulation test was not functional.


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=9228&r1=9227&r2=9228&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 Tue Jul 14 15:26:28 
2009
@@ -97,6 +97,12 @@
         # Final stage.
         ##############
 
+        # Print out.
+        print "\n\n\n"
+        print "Final stage"
+        print "==========="
+        print "\n"
+
         # Unfix all parameters (to switch to the global models).
         fix('all', fixed=False)
 
@@ -128,10 +134,20 @@
         # Another test - MC sims of the diffusion tensor.
         #################################################
 
+        # Print out.
+        print "\n\n\n"
+        print "MC simulations of the diffusion tensor"
+        print "======================================"
+        print "\n"
+
         # Unfix all parameters (to switch to the global models).
         fix('all', fixed=False)
 
-        # Fix the spins.
+        # Model selection between 'local_tm' and 'sphere'.
+        self.pipes = ['local_tm', 'sphere']
+        self.model_selection(pipe='final2')
+
+        # Fix the spin parameters.
         fix('all_spins')
 
         # Monte Carlo simulations.
@@ -139,7 +155,6 @@
         monte_carlo.create_data()
         monte_carlo.initial_values()
         minimise(MIN_ALGOR)
-        eliminate()
         monte_carlo.error_analysis()
 
         # Write the final results.
@@ -150,7 +165,7 @@
         """Model selection function."""
 
         # Model elimination.
-        if pipe != 'final':
+        if pipe not in ['final', 'final2']:
             eliminate()
 
         # Model selection.