From e555d27d531d77df2a31b3b9b92618d303fed714 Mon Sep 17 00:00:00 2001 From: ivar <amvdw95@gmail.com> Date: Thu, 26 Apr 2012 11:30:36 +0000 Subject: [PATCH] --- da/baseclasses/optimizer.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/da/baseclasses/optimizer.py b/da/baseclasses/optimizer.py index 38e6b10c..ab2439e1 100755 --- a/da/baseclasses/optimizer.py +++ b/da/baseclasses/optimizer.py @@ -324,11 +324,8 @@ class Optimizer(object): # Screen for outliers greather than 3x model-data mismatch, only apply if obs may be rejected res = self.obs[n]-self.Hx[n] -<<<<<<< .mine print 'res',res, self.obs[n],self.Hx[n] -======= - print 'res',self.obs[n],self.Hx[n] ->>>>>>> .r1009 + if self.may_reject[n]: threshold = self.rejection_threshold*np.sqrt(self.R[n,n]) if np.abs(res) > threshold: -- GitLab