r21644 - in /branches/relax_disp: docs/latex/dispersion.tex specific_analyses/relax_disp/api.py -- November 25, 2013 - 14:40

Author: bugman
Date: Mon Nov 25 14:40:05 2013
New Revision: 21644

URL: http://svn.gna.org/viewcvs/relax?rev=21644&view=rev
Log:
Added the tex > 1.0 model elimination rule for the dispersion analysis.


Modified:
    branches/relax_disp/docs/latex/dispersion.tex
    branches/relax_disp/specific_analyses/relax_disp/api.py

Modified: branches/relax_disp/docs/latex/dispersion.tex
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/dispersion.tex?rev=21644&r1=21643&r2=21644&view=diff
==============================================================================
--- branches/relax_disp/docs/latex/dispersion.tex (original)
+++ branches/relax_disp/docs/latex/dispersion.tex Mon Nov 25 14:40:05 2013
@@ -1241,7 +1241,8 @@
 \begin{subequations}
 \begin{gather} 
     \pA \leqslant 0.501, \\
-    \pA \geqslant 0.999.
+    \pA \geqslant 0.999, \\
+    \tex \geqslant 1.0.
 \end{gather} 
 \end{subequations}
 

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=21644&r1=21643&r2=21644&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/api.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/api.py Mon Nov 25 
14:40:05 2013
@@ -920,10 +920,11 @@
         # Default limits.
         c1 = 0.501
         c2 = 0.999
+        c3 = 1.0
 
         # Depack the arguments.
         if args != None:
-            c1, c2 = args
+            c1, c2, c3 = args
 
         # Elimination text.
         elim_text = "Data pipe '%s':  The %s parameter of %.5f is %s, 
eliminating " % (pipes.cdp_name(), name, value, "%s")
@@ -939,6 +940,12 @@
                 return True
             if value > c2:
                 print(elim_text % ("greater than  %.5f" % c2))
+                return True
+
+        # The tex parameter.
+        if name == 'tex':
+            if value > c3:
+                print(elim_text % ("greater than  %.5f" % c3))
                 return True
 
         # Accept model.