r5311 - /1.3/specific_fns/jw_mapping.py -- April 04, 2008 - 16:42

Author: semor
Date: Fri Apr  4 16:42:09 2008
New Revision: 5311

URL: http://svn.gna.org/viewcvs/relax?rev=5311&view=rev
Log:
Partially fixed more of the code so the Jw mapping system test can go further 
before failure.


Modified:
    1.3/specific_fns/jw_mapping.py

Modified: 1.3/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=5311&r1=5310&r2=5311&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Fri Apr  4 16:42:09 2008
@@ -38,7 +38,7 @@
         """Class containing functions specific to reduced spectral density 
mapping."""
 
 
-    def calculate(self, verbosity=1, sim_index=None):
+    def calculate(self, verbosity=1, sim_index=None, spin_id=None):
         """Calculation of the spectral density values."""
 
         # Alias the current data pipe.
@@ -247,16 +247,16 @@
             raise RelaxNoSequenceError
 
         # Loop over residue data:
-        for residue in relax_data_store.res[run]:
+        for spin in spin_loop():
 
             # Check for sufficient data
-            if not hasattr(residue, 'relax_data'):
-                residue.select = 0
+            if not hasattr(spin, 'relax_data'):
+                spin.select = 0
                 continue
 
             # Require 3 or more data points
-            if len(residue.relax_data) < 3:
-                residue.select = 0
+            if len(spin.relax_data) < 3:
+                spin.select = 0
                 continue
 
 
@@ -385,10 +385,10 @@
         if not relax_data_store.current_pipe:
             raise RelaxNoPipeError
 
-        # Test if the run type is set to 'jw'.
-        function_type = relax_data_store.run_types[cdp.run_names.index]
+        # Test if the pipe type is set to 'jw'.
+        function_type = 
relax_data_store[relax_data_store.current_pipe].pipe_type
         if function_type != 'jw':
-            raise RelaxFuncSetupError, 
self.relax.specific_setup.get_string(function_type)
+            raise RelaxFuncSetupError, specific_fns.get_string(function_type)
 
         # Test if the frequency has been set.
         if hasattr(cdp, 'jw_frq'):