diff --git a/src/classes/PFitter.cpp b/src/classes/PFitter.cpp index 44eb3d0d..3ce534ab 100644 --- a/src/classes/PFitter.cpp +++ b/src/classes/PFitter.cpp @@ -280,19 +280,19 @@ bool PFitter::SetParameters() } else { // add free parameter // check if boundaries are given if (fParams[i].fNoOfParams > 5) { // boundaries given -cout << endl << ">> name=" << fParams[i].fName.Data() << ", lower=" << fParams[i].fLowerBoundaryPresent << ", upper=" << fParams[i].fUpperBoundaryPresent; +//cout << endl << ">> name=" << fParams[i].fName.Data() << ", lower=" << fParams[i].fLowerBoundaryPresent << ", upper=" << fParams[i].fUpperBoundaryPresent; if (fParams[i].fLowerBoundaryPresent && fParams[i].fUpperBoundaryPresent) { // upper and lower boundaries given -cout << endl << ">> lower and upper"; +//cout << endl << ">> lower and upper"; fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep, fParams[i].fLowerBoundary, fParams[i].fUpperBoundary); } else if (fParams[i].fLowerBoundaryPresent && !fParams[i].fUpperBoundaryPresent) { // lower boundary limited -cout << endl << ">> lower only"; +//cout << endl << ">> lower only"; fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep); fMnUserParams.SetLowerLimit(fParams[i].fName.Data(), fParams[i].fLowerBoundary); } else { // upper boundary limited -cout << endl << ">> upper only"; +//cout << endl << ">> upper only"; fMnUserParams.Add(fParams[i].fName.Data(), fParams[i].fValue, fParams[i].fStep); fMnUserParams.SetUpperLimit(fParams[i].fName.Data(), fParams[i].fUpperBoundary); } @@ -301,7 +301,7 @@ cout << endl << ">> upper only"; } } } -cout << endl; +//cout << endl; // check if there is an unused parameter, if so, fix it for (unsigned int i=0; ifLine.Copy(); +cout << endl << ">> str = " << str.Data(); // remove theory line comment if present, i.e. something starting with '(' int index = str.Index("("); if (index > 0) // theory line comment present @@ -696,16 +697,16 @@ void PTheory::MakeCleanAndTidyTheoryBlock(PMsrLines *fullTheoryBlock) str = ostr->GetString(); // check if the line is just a '+' if so nothing to be done if (str.Contains("+")) - return; + continue; // check if the function is a polynom if (!str.CompareTo("p") || str.Contains("polynom")) { MakeCleanAndTidyPolynom(i, fullTheoryBlock); - return; + continue; } // check if the function is a userFcn if (!str.CompareTo("u") || str.Contains("userFcn")) { MakeCleanAndTidyUserFcn(i, fullTheoryBlock); - return; + continue; } // search the theory function for (unsigned int j=0; j