Author: tlinnet
Date: Tue Jun 10 18:41:01 2014
New Revision: 23793
URL: http://svn.gna.org/viewcvs/relax?rev=23793&view=rev
Log:
Modified unit tests, so pA is sent to target function as float instead of
array.
Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion
models for Clustered analysis.
Modified:
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_one_field.py
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_three_fields.py
Modified:
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_one_field.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_one_field.py?rev=23793&r1=23792&r2=23793&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_one_field.py
(original)
+++
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_one_field.py
Tue Jun 10 18:41:01 2014
@@ -126,7 +126,6 @@
# The number of disp point can change per spectrometer, so we make
the maximum size.
self.R20A_a = ones(back_calc_shape + [self.max_num_disp_points])
self.R20B_a = ones(back_calc_shape + [self.max_num_disp_points])
- self.pA_a = zeros(back_calc_shape + [self.max_num_disp_points])
self.dw_frq_a = ones(back_calc_shape + [self.max_num_disp_points])
self.kex_a = ones(back_calc_shape + [self.max_num_disp_points])
self.cpmg_frqs_a = ones(back_calc_shape + [self.max_num_disp_points])
@@ -167,11 +166,10 @@
self.dw_frq_a[0][si][mi][0] = array( [dw_frq] *
self.max_num_disp_points, float64)
# Store pA and kex per disp point.
- self.pA_a[0][si][mi][0] = array( [pA] *
self.max_num_disp_points, float64)
self.kex_a[0][si][mi][0] = array( [kex] *
self.max_num_disp_points, float64)
## Back calculate the R2eff values.
- r2eff_CR72(r20a=self.R20A_a, r20b=self.R20B_a, pA=self.pA_a,
dw=self.dw_frq_a, kex=self.kex_a, cpmg_frqs=self.cpmg_frqs_a,
back_calc=self.back_calc_a, num_points=self.num_disp_points_a)
+ r2eff_CR72(r20a=self.R20A_a, r20b=self.R20B_a, pA=pA,
dw=self.dw_frq_a, kex=self.kex_a, cpmg_frqs=self.cpmg_frqs_a,
back_calc=self.back_calc_a, num_points=self.num_disp_points_a)
# Now return the values back to the structure of self.back_calc
object.
## For all missing data points, set the back-calculated value to the
measured values so that it has no effect on the chi-squared value.
Modified:
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_three_fields.py
URL:
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_three_fields.py?rev=23793&r1=23792&r2=23793&view=diff
==============================================================================
---
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_three_fields.py
(original)
+++
branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/test_cr72_full_cluster_three_fields.py
Tue Jun 10 18:41:01 2014
@@ -126,7 +126,6 @@
# The number of disp point can change per spectrometer, so we make
the maximum size.
self.R20A_a = ones(back_calc_shape + [self.max_num_disp_points])
self.R20B_a = ones(back_calc_shape + [self.max_num_disp_points])
- self.pA_a = zeros(back_calc_shape + [self.max_num_disp_points])
self.dw_frq_a = ones(back_calc_shape + [self.max_num_disp_points])
self.kex_a = ones(back_calc_shape + [self.max_num_disp_points])
self.cpmg_frqs_a = ones(back_calc_shape + [self.max_num_disp_points])
@@ -167,11 +166,10 @@
self.dw_frq_a[0][si][mi][0] = array( [dw_frq] *
self.max_num_disp_points, float64)
# Store pA and kex per disp point.
- self.pA_a[0][si][mi][0] = array( [pA] *
self.max_num_disp_points, float64)
self.kex_a[0][si][mi][0] = array( [kex] *
self.max_num_disp_points, float64)
## Back calculate the R2eff values.
- r2eff_CR72(r20a=self.R20A_a, r20b=self.R20B_a, pA=self.pA_a,
dw=self.dw_frq_a, kex=self.kex_a, cpmg_frqs=self.cpmg_frqs_a,
back_calc=self.back_calc_a, num_points=self.num_disp_points_a)
+ r2eff_CR72(r20a=self.R20A_a, r20b=self.R20B_a, pA=pA,
dw=self.dw_frq_a, kex=self.kex_a, cpmg_frqs=self.cpmg_frqs_a,
back_calc=self.back_calc_a, num_points=self.num_disp_points_a)
# Now return the values back to the structure of self.back_calc
object.
## For all missing data points, set the back-calculated value to the
measured values so that it has no effect on the chi-squared value.
r23793 - /branches/disp_spin_speed/test_suite/unit_tests/_lib/_dispersion/