r24692 - /branches/zooming_grid_search/pipe_control/minimise.py -- July 24, 2014 - 09:05

Author: bugman
Date: Thu Jul 24 09:05:42 2014
New Revision: 24692

URL: http://svn.gna.org/viewcvs/relax?rev=24692&view=rev
Log:
Modified the zooming grid search algorithm.

If the zoom level is negative, hence the grid will be larger than the 
original, the checks that the
grid is within the original are no longer active.


Modified:
    branches/zooming_grid_search/pipe_control/minimise.py

Modified: branches/zooming_grid_search/pipe_control/minimise.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/zooming_grid_search/pipe_control/minimise.py?rev=24692&r1=24691&r2=24692&view=diff
==============================================================================
--- branches/zooming_grid_search/pipe_control/minimise.py       (original)
+++ branches/zooming_grid_search/pipe_control/minimise.py       Thu Jul 24 
09:05:42 2014
@@ -335,7 +335,7 @@
                 upper_zoom = values[i] + half_size
 
                 # Outside of the original lower bound, so shift the grid to 
fit.
-                if lower_zoom < lower_i:
+                if zoom > 0 and lower_zoom < lower_i:
                     print "low"
                     # The amount to shift by.
                     shift = lower_i - lower_zoom
@@ -344,7 +344,7 @@
                     upper_i = upper_zoom + shift
 
                 # Outside of the original upper bound, so shift the grid to 
fit.
-                elif upper_zoom > upper_i:
+                elif zoom > 0 and upper_zoom > upper_i:
                     # The amount to shift by.
                     shift = upper_i - upper_zoom