r7742 - /1.3/generic_fns/intensity.py -- October 16, 2008 - 04:32

Author: semor
Date: Thu Oct 16 04:32:10 2008
New Revision: 7742

URL: http://svn.gna.org/viewcvs/relax?rev=7742&view=rev
Log:
Passed more arguments to the det_dimensions() function and removed 'self.' 
instances.

The test for the support of a XEasy peak list now passes, although there 
still may be some bugs
present...


Modified:
    1.3/generic_fns/intensity.py

Modified: 1.3/generic_fns/intensity.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/intensity.py?rev=7742&r1=7741&r2=7742&view=diff
==============================================================================
--- 1.3/generic_fns/intensity.py (original)
+++ 1.3/generic_fns/intensity.py Thu Oct 16 04:32:10 2008
@@ -38,7 +38,7 @@
 from relax_warnings import RelaxWarning, RelaxNoSpinWarning
 
 
-def det_dimensions(file_data):
+def det_dimensions(file_data, proton, heteronuc):
     """Determine which are the proton and heteronuclei dimensions of the 
XEasy text file.
 
     @return:    None
@@ -50,9 +50,9 @@
         res_num, w1_name, w2_name, intensity = intensity_xeasy(file_data[i])
 
         # Proton in w1, heteronucleus in w2.
-        if w1_name == self.proton and w2_name == self.heteronuc:
+        if w1_name == proton and w2_name == heteronuc:
             # Set the proton dimension.
-            self.H_dim = 'w1'
+            H_dim = 'w1'
 
             # Print out.
             print "The proton dimension is w1"
@@ -61,9 +61,9 @@
             break
 
         # Heteronucleus in w1, proton in w2.
-        if w1_name == self.heteronuc and w2_name == self.proton:
+        if w1_name == heteronuc and w2_name == proton:
             # Set the proton dimension.
-            self.H_dim = 'w2'
+            H_dim = 'w2'
 
             # Print out.
             print "The proton dimension is w2"
@@ -354,7 +354,7 @@
 
     # Determine the proton and heteronucleus dimensions in the XEasy text 
file.
     if format == 'xeasy':
-        det_dimensions(file_data)
+        det_dimensions(file_data=file_data, proton=proton, 
heteronuc=heteronuc)
 
     # Loop over the peak intensity data.
     for i in xrange(len(file_data)):