r22552 - in /branches/double_rotor: ./ auto_analyses/noe.py -- March 26, 2014 - 19:29

Author: bugman
Date: Wed Mar 26 19:29:24 2014
New Revision: 22552

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

........
  r22550 | bugman | 2014-03-26 19:28:47 +0100 (Wed, 26 Mar 2014) | 10 lines
  
  Changed the Noe auto-analysis to properly handle the peak intensity Grace 
plots.
  
  This relates to bug #21863 (https://gna.org/bugs/?21863), the grace.write 
user function not being
  able to write ref/sat plots as described in sample script noe.py.
  
  Instead of trying to produce the 'ref.agr' and 'sat.agr' files for the 
non-existent 'ref' and 'sat'
  parameters, instead the 'intensities.agr' file is being produced for the 
peak intensity parameter.
  The reference and saturated intensities will appear as two graph sets 
within that plot.
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/auto_analyses/noe.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 26 19:29:24 2014
@@ -1 +1 @@
-/trunk:1-22549
+/trunk:1-22551

Modified: branches/double_rotor/auto_analyses/noe.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/auto_analyses/noe.py?rev=22552&r1=22551&r2=22552&view=diff
==============================================================================
--- branches/double_rotor/auto_analyses/noe.py  (original)
+++ branches/double_rotor/auto_analyses/noe.py  Wed Mar 26 19:29:24 2014
@@ -111,8 +111,7 @@
         self.interpreter.results.write(file='results', dir=self.results_dir, 
force=True)
 
         # Create Grace plots of the data.
-        self.interpreter.grace.write(y_data_type='ref', file='ref.agr', 
dir=self.grace_dir, force=True)
-        self.interpreter.grace.write(y_data_type='sat', file='sat.agr', 
dir=self.grace_dir, force=True)
+        self.interpreter.grace.write(y_data_type='intensities', 
file='intensities.agr', dir=self.grace_dir, force=True)
         self.interpreter.grace.write(y_data_type='noe', file='noe.agr', 
dir=self.grace_dir, force=True)
 
         # Save the program state.