r22542 - in /branches/double_rotor: ./ specific_analyses/noe/__init__.py -- March 26, 2014 - 18:29

Author: bugman
Date: Wed Mar 26 18:29:06 2014
New Revision: 22542

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

........
  r22541 | bugman | 2014-03-26 18:20:40 +0100 (Wed, 26 Mar 2014) | 10 lines
  
  Fix for the NOE analysis for the peak intensity parameters.
  
  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.
  
  The 'ref' and 'sat' parameters have been replaced by the 'intensities' 
dictionary data structure a
  long, long time ago.  Therefore they have been eliminated and replaced by 
the 'intensities'
  definition.
........

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

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar 26 18:29:06 2014
@@ -1 +1 @@
-/trunk:1-22539
+/trunk:1-22541

Modified: branches/double_rotor/specific_analyses/noe/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/specific_analyses/noe/__init__.py?rev=22542&r1=22541&r2=22542&view=diff
==============================================================================
--- branches/double_rotor/specific_analyses/noe/__init__.py     (original)
+++ branches/double_rotor/specific_analyses/noe/__init__.py     Wed Mar 26 
18:29:06 2014
@@ -48,6 +48,5 @@
         self.return_value = self._return_value_general
 
         # Set up the spin parameters.
-        self.PARAMS.add('ref', scope='spin', desc='The reference peak 
intensity', py_type=float, grace_string='Reference intensity')
-        self.PARAMS.add('sat', scope='spin', desc='The saturated peak 
intensity', py_type=float, grace_string='Saturated intensity')
+        self.PARAMS.add('intensities', scope='spin', desc='The peak 
intensity', py_type=dict, grace_string='Peak intensity')
         self.PARAMS.add('noe', scope='spin', desc='The NOE', py_type=float, 
grace_string='\\qNOE\\Q', err=True, sim=True)