Author: bugman
Date: Tue Feb 16 14:39:56 2010
New Revision: 10705
URL: http://svn.gna.org/viewcvs/relax?rev=10705&view=rev
Log:
Merged revisions 10703-10704 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r10703 | bugman | 2010-02-16 14:16:23 +0100 (Tue, 16 Feb 2010) | 5 lines
The proper function from the order_parameters module is being called to
calc the cone angle.
This allows the code to operate, but the function is not yet implemented.
........
r10704 | bugman | 2010-02-16 14:38:47 +0100 (Tue, 16 Feb 2010) | 5 lines
Fix for the cite_html() bibliography method.
The <em> tag was not being closed!
........
Modified:
branches/bieri_gui/ (props changed)
branches/bieri_gui/info.py
branches/bieri_gui/specific_fns/frame_order.py
Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Feb 16 14:39:56 2010
@@ -1,1 +1,1 @@
-/1.3:1-10699
+/1.3:1-10704
Modified: branches/bieri_gui/info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/info.py?rev=10705&r1=10704&r2=10705&view=diff
==============================================================================
--- branches/bieri_gui/info.py (original)
+++ branches/bieri_gui/info.py Tue Feb 16 14:39:56 2010
@@ -203,7 +203,7 @@
if title and hasattr(self, 'title'):
cite = cite + ' ' + self.title
if journal and hasattr(self, 'journal'):
- cite = cite + ' <em>' + self.journal + '<em>,'
+ cite = cite + ' <em>' + self.journal + '</em>,'
if volume and hasattr(self, 'volume'):
cite = cite + ' <strong>' + self.volume + '</strong>'
if number and hasattr(self, 'number'):
Modified: branches/bieri_gui/specific_fns/frame_order.py
URL:
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/frame_order.py?rev=10705&r1=10704&r2=10705&view=diff
==============================================================================
--- branches/bieri_gui/specific_fns/frame_order.py (original)
+++ branches/bieri_gui/specific_fns/frame_order.py Tue Feb 16 14:39:56 2010
@@ -507,7 +507,7 @@
alpha = 0.0
# Calculate the cone angle.
- cdp.theta_cone = order_parameters.theta_cone(s1)
+ cdp.theta_cone = order_parameters.iso_cone_S_to_cos_theta(s1)
# Monte Carlo simulation data structures.
if sim_index != None:
r10705 - in /branches/bieri_gui: ./ info.py specific_fns/frame_order.py