r7519 - /1.3/specific_fns/model_free/main.py -- October 05, 2008 - 19:51

Author: bugman
Date: Sun Oct  5 19:51:23 2008
New Revision: 7519

URL: http://svn.gna.org/viewcvs/relax?rev=7519&view=rev
Log:
Fix for bug #12411 (https://gna.org/bugs/?12411).

The problem was with the duplicate_data() skipping the duplication of the 
spin specific data if the
new data pipe (which should start off as empty) contained no sequence data.  
Hence the data was not
being copied.


Modified:
    1.3/specific_fns/model_free/main.py

Modified: 1.3/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/model_free/main.py?rev=7519&r1=7518&r2=7519&view=diff
==============================================================================
--- 1.3/specific_fns/model_free/main.py (original)
+++ 1.3/specific_fns/model_free/main.py Sun Oct  5 19:51:23 2008
@@ -1110,19 +1110,16 @@
                     if data_from != data_to:
                         raise RelaxError, "The object " + `data_name` + " is 
not consistent between the pipes " + `pipe_from` + " and " + `pipe_to` + "."
 
-        # No sequence data, so skip the rest.
-        if not exists_mol_res_spin_data():
-            return
-
-        # Determine the model type.
+        # Duplicate the sequence data if it doesn't exist.
+        if dp_to.mol.is_empty():
+            sequence.copy(pipe_from=pipe_from, pipe_to=pipe_to, 
preserve_select=True, verbose=verbose)
+
+        # Determine the model type of the original data pipe.
+        pipes.switch(pipe_from)
         model_type = self.determine_model_type()
 
         # Sequence specific data.
         if model_type == 'mf' or (model_type == 'local_tm' and not 
global_stats):
-            # Duplicate the sequence data if it doesn't exist.
-            if dp_to.mol.is_empty():
-                sequence.copy(pipe_from=pipe_from, pipe_to=pipe_to, 
preserve_select=True, verbose=verbose)
-
             # Get the spin container indices.
             mol_index, res_index, spin_index = 
convert_from_global_index(global_index=model_index, pipe=pipe_from)