From f496416062d9008bfadae5a4a273e70947ac820a Mon Sep 17 00:00:00 2001
From: "Bastian M. Wojek" <basti@kth.se>
Date: Thu, 11 Nov 2010 08:16:25 +0000
Subject: [PATCH] Fixed ChangeLog

---
 ChangeLog                 | 23 +++++++++++++----------
 src/classes/PMsr2Data.cpp |  4 ++--
 src/msr2data.cpp          | 15 +++++++--------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4bc0a943..359345ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,20 +1,28 @@
 #---------------------------------------------------------------------
 # ChangeLog
-# AS, 2010/08/26
+# AS, 2010/11/11
 # $Id$
 #---------------------------------------------------------------------
 
+changes since 0.8.0
+===================================
+CHANGED maximum possible run number for the use in msr2data to numeric_limits<unsigned int>::max() (MUSR-155)
+
 musrfit 0.8.0 - changes since 0.7.0
-==================================
+===================================
+NEW added y-range option to usr_fit_ranges in the PLOT block (MUSR-144).
 NEW added the option to split a user function into a global and run-block related part (see MUSR-134). If the 
     global option is used, this can potentially increase the efficiency up to the number of run-blocks since 
     the time consuming calculations are done only once per changed parameter set. Examples where this approach
     is profitable are: Abrikosov vortex lattice fits, Nonlocal Meissner screening.
-CHANGED maximum possible run number for the use in msr2data to numeric_limits<unsigned int>::max() (MUSR-155)
+FIXED compilation of BMWlibs with gcc 3.x
+FIXED hanging musrt0's should be eliminated now (MUSR-153)
+FIXED wrong WARNING message for use_fit_ranges
+FIXED bug in event handling leading to crash for non-muSR when switching between view and difference view
+CHANGED improved y-range scaling for Fourier
 
 musrfit 0.7.0 - changes since 0.6.0
 ===================================
-NEW added y-range option to usr_fit_ranges in the PLOT block (MUSR-144).
 NEW added FIT_RANGE RESET | start end | s1 e1 s2 e2 .. sN eN command to the COMMAND block
 NEW added FIX/RELEASE/RESTORE minuit2 command to the COMMAND block 
 NEW implemented more checks on the integrity of the msr-file
@@ -30,11 +38,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 compilation of BMWlibs with gcc 3.x
-FIXED hanging musrt0's should be eliminated now (MUSR-153)
-FIXED wrong WARNING message for use_fit_ranges
-FIXED bug in event handling leading to crash for non-muSR when switching between view and difference view
-FIXED chisq/maxLH lables in the statistics block are properly handled now (MUSR-148)
+FIXED chisq/maxLH labels 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)
@@ -62,7 +66,6 @@ FIXED warning messages
 FIXED db data tag reading error
 FIXED usage of BOOST >= 1.38.0
 FIXED the extraction of the time resolution for the mud data format, since MUD_getHistFsPerBin seems sometimes to return just crap.
-CHANGED improved y-range scaling for Fourier
 CHANGED musredit: change into the msr-file directory before calling musrview. This is needed if userFcn's are using startup XMLs.
 CHANGED musredit: improved file system watcher notification mechanism to prevent multiple user notifications.
 CHANGED fit range decimal precision handling of PMsrHandler improved (MUSR-150 request). It is now
diff --git a/src/classes/PMsr2Data.cpp b/src/classes/PMsr2Data.cpp
index 90b02acc..7206cf1b 100644
--- a/src/classes/PMsr2Data.cpp
+++ b/src/classes/PMsr2Data.cpp
@@ -156,7 +156,7 @@ int PMsr2Data::DetermineRunNumberDigits(unsigned int runNo) const
     strLine.clear();
     strLine.str(line);
     strLine >> firstOnLine;
-    if (!firstOnLine.compare("RUN")) {
+    if (!to_lower_copy(firstOnLine).compare("run")) {
        string::size_type loc = line.rfind(tempRunNumber.str());
        if ( loc != string::npos ) {
          while ( --loc >= 0 ) {
@@ -527,7 +527,7 @@ bool PMsr2Data::PrepareNewInputFile(unsigned int tempRun) const
     strLine.clear();
     strLine.str(line);
     strLine >> firstOnLine;
-    if (!firstOnLine.compare("RUN")) {
+    if (!to_lower_copy(firstOnLine).compare("run")) {
        string::size_type loc = line.rfind(tempRunNumber.str());
        if ( loc != string::npos ) {
          line.replace(loc, fRunNumberDigits, newRunNumber.str());
diff --git a/src/msr2data.cpp b/src/msr2data.cpp
index 2c1af96e..1ee98387 100644
--- a/src/msr2data.cpp
+++ b/src/msr2data.cpp
@@ -59,17 +59,16 @@ using namespace boost::algorithm;
  *
  * \param s string
  */
-bool isNumber(const string &s) // will be replaced by boost::lexical_cast at some time
+bool isNumber(const string &s)
 {
   unsigned int number;
-  istringstream iss;
-  ostringstream oss;
-  iss.str(s);
-  iss >> number;
-  oss << number;
-  if (iss.str().compare(oss.str()))
+  try {
+    number = boost::lexical_cast<unsigned int>(s);
+    return true;
+  }
+  catch(boost::bad_lexical_cast &) {
     return false;
-  return true;
+  }
 }
 
 //--------------------------------------------------------------------------