--- zaptel/mec2.h 2004-11-09 11:16:18.000000000 -0800 +++ zaptel-scrd/mec2.h 2005-08-05 03:51:03.000000000 -0700 @@ -239,12 +239,14 @@ /* compute the new convergence factor */ - Py_i = (ec->Ly_i >> DEFAULT_SIGMA_LY_I) * (ec->Ly_i >> DEFAULT_SIGMA_LY_I); - Py_i >>= 15; - if (ec->HCNTR_d > 0) { - Py_i = (1 << 15); - } - + /* If the hangover timer isn't running then compute the new convergence factor, otherwise set Py_i to 32768 */ + if (!ec->HCNTR_d) { + Py_i = (ec->Ly_i >> DEFAULT_SIGMA_LY_I) * (ec->Ly_i >> DEFAULT_SIGMA_LY_I); + Py_i >>= 15; + } else { + Py_i = (1 << 15); + } + #if 0 printf("Py: %e, Py_i: %e\n", Py, Py_i * AMPL_SCALE_1); #endif