r24613 - /branches/disp_spin_speed/target_functions/relax_disp.py -- July 22, 2014 - 15:23

Author: tlinnet
Date: Tue Jul 22 15:23:47 2014
New Revision: 24613

URL: http://svn.gna.org/viewcvs/relax?rev=24613&view=rev
Log:
Reverted r24336 as relax dependency of numpy is now 1.6 where the "einsum" 
function is available.

The command used was:
svn merge -r24336:r24335 .

.....
    r24336 | tlinnet | 2014-06-27 12:58:22 +0200 (Fri, 27 Jun 2014) | 3 lines

    Added to target function that experiment_type_setup() should not be 
initiated, if numpy.einsum is missing.

    Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.
.....

Modified:
    branches/disp_spin_speed/target_functions/relax_disp.py

Modified: branches/disp_spin_speed/target_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/target_functions/relax_disp.py?rev=24613&r1=24612&r2=24613&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py     (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py     Tue Jul 22 
15:23:47 2014
@@ -377,10 +377,8 @@
         # This is to make sure, that the chi2 values is not affected by 
missing values.
         self.mask_replace_blank = masked_equal(self.missing, 1.0)
 
-        # Check if eisum is available for numerical models.
-        if dep_check.einsum_module:
-            # Check the experiment types, simplifying the data structures as 
needed.
-            self.experiment_type_setup()
+        # Check the experiment types, simplifying the data structures as 
needed.
+        self.experiment_type_setup()
 
         # Scaling initialisation.
         self.scaling_flag = False