diff --git a/src/ToDo.txt b/src/ToDo.txt index decb339f..a7ec1d70 100644 --- a/src/ToDo.txt +++ b/src/ToDo.txt @@ -31,6 +31,8 @@ short term: * fix problems in FUNCTIONS of the form (sin(par1)) **DONE** 08-02-18 +* fix output problems of the mlog files + * implement table based theory functions (LF stuff) * if a parameter is not used at all, minuit is still varying it!! This is stupid. diff --git a/src/classes/PMsrHandler.cpp b/src/classes/PMsrHandler.cpp index 55f50069..a781538e 100644 --- a/src/classes/PMsrHandler.cpp +++ b/src/classes/PMsrHandler.cpp @@ -279,14 +279,16 @@ int PMsrHandler::WriteMsrLogFile() f << left << param_iter->fName.Data(); f << " "; // value of the parameter - f.width(10); + f.width(9); f.precision(prec); f << left << param_iter->fValue; + f << " "; // value of step/error/neg.error - f.width(12); + f.width(11); f.precision(prec); f << left << param_iter->fStep; - f.width(12); + f << " "; + f.width(11); f.precision(prec); if ((param_iter->fNoOfParams == 5) || (param_iter->fNoOfParams == 7)) // pos. error given if (param_iter->fPosErrorPresent) // pos error is a number @@ -295,14 +297,17 @@ int PMsrHandler::WriteMsrLogFile() f << left << "none"; else // no pos. error f << left << "none"; + f << " "; // boundaries if (param_iter->fNoOfParams > 5) { - f.width(8); + f.width(7); f.precision(prec); f << left << param_iter->fLowerBoundary; - f.width(8); + f << " "; + f.width(7); f.precision(prec); f << left << param_iter->fUpperBoundary; + f << " "; } // terminate line f << endl; diff --git a/src/tests/fio_test/fio_test.cpp b/src/tests/fio_test/fio_test.cpp index 6e5a8bde..c7789ad0 100644 --- a/src/tests/fio_test/fio_test.cpp +++ b/src/tests/fio_test/fio_test.cpp @@ -12,19 +12,20 @@ int main() } const int prec=6; - double val = 0.258466548916354835498465; + double val1 = 0.258466548916354835498465; + double val2 = 0.000258466548916354835498465; f.width(9); f.precision(prec); - f << left << val; + f << left << val1; f << " "; f.width(9); f.precision(prec); - f << left << val; + f << left << val2; f << " "; f.width(9); f.precision(prec); - f << left << val; + f << left << val1; f.close(); diff --git a/src/tests/fio_test/fio_test.txt b/src/tests/fio_test/fio_test.txt deleted file mode 100644 index d1403634..00000000 --- a/src/tests/fio_test/fio_test.txt +++ /dev/null @@ -1 +0,0 @@ -0.258467 0.258467 0.258467 \ No newline at end of file