r24724 - in /branches/frame_order_cleanup: ./ specific_analyses/ specific_analyses/frame_order/ -- July 24, 2014 - 17:53

Author: bugman
Date: Thu Jul 24 17:53:13 2014
New Revision: 24724

URL: http://svn.gna.org/viewcvs/relax?rev=24724&view=rev
Log:
Merged revisions 24722-24723 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r24722 | bugman | 2014-07-24 17:47:04 +0200 (Thu, 24 Jul 2014) | 5 lines
  
  The frame order grid search bound functions can now handle increment values 
of None or 1.
  
  These cases are now caught and the full lower or upper bound is now 
returned.
........
  r24723 | bugman | 2014-07-24 17:50:01 +0200 (Thu, 24 Jul 2014) | 3 lines
  
  Removed some debugging printouts.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py
    branches/frame_order_cleanup/specific_analyses/parameter_object.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jul 24 17:53:13 2014
@@ -1 +1 @@
-/trunk:1-24720
+/trunk:1-24723

Modified: 
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py?rev=24724&r1=24723&r2=24724&view=diff
==============================================================================
--- 
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py
      (original)
+++ 
branches/frame_order_cleanup/specific_analyses/frame_order/parameter_object.py
      Thu Jul 24 17:53:13 2014
@@ -41,6 +41,10 @@
     @rtype:                 float
     """
 
+    # Handle inc values of None or 1.
+    if incs in [None, 1]:
+        return 2.0 * pi
+
     # Return the upper limit which is one inc before 2pi.
     return 2.0*pi * (1.0 - 1.0/incs)
 
@@ -56,6 +60,10 @@
     @rtype:                 float
     """
 
+    # Handle inc values of None or 1.
+    if incs in [None, 1]:
+        return pi
+
     # Return the upper limit which is one inc before pi.
     return pi * (1.0 - 1.0/incs)
 
@@ -71,6 +79,10 @@
     @rtype:                 float
     """
 
+    # Handle inc values of None or 1.
+    if incs in [None, 1]:
+        return 0.0
+
     # Return the lower limit, excluding the first point.
     return pi * (1.0/incs)
 
@@ -85,6 +97,10 @@
     @return:                The upper grid search bound for the cone and 
torsion angles.
     @rtype:                 float
     """
+
+    # Handle inc values of None or 1.
+    if incs in [None, 1]:
+        return pi
 
     # Return the upper limit, excluding the last point.
     return pi * (1.0 - 1.0/incs)

Modified: branches/frame_order_cleanup/specific_analyses/parameter_object.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/parameter_object.py?rev=24724&r1=24723&r2=24724&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/parameter_object.py  
(original)
+++ branches/frame_order_cleanup/specific_analyses/parameter_object.py  Thu 
Jul 24 17:53:13 2014
@@ -1194,7 +1194,4 @@
             unit = ''
 
         # Return the units.
-        print self._units[name]
-        print type(self._units[name])
-        print unit
         return unit