Merged muonspin/musrfit:root6 into master
This commit is contained in:
commit
acdfa60870
@ -2198,7 +2198,8 @@ int PMsr2Data::WriteOutput(const string &outfile, const vector<unsigned int>& pa
|
|||||||
WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, outFile.width(), db);
|
WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, outFile.width(), db);
|
||||||
outFile << ", ";
|
outFile << ", ";
|
||||||
} else {
|
} else {
|
||||||
outFile << (*msrParamList)[i].fValue << ", ";
|
WriteValue(outFile, (*msrParamList)[i].fValue, fabs((*msrParamList)[i].fStep), outFile.width(), db);
|
||||||
|
outFile << ", ";
|
||||||
}
|
}
|
||||||
if ((*msrParamList)[i].fPosErrorPresent) {
|
if ((*msrParamList)[i].fPosErrorPresent) {
|
||||||
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, outFile.width(), db);
|
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, outFile.width(), db);
|
||||||
@ -2416,7 +2417,7 @@ int PMsr2Data::WriteOutput(const string &outfile, const vector<unsigned int>& pa
|
|||||||
if ((*msrParamList)[i].fPosErrorPresent)
|
if ((*msrParamList)[i].fPosErrorPresent)
|
||||||
WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, maxlength, db);
|
WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, maxlength, db);
|
||||||
else
|
else
|
||||||
WriteValue(outFile, (*msrParamList)[i].fValue, maxlength);
|
WriteValue(outFile, (*msrParamList)[i].fValue, fabs((*msrParamList)[i].fStep), maxlength, db);
|
||||||
|
|
||||||
if ((*msrParamList)[i].fPosErrorPresent)
|
if ((*msrParamList)[i].fPosErrorPresent)
|
||||||
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, maxlength, db);
|
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, maxlength, db);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user