diff --git a/src/classes/PFitter.cpp b/src/classes/PFitter.cpp index 06df6ed4..1b0ea4fc 100644 --- a/src/classes/PFitter.cpp +++ b/src/classes/PFitter.cpp @@ -396,7 +396,6 @@ void PFitter::GetPhaseParams() fPhase.resize(fRunInfo->GetNoOfParams()); for (unsigned int i=0; i fPhase.size()=" << fPhase.size() << std::endl; // analyze theory block for parameters. Phases are present in the following // default functions: @@ -414,16 +413,13 @@ void PFitter::GetPhaseParams() line.Contains("skewedGss") || line.Contains("skg ") || line.Contains("staticNKTF") || line.Contains("snktf ") || line.Contains("dynamicNKTF") || line.Contains("dnktf ")) { // phase is 1st param - std::cout << "debug> line: " << line.View() << std::endl; pos = 1; } if (line.Contains("internFld") || line.Contains("if ") || line.Contains("internBsl") || line.Contains("ib ")) { // phase is 2nd param - std::cout << "debug> line: " << line.View() << std::endl; pos = 2; } if (line.Contains("muMinusExpTF") || line.Contains("mmsetf ")) { // phase is 5th param - std::cout << "debug> line: " << line.View() << std::endl; pos = 5; } @@ -439,7 +435,6 @@ void PFitter::GetPhaseParams() if (tok->GetEntries() > pos) { ostr = dynamic_cast(tok->At(pos)); str = ostr->GetString(); - std::cout << "debug>> ostr=" << str.View() << std::endl; } // clean up delete tok; @@ -449,20 +444,17 @@ void PFitter::GetPhaseParams() if (str.Contains("fun")) { // function PIntVector parVec = GetParFromFun(str); for (int i=0; i par from fun: " << parVec[i] << std::endl; if (parVec[i] <= fRunInfo->GetNoOfParams()) fPhase[parVec[i]-1] = true; } } else if (str.Contains("map")) { // map PIntVector parVec = GetParFromMap(str); for (int i=0; i par from map: " << parVec[i] << std::endl; if (parVec[i] <= fRunInfo->GetNoOfParams()) fPhase[parVec[i]-1] = true; } } else { // must be a number int idx = str.Atoi(); - std::cout << "debug> idx=" << idx << std::endl; if (idx == 0) { // something went wrong, str is not an integer std::cerr << "PFitter::GetPhaseParams(): **ERROR** str=" << str.View() << " is not an integer!" << std::endl; return; @@ -475,9 +467,6 @@ void PFitter::GetPhaseParams() fPhase[idx] = true; } } - - for (int i=0; isize(); i++) { if (funList->at(i).fLine.Contains(funStr)) { - std::cout << "debug> funList " << i << ": " << funList->at(i).fLine.View() << std::endl; // tokenize function string tok = funList->at(i).fLine.Tokenize(" =+-*/"); if (tok == nullptr) { @@ -514,7 +502,6 @@ PIntVector PFitter::GetParFromFun(const TString funStr) str = ostr->GetString(); // parse tok for parX if (str.Contains("par")) { - std::cout << "debug> fun tok contains par: " << str.View() << std::endl; // find start idx of par in token Ssiz_t idx = str.Index("par"); idx += 3; @@ -522,12 +509,10 @@ PIntVector PFitter::GetParFromFun(const TString funStr) do { parStr += str[idx]; } while (isdigit(str[idx++])); - std::cout << "debug> par idx = " << parStr.View() << std::endl; parVec.push_back(parStr.Atoi()); } // parse tok for mapX if (str.Contains("map")) { - std::cout << "debug> fun tok contains map: " << str.View() << std::endl; // find start idx of par in token Ssiz_t idx = str.Index("map"); idx += 3; @@ -535,7 +520,6 @@ PIntVector PFitter::GetParFromFun(const TString funStr) do { mapStr += str[idx]; } while (isdigit(str[idx++])); - std::cout << "debug> map string from fun: " << mapStr.View() << std::endl; PIntVector mapParVec = GetParFromMap(mapStr); for (int k=0; k mapX: X=" << str << std::endl; int idx=str.Atoi(); if (idx == 0) {