r8997 - /1.3/specific_fns/model_free/main.py -- March 25, 2009 - 21:49

Author: bugman
Date: Wed Mar 25 21:49:55 2009
New Revision: 8997

URL: http://svn.gna.org/viewcvs/relax?rev=8997&view=rev
Log:
Modified the model elimination print out to show the data pipe name.

This was picked up while trying to debug bug #13259 
(https://gna.org/bugs/index.php?13259).


Modified:
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=8997&r1=8996&r2=8997&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Wed Mar 25 21:49:55 2009
@@ -1254,17 +1254,17 @@
         # Local tm.
         if name == 'local_tm' and value >= c1:
             if sim == None:
-                print "The local tm parameter of %.5g is greater than %.5g, 
eliminating spin system '%s'." % (value, c1, spin_id)
+                print "Data pipe '%s':  The local tm parameter of %.5g is 
greater than %.5g, eliminating spin system '%s'." % (pipes.cdp_name(), value, 
c1, spin_id)
             else:
-                print "The local tm parameter of %.5g is greater than %.5g, 
eliminating simulation %i of spin system '%s'." % (value, c1, sim, spin_id)
+                print "Data pipe '%s':  The local tm parameter of %.5g is 
greater than %.5g, eliminating simulation %i of spin system '%s'." % 
(pipes.cdp_name(), value, c1, sim, spin_id)
             return True
 
         # Internal correlation times.
         if match('t[efs]', name) and value >= c2 * tm:
             if sim == None:
-                print "The %s value of %.5g is greater than %.5g, 
eliminating spin system '%s'." % (name, value, c2*tm, spin_id)
+                print "Data pipe '%s':  The %s value of %.5g is greater than 
%.5g, eliminating spin system '%s'." % (pipes.cdp_name(), name, value, c2*tm, 
spin_id)
             else:
-                print "The %s value of %.5g is greater than %.5g, 
eliminating simulation %i of spin system '%s'." % (name, value, c2*tm, sim, 
spin_id)
+                print "Data pipe '%s':  The %s value of %.5g is greater than 
%.5g, eliminating simulation %i of spin system '%s'." % (pipes.cdp_name(), 
name, value, c2*tm, sim, spin_id)
             return True
 
         # Accept model.