r19314 - /branches/relax_disp/specific_analyses/relax_disp.py -- April 03, 2013 - 11:16

Author: bugman
Date: Wed Apr  3 11:16:03 2013
New Revision: 19314

URL: http://svn.gna.org/viewcvs/relax?rev=19314&view=rev
Log:
Removed all aliasing of the current data pipe in specific_analyses.relax_disp 
as this is in __builtin__.


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19314&r1=19313&r2=19314&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Apr  3 11:16:03 
2013
@@ -137,9 +137,6 @@
         if not scaling:
             return scaling_matrix
 
-        # Alias the current data pipe.
-        cdp = pipes.get_pipe()
-
         # Loop over the parameters.
         for i in xrange(len(spin.params)):
             # Effective transversal relaxation rate scaling.
@@ -217,9 +214,6 @@
                                   well as every magnetic field frequency.
         @rtype:                   float
         """
-
-        # Alias the current data pipe.
-        cdp = pipes.get_pipe()
 
         # Create the initial parameter vector.
         param_vector = self.assemble_param_vector(spin=spin)
@@ -286,9 +280,6 @@
         # Test if the current data pipe exists.
         pipes.test()
 
-        # Alias the current data pipe.
-        cdp = pipes.get_pipe()
-
         # Set up the dictionnary data structure if it doesn't exist yet.
         if not hasattr(cdp, 'delayT'):
             cdp.delayT = {}
@@ -323,9 +314,6 @@
         @keyword spectrum_id:   The spectrum identification string.
         @type spectrum_id:      str
         """
-
-        # Alias the current data pipe.
-        cdp = pipes.get_pipe()
 
         # Test if the spectrum id exists.
         if spectrum_id not in cdp.spectrum_ids:
@@ -380,9 +368,6 @@
         # Test if the model is set.
         if not hasattr(spin, 'model') or not spin.model:
             raise RelaxNoModelError
-
-        # Alias the current data pipe.
-        cdp = pipes.get_pipe()
 
         # Loop over the spectral time points.
         for j in xrange(len(cdp.cpmg_frqs)):
@@ -565,9 +550,6 @@
         @type sim_index:        int
         """
 
-        # Alias the current data pipe.
-        cdp = pipes.get_pipe()
-
         # Monte Carlo simulations.
         if sim_index != None:
             # Transversal relaxation rate.
@@ -617,9 +599,6 @@
 
         # Test if the current pipe exists.
         pipes.test()
-
-        # Get the current data pipe.
-        cdp = pipes.get_pipe()
 
         # Test if the pipe type is set to 'relax_disp'.
         function_type = cdp.pipe_type
@@ -729,9 +708,6 @@
             for j in xrange(n):
                 temp.append(inc)
             inc = temp
-
-        # Alias the current data pipe.
-        cdp = pipes.get_pipe()
 
         # Minimisation options initialisation.
         min_options = []
@@ -906,9 +882,6 @@
         @type inc:                  array of int
         """
 
-        # Alias the current data pipe.
-        cdp = pipes.get_pipe()
-
         # Test if sequence data is loaded.
         if not exists_mol_res_spin_data():
             raise RelaxNoSequenceError
@@ -1171,9 +1144,6 @@
         @rtype:         list of float
         """
 
-        # Get the current data pipe.
-        cdp = pipes.get_pipe()
-
         # Get the spin container.
         spin = return_spin(spin_id)