From 04e9d4e04fa0067bbfbdc333a27ead6f37be30ad Mon Sep 17 00:00:00 2001 From: nemu Date: Wed, 17 Nov 2010 14:18:11 +0000 Subject: [PATCH] less strict handling of empty function blocks, than before --- ChangeLog | 1 + src/classes/PMsrHandler.cpp | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 42c004c4..4034611e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ changes since 0.8.0 =================================== FIXED fixes the inadequate attempt to use log max likelihood fit for asymmetry/non-muSR fit (MUSR-148) +CHANGED less strict handling of empty FUNCTION block CHANGED cosmetics in the y-labelling (MUSR-154) CHANGED maximum possible run number for the use in msr2data to numeric_limits::max() (MUSR-155) diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp index 810a95c8..a3472a24 100644 --- a/src/classes/PMsrHandler.cpp +++ b/src/classes/PMsrHandler.cpp @@ -2282,10 +2282,8 @@ Bool_t PMsrHandler::HandleFunctionsEntry(PMsrLines &lines) // check if an empty FUNCTIONS block is present if ((fFuncHandler->GetNoOfFuncs() == 0) && !lines.empty()) { - cerr << endl << ">> PMsrHandler::HandleFunctionsEntry: **ERROR** empty FUNCTIONS block are not supported!"; - cerr << endl << ">> If you want to keep it, just comment the whole block ;-)"; + cerr << endl << ">> PMsrHandler::HandleFunctionsEntry: **WARNING** empty FUNCTIONS block found!"; cerr << endl; - return false; } return true;