LMU/musrfit
5
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity

mupp: RUN is now treated as a variable.

Browse Source
This commit is contained in:
suter_a
2026-05-20 12:45:13 +02:00
parent fe902ff62c
commit 0ce0f4fcce
4 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/musredit_qt5/mupp/Pmupp.cpp
+9
View File
@@ -453,6 +453,10 @@ PmuppCollection PParamDataHandler::ReadDbFile(const QString fln, bool &valid, QS
}
ival = token[0].toInt(&ok);
if (ok) { // run,,, title found
param.ResetParam();
param.SetName("RUN");
param.SetValue(ival);
run.AddParam(param);
run.SetNumber(ival);
QString title("");
for (int i=1; i<token.size(); i++)
@@ -680,6 +684,11 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
run.AddParam(param);
param.ResetParam();
} else if (headerCode[i] == PMUPP_RUN) {
param.SetName(headerInfo[i]);
param.SetValue(dval);
param.SetNegErr(0.0);
param.SetPosErr(0.0);
run.AddParam(param);
param.ResetParam();
run.SetNumber((int)dval);
run.SetName(QString("%1").arg((int)dval));
src/musredit_qt5/mupp/plotter/PMuppCanvas.cpp
+1 -1
View File
@@ -588,7 +588,7 @@ void PMuppCanvas::UpdateGraphs()
// set x-axis limits. This is needed that the graphs x-axis starts at 0.0
Double_t xmin=fMultiGraph->GetXaxis()->GetXmin();
Double_t xmax=fMultiGraph->GetXaxis()->GetXmax();
if (xmin > 0.0) {
if ((xmin > 0.0) && (fPlotData[0].xLabel.EqualTo("RUN"))) {
fMultiGraph->GetXaxis()->SetLimits(0.0, xmax);
}
src/musredit_qt6/mupp/Pmupp.cpp
+9
View File
@@ -542,6 +542,10 @@ PmuppCollection PParamDataHandler::ReadDbFile(const QString fln, bool &valid, QS
}
ival = token[0].toInt(&ok);
if (ok) { // run,,, title found
param.ResetParam();
param.SetName("RUN");
param.SetValue(ival);
run.AddParam(param);
run.SetNumber(ival);
QString title("");
for (int i=1; i<token.size(); i++)
@@ -780,6 +784,11 @@ PmuppCollection PParamDataHandler::ReadColumnParamFile(const QString fln, bool &
run.AddParam(param);
param.ResetParam();
} else if (headerCode[i] == PMUPP_RUN) {
param.SetName(headerInfo[i]);
param.SetValue(dval);
param.SetNegErr(0.0);
param.SetPosErr(0.0);
run.AddParam(param);
param.ResetParam();
run.SetNumber((int)dval);
run.SetName(QString("%1").arg((int)dval));
src/musredit_qt6/mupp/plotter/PMuppCanvas.cpp
+1 -1
View File
@@ -619,7 +619,7 @@ void PMuppCanvas::UpdateGraphs()
// set x-axis limits. This is needed that the graphs x-axis starts at 0.0
Double_t xmin=fMultiGraph->GetXaxis()->GetXmin();
Double_t xmax=fMultiGraph->GetXaxis()->GetXmax();
if (xmin > 0.0) {
if ((xmin > 0.0) && (fPlotData[0].xLabel.EqualTo("RUN"))) {
fMultiGraph->GetXaxis()->SetLimits(0.0, xmax);
}