r15319 - /branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py -- February 08, 2012 - 12:46

Author: bugman
Date: Wed Feb  8 12:46:17 2012
New Revision: 15319

URL: http://svn.gna.org/viewcvs/relax?rev=15319&view=rev
Log:
Reverted r15317 as the change of behaviour now occurs in the base script.

The command used was:
svn merge -r15317:r15316 .

.....
  r15317 | bugman | 2012-02-08 11:41:39 +0100 (Wed, 08 Feb 2012) | 6 lines
  
  Switched the isotropic cone frame order system test to use the save file.
  
  This significantly speeds up the system test, as all the sequence 
generation and RDC and PCS data
  reading is skipped.
.....


Modified:
    
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py

Modified: 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py?rev=15319&r1=15318&r2=15319&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
 (original)
+++ 
branches/frame_order_testing/test_suite/system_tests/scripts/frame_order/cam/iso_cone.py
 Wed Feb  8 12:46:17 2012
@@ -23,31 +23,25 @@
 # Module docstring.
 """Script for optimising the isotropic cone frame order test model of CaM."""
 
-# Python module imports.
-from os import sep
-
 # relax module imports.
-from status import Status; status = Status()
+from base_script import Base_script
 
 
-# Path of the save file.
-DATA_PATH = status.install_path + 
sep+'test_suite'+sep+'shared_data'+sep+'frame_order'+sep+'cam'+sep+'iso_cone'
+class Analysis(Base_script):
 
-# Load the save file.
-reset()
-state.load('frame_order', dir=DATA_PATH)
+    # Set up some class variables.
+    directory = 'iso_cone'
+    model = 'iso cone'
+    ave_pos_alpha = 4.3434999280669997
+    ave_pos_beta = 0.43544332764249905
+    ave_pos_gamma = 3.8013235235956007
+    axis_theta = 2.1815126749944502
+    axis_phi = 0.89068285262982982
+    cone_theta = 10.0 * 2.0 * pi / 360.0
+    cone_sigma_max = 20.0 * 2.0 * pi / 360.0
+    cone = True
+    num_int_pts = 100
 
-# Set up some variables.
-value.set(param='ave_pos_alpha', val=4.3434999280669997)
-value.set(param='ave_pos_beta', val=0.43544332764249905)
-value.set(param='ave_pos_gamma', val=3.8013235235956007)
-value.set(param='axis_theta', val=2.1815126749944502)
-value.set(param='axis_phi', val=0.89068285262982982)
-value.set(param='cone_theta', val=10.0 * 2.0 * pi / 360.0)
-value.set(param='cone_sigma_max', val=20.0 * 2.0 * pi / 360.0)
 
-# Increase the number of Sobol points so the cone is sampled.
-cdp.num_int_pts = 100
-
-# Calculate the chi-squared value.
-calc()
+# Execute the analysis.
+Analysis(self)