Hi Troels,
For cleaning up the dispersion target function class, I think we
should convert 100% to the NE, NS, NM, NO, ND, and NT notation you
have switched to, and remove num_exp, num_spins, num_frq, etc from
self. Two notations is confusing and is always a source of future
bugs. I have now explained these in the docstring change of r24341 in
the disp_spin_speed branch
(http://www.mail-archive.com/relax-commits@xxxxxxx/msg21963.html).
Cheers,
Edward
On 27 June 2014 12:58, <tlinnet@xxxxxxxxxxxxx> wrote:
Author: tlinnet
Date: Fri Jun 27 12:58:26 2014
New Revision: 24338
URL: http://svn.gna.org/viewcvs/relax?rev=24338&view=rev
Log:
Added the missing "self.num_exp" to target function.
Testing on older system, this was failing the systemtest.
It is a wonder how these lines in __init__ could be performed without this?
self.end_index.append(self.num_exp * self.num_spins * self.num_frq)
if model in [MODEL_B14_FULL, MODEL_CR72_FULL, MODEL_NS_CPMG_2SITE_3D_FULL,
MODEL_NS_CPMG_2SITE_STAR_FULL]:
self.end_index.append(2 * self.num_exp * self.num_spins * self.num_frq)
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=24338&r1=24337&r2=24338&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:26 2014
@@ -181,7 +181,8 @@
# Initialise higher order numpy structures.
# Define the shape of all the numpy arrays.
# The total numbers of experiments, number of spins, number of
magnetic field strength, maximum number of offsets, maximum number of
dispersion point.
- self.NE = len(self.exp_types)
+ self.num_exp = len(self.exp_types)
+ self.NE = self.num_exp
self.NS = self.num_spins
self.NM = self.num_frq
_______________________________________________
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
Re: r24338 - /branches/disp_spin_speed/target_functions/relax_disp.py