From c41fe0942276c66bacc33d330484c42df85a6283 Mon Sep 17 00:00:00 2001
From: nemu <nemu>
Date: Thu, 7 Oct 2010 05:42:21 +0000
Subject: [PATCH] fixed mangled chisq/maxLH issue (MUSR-148)

---
 ChangeLog                   |  1 +
 src/classes/PMsrHandler.cpp | 43 ++++++++++++++-----------------------
 2 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index faf1547a..32050e18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@ NEW integration of a few external musrfit plug-ins into the standard build proce
 NEW default estimates for 'data' and 'background' entries in RUN blocks
 NEW directory with some msr- and data-files for quick testing of new musrfit installations
 NEW option to musrt0: the key 'T' will set the t0 cursor to the maximum of the histogram
+FIXED chisq/maxLH lables in the statistics block are properly handled now (MUSR-148)
 FIXED y-unzoom failure for musrt0 (MUSR-77)
 FIXED fitting issue for boundaries none/none (MUSR-136)
 FIXED formatting of the ASCII fit output file for long parameter names (MUSR-142)
diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp
index feeccd0a..decba739 100644
--- a/src/classes/PMsrHandler.cpp
+++ b/src/classes/PMsrHandler.cpp
@@ -247,6 +247,13 @@ Int_t PMsrHandler::ReadMsrFile()
     if (!HandleStatisticEntry(statistic))
       result = PMUSR_MSR_SYNTAX_ERROR;
 
+  // check if chisq or max.log likelihood
+  fStatistic.fChisq = true;
+  for (UInt_t i=0; i<fCommands.size(); i++) {
+    if (fCommands[i].fLine.Contains("MAX_LIKELIHOOD"))
+      fStatistic.fChisq = false; // max.log likelihood
+  }
+
   // fill parameter-in-use vector
   if (result == PMUSR_SUCCESS)
     FillParameterInUse(theory, functions, run);
@@ -945,31 +952,20 @@ Int_t PMsrHandler::WriteMsrLogFile(const Bool_t messages)
         if (sstr.BeginsWith("STATISTIC")) {
           TDatime dt;
           fout << "STATISTIC --- " << dt.AsSQLString() << endl;
-        } else if (sstr.BeginsWith("chisq")) {
+        } else if (sstr.BeginsWith("chisq") || sstr.BeginsWith("maxLH")) {
           partialStatisticBlockFound = false;
           if (fStatistic.fValid) { // valid fit result
-            str  = "  chisq = ";
+            if (fStatistic.fChisq)
+              str = "  chisq = ";
+            else
+              str = "  maxLH = ";
             str += fStatistic.fMin;
             str += ", NDF = ";
             str += fStatistic.fNdf;
-            str += ", chisq/NDF = ";
-            str += fStatistic.fMin / fStatistic.fNdf;
-            fout << str.Data() << endl;
-            if (messages)
-              cout << endl << str.Data() << endl;
-          } else {
-           fout << "*** FIT DID NOT CONVERGE ***" << endl;
-           if (messages)
-             cout << endl << "*** FIT DID NOT CONVERGE ***" << endl;
-          }
-        } else if (sstr.BeginsWith("maxLH")) {
-          partialStatisticBlockFound = false;
-          if (fStatistic.fValid) { // valid fit result
-            str  = "  maxLH = ";
-            str += fStatistic.fMin;
-            str += ", NDF = ";
-            str += fStatistic.fNdf;
-            str += ", maxLH/NDF = ";
+            if (fStatistic.fChisq)
+              str += ", chisq/NDF = ";
+            else
+              str += ", maxLH/NDF = ";
             str += fStatistic.fMin / fStatistic.fNdf;
             fout << str.Data() << endl;
             if (messages)
@@ -3718,13 +3714,6 @@ Bool_t PMsrHandler::HandleStatisticEntry(PMsrLines &lines)
     return true;
   }
 
-  // check if chisq or max.log likelihood
-  fStatistic.fChisq = true;
-  for (UInt_t i=0; i<fCommands.size(); i++) {
-    if (fCommands[i].fLine.Contains("MAX_LIKELIHOOD"))
-      fStatistic.fChisq = false; // max.log likelihood
-  }
-
   Char_t str[128];
   Char_t date[128];
   Char_t time[128];