Commit 2edf36eb83f4ae50be20e5d131db6d811b529d08
1 parent
2daefb50
Correct logging output (optimizer result was dumped twice)
Showing
1 changed file
with
12 additions
and
6 deletions
src/ctlike/ctlike.cpp
| @@ -461,7 +461,18 @@ void ctlike::optimize_lm(void) | @@ -461,7 +461,18 @@ void ctlike::optimize_lm(void) | ||
| 461 | 461 | ||
| 462 | // Optionally refit | 462 | // Optionally refit |
| 463 | if (m_refit) { | 463 | if (m_refit) { |
| 464 | + | ||
| 465 | + // Dump new header | ||
| 466 | + log.indent(0); | ||
| 467 | + if (logTerse()) { | ||
| 468 | + log << std::endl; | ||
| 469 | + log.header1("Maximum likelihood re-optimisation"); | ||
| 470 | + log.indent(1); | ||
| 471 | + } | ||
| 472 | + | ||
| 473 | + // Optimise again | ||
| 464 | m_obs.optimize(*opt); | 474 | m_obs.optimize(*opt); |
| 475 | + | ||
| 465 | } | 476 | } |
| 466 | 477 | ||
| 467 | // Compute errors | 478 | // Compute errors |
| @@ -470,13 +481,8 @@ void ctlike::optimize_lm(void) | @@ -470,13 +481,8 @@ void ctlike::optimize_lm(void) | ||
| 470 | // Store maximum log likelihood value | 481 | // Store maximum log likelihood value |
| 471 | m_logL = -(opt->value()); | 482 | m_logL = -(opt->value()); |
| 472 | 483 | ||
| 473 | - // Write optimization results | 484 | + // Remove indent |
| 474 | log.indent(0); | 485 | log.indent(0); |
| 475 | - if (logTerse()) { | ||
| 476 | - log << std::endl; | ||
| 477 | - log.header1("Maximum likelihood optimization results"); | ||
| 478 | - log << *opt << std::endl; | ||
| 479 | - } | ||
| 480 | 486 | ||
| 481 | // Return | 487 | // Return |
| 482 | return; | 488 | return; |