r17303 - in /branches/frame_order_testing/test_suite/shared_data/frame_order/cam: free_rotor/frame_order.py opt_stats -- July 24, 2012 - 15:39

Author: bugman
Date: Tue Jul 24 15:39:55 2012
New Revision: 17303

URL: http://svn.gna.org/viewcvs/relax?rev=17303&view=rev
Log:
Updated the free rotor CaM frame order model parameters and optimisation 
statistics.

This now matches the correct values and the system test values.


Modified:
    
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
    
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats

Modified: 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py?rev=17303&r1=17302&r2=17303&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
 (original)
+++ 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/free_rotor/frame_order.py
 Tue Jul 24 15:39:55 2012
@@ -103,8 +103,8 @@
         # Check the minimum.
         value.set(param='ave_pos_beta', val=1.1838868514111507)
         value.set(param='ave_pos_gamma', val=0.35219976958846927)
-        value.set(param='axis_theta', val=2.1815126749944502)
-        value.set(param='axis_phi', val=0.89068285262982982)
+        value.set(param='axis_theta', val=0.9600799785953431)
+        value.set(param='axis_phi', val=4.0322755062196229)
         calc()
         print("\nchi2: %s" % repr(cdp.chi2))
 

Modified: 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats?rev=17303&r1=17302&r2=17303&view=diff
==============================================================================
--- 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats 
(original)
+++ 
branches/frame_order_testing/test_suite/shared_data/frame_order/cam/opt_stats 
Tue Jul 24 15:39:55 2012
@@ -1,7 +1,7 @@
 Chi-squared values
 ==================
 
-Quadratic integration (from numpy)
+Quadratic integration (from scipy)
 ----------------------------------
 
 Data set                    RDC + PCS               RDC                     
PCS
@@ -9,7 +9,7 @@
 rotor                       0.081245385008720014    0.080805860707868632    
0.00043952430085139962
 rotor2                      0.081429784279772793    0.081000737779842888    
0.00042904649992989879
 rotor_2_state               0.98651255847896457     0.98514936500256733     
0.0013631934763973918
-free_rotor                  0.49751590579525123     0.49726258158950554     
0.00025332420574563188
+free_rotor                  0.49751590579526372     0.49726258158951819     
0.00025332420574563177
 free_rotor2                 0.15805819395161055     0.15789122044584425     
0.00016697350576634065
 iso_cone                    0.047796274552237457    0.047304044109578447    
0.00049223044265901488
 iso_cone_free_rotor         0.19951715460983263     0.1984082397486189      
0.0011089148612137265
@@ -29,7 +29,7 @@
 rotor                       0.1591475347119897      0.080805860707868632    
0.078341674004121051
 rotor2                      0.14687752080088007     0.081000737779842888    
0.065876783021037194
 rotor_2_state               2.4871012333020976      0.98514936500256733     
1.5019518682995305
-free_rotor                  0.49964754791781146     0.49726258158950554     
0.0023849663283059138
+free_rotor                  0.5010702982403058      0.49726258158951819     
0.0038077166507876079
 free_rotor2                 0.16009718934343264     0.15789122044584425     
0.0022059688975884064
 iso_cone                    275.91311056249037      0.047304044109578447    
275.86580651838085
 iso_cone_free_rotor         25.809427534465456      0.1984082397486189      
25.611019294716833
@@ -69,7 +69,7 @@
 rotor                       0.08124558750633941     0.080805860707868632    
0.00043972679847077115
 rotor2                      0x081098953498889667    0.081000737779842888    
0x00042941434151042446
 rotor_2_state               0x98651554736334846     0.98514936500256733     
0x001366182360781083
-free_rotor                  0x49751589915599342     0.49726258158950554     
0x00025331756647524353
+free_rotor                  0x49751589915599342     0.49726258158951819     
0x00025331756647524353
 free_rotor2                 0.15805818661805654     0.15789122044584425     
0.00016696617221228916
 iso_cone                    0x047808065744685081    0.047304044109578447    
0x00050402163510663526
 iso_cone_free_rotor         0x19949613552285542     0.1984082397486189      
0x0010878957742364997