r24018 - /branches/disp_spin_speed/target_functions/relax_disp.py -- June 17, 2014 - 11:56

Author: tlinnet
Date: Tue Jun 17 11:56:43 2014
New Revision: 24018

URL: http://svn.gna.org/viewcvs/relax?rev=24018&view=rev
Log:
Fix for systemtest: test_korzhnev_2005_all_data

The masking for replacing values was wrong.

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=24018&r1=24017&r2=24018&view=diff
==============================================================================
--- branches/disp_spin_speed/target_functions/relax_disp.py     (original)
+++ branches/disp_spin_speed/target_functions/relax_disp.py     Tue Jun 17 
11:56:43 2014
@@ -1566,8 +1566,8 @@
             # 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.
             if self.has_missing:
                 # Replace with values.
-                mask_replace_blank_ei = masked_equal(self.missing[ei], 1.0)
-                self.back_calc[ei][mask_replace_blank_ei.mask] = 
self.values[ei][mask_replace_blank_ei.mask]
+                mask_replace_blank_ei = masked_equal(self.missing, 1.0)
+                self.back_calc[mask_replace_blank_ei.mask] = 
self.values[mask_replace_blank_ei.mask]
 
             # Calculate and return the chi-squared value.
             chi2_sum += chi2_rankN(self.values[ei], self.back_calc[ei], 
self.errors[ei])