r5241 - in /1.2: generic_fns/value.py specific_fns/relax_data.py -- March 28, 2008 - 10:45

Author: bugman
Date: Fri Mar 28 10:08:43 2008
New Revision: 5241

URL: http://svn.gna.org/viewcvs/relax?rev=5241&view=rev
Log:
Manually ported the bug fix of r5240 from the 1.3 line.

.....
 r5240 | bugman | 2008-03-28 10:06:06 +0100 (Fri, 28 Mar 2008) | 7 lines
 Changed paths:
    M /1.3/generic_fns/value.py
    M /1.3/specific_fns/relax_data.py

 Fix for bug #11383 (https://gna.org/bugs/?11383).

 This was reported by Ryan Hoffman (https://gna.org/users/rydog).

 The relax_data.display() user function is now functional again.
.....


Modified:
    1.2/generic_fns/value.py
    1.2/specific_fns/relax_data.py

Modified: 1.2/generic_fns/value.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/generic_fns/value.py?rev=5241&r1=5240&r2=5241&view=diff
==============================================================================
--- 1.2/generic_fns/value.py (original)
+++ 1.2/generic_fns/value.py Fri Mar 28 10:08:43 2008
@@ -540,13 +540,13 @@
         file.close()
 
 
-    def write_data(self, file, return_value=None):
+    def write_data(self, run=None, param=None, file=None, return_value=None):
         """Function for writing data."""
 
         # Get the value and error returning function if required.
         if not return_value:
             # Function type.
-            self.function_type = 
self.relax.data.run_types[self.relax.data.run_names.index(self.run)]
+            self.function_type = 
self.relax.data.run_types[self.relax.data.run_names.index(run)]
 
             # Specific value and error returning function.
             return_value = self.relax.specific_setup.setup('return_value', 
self.function_type)
@@ -555,12 +555,12 @@
         file.write("%-5s%-6s%-30s%-30s\n" % ('Num', 'Name', 'Value', 
'Error'))
 
         # Loop over the sequence.
-        for i in xrange(len(self.relax.data.res[self.run])):
-            # Remap the data structure 'self.relax.data.res[self.run][i]'.
-            data = self.relax.data.res[self.run][i]
+        for i in xrange(len(self.relax.data.res[run])):
+            # Remap the data structure 'self.relax.data.res[run][i]'.
+            data = self.relax.data.res[run][i]
 
             # Get the value and error.
-            value, error = return_value(self.run, i, self.param)
+            value, error = return_value(run, i, param)
 
             # Write the data.
             file.write("%-5i%-6s%-30s%-30s\n" % (data.num, data.name, 
`value`, `error`))

Modified: 1.2/specific_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/specific_fns/relax_data.py?rev=5241&r1=5240&r2=5241&view=diff
==============================================================================
--- 1.2/specific_fns/relax_data.py (original)
+++ 1.2/specific_fns/relax_data.py Fri Mar 28 10:08:43 2008
@@ -497,7 +497,7 @@
             raise RelaxNoRiError, (self.ri_label, self.frq_label)
 
         # Print the data.
-        self.relax.generic.value.write_data(self.run, (self.ri_label, 
self.frq_label), sys.stdout, return_value=self.return_value)
+        self.relax.generic.value.write_data(run=self.run, 
param=(self.ri_label, self.frq_label), file=sys.stdout, 
return_value=self.return_value)
 
 
     def find_index(self, data):