Author: tlinnet
Date: Fri Jun 27 12:58:22 2014
New Revision: 24336
URL: http://svn.gna.org/viewcvs/relax?rev=24336&view=rev
Log:
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=24336&r1=24335&r2=24336&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py Fri Jun 27
12:58:22 2014
@@ -365,8 +365,10 @@
# 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 the experiment types, simplifying the data structures as
needed.
- self.experiment_type_setup()
+ # 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()
# Scaling initialisation.
self.scaling_flag = False
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits