r20747 - in /branches/relax_disp: ./ pipe_control/monte_carlo.py specific_analyses/model_free/main.py -- September 02, 2013 - 15:02

Author: bugman
Date: Mon Sep  2 15:02:57 2013
New Revision: 20747

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

........
  r20743 | bugman | 2013-09-02 14:45:59 +0200 (Mon, 02 Sep 2013) | 5 lines
  
  Modified the create_mc_data() method to partly fix bug #21079 
(https://gna.org/bugs/?21079).
  
  Some spins with local tm models remain selected despite not containing any 
data.  These are handled
  explicitly.  Instead of a RelaxNoModelError being raised, the method 
returns None to indicate that
  something went wrong.
........
  r20744 | bugman | 2013-09-02 14:46:00 +0200 (Mon, 02 Sep 2013) | 5 lines
  
  Final fix for bug #21079 (https://gna.org/bugs/?21079).
  
  This is the failure of the dauvergne_protocol auto-analysis when the "local 
tm" global model is
  selected.  The Monte Carlo create_data() method not skips data from the 
base_data_loop() if the
  create_mc_data() method returns None.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/pipe_control/monte_carlo.py
    branches/relax_disp/specific_analyses/model_free/main.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep  2 15:02:57 2013
@@ -1,1 +1,1 @@
-/trunk:1-20739,20741-20742
+/trunk:1-20746

Modified: branches/relax_disp/pipe_control/monte_carlo.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/monte_carlo.py?rev=20747&r1=20746&r2=20747&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/monte_carlo.py (original)
+++ branches/relax_disp/pipe_control/monte_carlo.py Mon Sep  2 15:02:57 2013
@@ -69,6 +69,10 @@
         # Get the original data.
         else:
             data = return_data(data_index)
+
+        # No data, so skip.
+        if data == None:
+            continue
 
         # Get the errors.
         error = return_error(data_index)

Modified: branches/relax_disp/specific_analyses/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/model_free/main.py?rev=20747&r1=20746&r2=20747&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/model_free/main.py (original)
+++ branches/relax_disp/specific_analyses/model_free/main.py Mon Sep  2 
15:02:57 2013
@@ -1264,9 +1264,9 @@
         if not spin.select:
             return
 
-        # Test if the model is set.
+        # Test if the model is set, returning None to signal that the spin 
should be skipped.
         if not hasattr(spin, 'model') or not spin.model:
-            raise RelaxNoModelError
+            return None
 
         # Loop over the relaxation data.
         for ri_id in cdp.ri_ids: