r10700 - in /branches/bieri_gui: ./ info.py maths_fns/frame_order_matrix_ops.py -- February 16, 2010 - 11:08

Author: bugman
Date: Tue Feb 16 11:08:35 2010
New Revision: 10700

URL: http://svn.gna.org/viewcvs/relax?rev=10700&view=rev
Log:
Merged revisions 10694,10699 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r10694 | bugman | 2010-02-12 10:50:17 +0100 (Fri, 12 Feb 2010) | 5 lines
  
  Fix for the iso cone frame order order parameter.
  
  The c11^2, c12^2, c21^2 and c22^2 element equations were incorrect.
........
  r10699 | bugman | 2010-02-16 11:01:35 +0100 (Tue, 16 Feb 2010) | 5 lines
  
  Fix for the Lipari and Szabo reference information.
  
  The classes were not being instantiated.
........

Modified:
    branches/bieri_gui/   (props changed)
    branches/bieri_gui/info.py
    branches/bieri_gui/maths_fns/frame_order_matrix_ops.py

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 16 11:08:35 2010
@@ -1,1 +1,1 @@
-/1.3:1-10691
+/1.3:1-10699

Modified: branches/bieri_gui/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/info.py?rev=10700&r1=10699&r2=10700&view=diff
==============================================================================
--- branches/bieri_gui/info.py (original)
+++ branches/bieri_gui/info.py Tue Feb 16 11:08:35 2010
@@ -88,8 +88,8 @@
         self.bib['dAuvergneGooley07'] = dAuvergneGooley07()
         self.bib['dAuvergneGooley08a'] = dAuvergneGooley08a()
         self.bib['dAuvergneGooley08b'] = dAuvergneGooley08b()
-        self.bib['LipariSzabo82a'] = (LipariSzabo82a)
-        self.bib['LipariSzabo82b'] = (LipariSzabo82b)
+        self.bib['LipariSzabo82a'] = LipariSzabo82a()
+        self.bib['LipariSzabo82b'] = LipariSzabo82b()
 
 
     def centre(self, string, width=100):

Modified: branches/bieri_gui/maths_fns/frame_order_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/maths_fns/frame_order_matrix_ops.py?rev=10700&r1=10699&r2=10700&view=diff
==============================================================================
--- branches/bieri_gui/maths_fns/frame_order_matrix_ops.py (original)
+++ branches/bieri_gui/maths_fns/frame_order_matrix_ops.py Tue Feb 16 
11:08:35 2010
@@ -198,7 +198,7 @@
             matrix[i, j] = 0.0
 
     # The c11^2, c22^2, c12^2, and c21^2 elements.
-    matrix[0, 0] = (s1 + 1.0) / 3.0
+    matrix[0, 0] = (s1 + 2.0) / 6.0
     matrix[4, 4] = matrix[0, 0]
     matrix[1, 1] = matrix[0, 0]
     matrix[3, 3] = matrix[0, 0]