Author: bugman Date: Mon Nov 25 11:19:32 2013 New Revision: 21638 URL: http://svn.gna.org/viewcvs/relax?rev=21638&view=rev Log: Bug fix for the recently added dispersion API eliminate method. This was accidentally always eliminating the model. Modified: branches/relax_disp/specific_analyses/relax_disp/api.py Modified: branches/relax_disp/specific_analyses/relax_disp/api.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?rev=21638&r1=21637&r2=21638&view=diff ============================================================================== --- branches/relax_disp/specific_analyses/relax_disp/api.py (original) +++ branches/relax_disp/specific_analyses/relax_disp/api.py Mon Nov 25 11:19:32 2013 @@ -928,14 +928,14 @@ print("Data pipe '%s': The pA parameter of %.5f is less than %.5f, eliminating the spin cluster %s." % (pipes.cdp_name(), value, c1, model_info)) else: print("Data pipe '%s': The pA parameter of %.5f is less than %.5f, eliminating simulation %i of the spin cluster %s." % (pipes.cdp_name(), value, c1, sim, model_info)) - return True + return True if value > c2: if sim == None: print("Data pipe '%s': The pA parameter of %.5f is greater than %.5f, eliminating the spin cluster %s." % (pipes.cdp_name(), value, c1, model_info)) else: print("Data pipe '%s': The pA parameter of %.5f is greater than %.5f, eliminating simulation %i of the spin cluster %s." % (pipes.cdp_name(), value, c1, sim, model_info)) - return True + return True # Accept model. return False