LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

removed merge conflict

Browse Source
This commit is contained in:
suter_a 2020-05-14 15:50:50 +02:00
parent 5d10faf63e
commit 0dfb181b4d
4 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -209,7 +209,7 @@ endif (qt_based_tools)
#--- if NeXus check also for HDF4, HDF5, and MXML ----------------------------- #--- if NeXus check also for HDF4, HDF5, and MXML -----------------------------
if (nexus) if (nexus)
find_package(HDF5 COMPONENTS CXX REQUIRED ) find_package(HDF5 COMPONENTS CXX REQUIRED )
#//as35 find_package(HDF4 REQUIRED) find_package(HDF4 REQUIRED)
find_package(NeXus REQUIRED) find_package(NeXus REQUIRED)
add_definitions(-DPNEXUS_ENABLED) add_definitions(-DPNEXUS_ENABLED)
endif (nexus) endif (nexus)
@ -271,7 +271,7 @@ endif (NOT CUDA_FOUND AND NOT OpenCL_FOUND AND NOT DKS_FOUND)
if (nexus) if (nexus)
message("") message("")
#//as35 message(" HDF4 found in ${HDF4_INCLUDE_DIRS}") message(" HDF4 found in ${HDF4_INCLUDE_DIRS}")
message(" HDF5 found in ${HDF5_INCLUDE_DIRS}") message(" HDF5 found in ${HDF5_INCLUDE_DIRS}")
message(" NeXus found in ${NEXUS_INCLUDE_DIR}") message(" NeXus found in ${NEXUS_INCLUDE_DIR}")
endif (nexus) endif (nexus)

1
src/musredit_qt5/mupp/CMakeLists.txt
View File

@ -49,7 +49,6 @@ set(MUPP_SOURCE_FILES
PmuppScript.cpp PmuppScript.cpp
PmuppGui.cpp PmuppGui.cpp
PVarDialog.cpp PVarDialog.cpp
#as35 PGetNormValDialog.cpp
) )
if (APPLE) if (APPLE)

18
src/musredit_qt5/mupp/PmuppGui.cpp
View File

@ -596,13 +596,6 @@ void PmuppGui::setupToolActions()
fNormalizeAction->setCheckable(true); fNormalizeAction->setCheckable(true);
connect( fNormalizeAction, SIGNAL( changed() ), this, SLOT( normalize() ) ); connect( fNormalizeAction, SIGNAL( changed() ), this, SLOT( normalize() ) );
menu->addAction(fNormalizeAction); menu->addAction(fNormalizeAction);
/* //as35 - eventually also remove PGetNormValDialog.* from the source
a = new QAction(tr( "Normalize by Value" ), this);
a->setStatusTip( tr("Normalize by Value") );
connect( a, SIGNAL( triggered() ), this, SLOT( normVal() ) );
menu->addAction(a);
*/
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1858,7 +1851,6 @@ void PmuppGui::createMacro()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 xx = fParamDataHandler->GetValues(collName, xLabel);
getMinMax(xx, xMin, xMax); getMinMax(xx, xMin, xMax);
// a couple of x-vector specifics // a couple of x-vector specifics
if ((xLabel == "dataT") || (xLabel == "dataE")) if ((xLabel == "dataT") || (xLabel == "dataE"))
@ -1876,21 +1868,18 @@ void PmuppGui::createMacro()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yy = fParamDataHandler->GetValues(collName, yLabel);
yyPosErr = getPosErr(collName, yLabel, ok); yyPosErr = getPosErr(collName, yLabel, ok);
if (!ok) { if (!ok) {
QString msg = QString("Couldn't get y-axis pos. error data from '%1', coll: '%2'").arg(yLabel).arg(collName); QString msg = QString("Couldn't get y-axis pos. error data from '%1', coll: '%2'").arg(yLabel).arg(collName);
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yyPosErr = fParamDataHandler->GetPosErr(collName, yLabel);
yyNegErr = getNegErr(collName, yLabel, ok); yyNegErr = getNegErr(collName, yLabel, ok);
if (!ok) { if (!ok) {
QString msg = QString("Couldn't get y-axis neg. error data from '%1', coll: '%2'").arg(yLabel).arg(collName); QString msg = QString("Couldn't get y-axis neg. error data from '%1', coll: '%2'").arg(yLabel).arg(collName);
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yyNegErr = fParamDataHandler->GetNegErr(collName, yLabel);
yLabel = substituteDefaultLabels(yLabel); yLabel = substituteDefaultLabels(yLabel);
getMinMax(yy, yMin, yMax); getMinMax(yy, yMin, yMax);
// create TGraph objects // create TGraph objects
@ -2051,7 +2040,6 @@ void PmuppGui::plot()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 xx = fParamDataHandler->GetValues(collName, xLabel);
xLabel = substituteDefaultLabels(xLabel); xLabel = substituteDefaultLabels(xLabel);
fout << "xLabel: " << xLabel << ", "; fout << "xLabel: " << xLabel << ", ";
@ -2067,7 +2055,6 @@ void PmuppGui::plot()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yy = fParamDataHandler->GetValues(collName, yLabel);
yyy.push_back(yy); yyy.push_back(yy);
yyPosErr = getPosErr(collName, yLabel, ok); yyPosErr = getPosErr(collName, yLabel, ok);
if (!ok) { if (!ok) {
@ -2075,7 +2062,6 @@ void PmuppGui::plot()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yyPosErr = fParamDataHandler->GetPosErr(collName, yLabel);
yyyPosErr.push_back(yyPosErr); yyyPosErr.push_back(yyPosErr);
yyNegErr = getNegErr(collName, yLabel, ok); yyNegErr = getNegErr(collName, yLabel, ok);
if (!ok) { if (!ok) {
@ -2083,7 +2069,6 @@ void PmuppGui::plot()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yyNegErr = fParamDataHandler->GetNegErr(collName, yLabel);
yyyNegErr.push_back(yyNegErr); yyyNegErr.push_back(yyNegErr);
yLabel = substituteDefaultLabels(yLabel); yLabel = substituteDefaultLabels(yLabel);
fout << "yLabel: " << yLabel << ", "; fout << "yLabel: " << yLabel << ", ";
@ -2100,7 +2085,6 @@ void PmuppGui::plot()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yy = fParamDataHandler->GetValues(collName, yLabel);
yyy.push_back(yy); yyy.push_back(yy);
yyPosErr = getPosErr(collName, yLabel, ok); yyPosErr = getPosErr(collName, yLabel, ok);
if (!ok) { if (!ok) {
@ -2108,7 +2092,6 @@ void PmuppGui::plot()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yyPosErr = fParamDataHandler->GetPosErr(collName, yLabel);
yyyPosErr.push_back(yyPosErr); yyyPosErr.push_back(yyPosErr);
yyNegErr = getNegErr(collName, yLabel, ok); yyNegErr = getNegErr(collName, yLabel, ok);
if (!ok) { if (!ok) {
@ -2116,7 +2099,6 @@ void PmuppGui::plot()
QMessageBox::critical(this, "**ERROR**", msg); QMessageBox::critical(this, "**ERROR**", msg);
return; return;
} }
//as35 yyNegErr = fParamDataHandler->GetNegErr(collName, yLabel);
yyyNegErr.push_back(yyNegErr); yyyNegErr.push_back(yyNegErr);
yLabel = substituteDefaultLabels(yLabel); yLabel = substituteDefaultLabels(yLabel);

16
src/musredit_qt5/mupp/PmuppScript.cpp
View File

@ -312,10 +312,6 @@ int PmuppScript::addX(const QString str)
foundInColl = false; foundInColl = false;
collName = coll->GetName(); collName = coll->GetName();
break; break;
/* //as35
std::cerr << std::endl << "**ERROR** couldn't find '" << label.toLatin1().constData() << "' in collection '" << coll->GetName().toLatin1().constData() << "'" << std::endl << std::endl;
return -4;
*/ //as35
} }
} }
// second check variables // second check variables
@ -350,10 +346,6 @@ int PmuppScript::addX(const QString str)
if (!foundLabel(coll, label)) { // label not found if (!foundLabel(coll, label)) { // label not found
foundInColl = false; foundInColl = false;
collName = coll->GetName(); collName = coll->GetName();
/* //as35
std::cerr << std::endl << "**ERROR** couldn't find '" << label.toLatin1().constData() << "' in collection '" << coll->GetName().toLatin1().constData() << "'" << std::endl << std::endl;
return -4;
*/ //as35
} }
// second check variables // second check variables
if (!foundVariable(label)) { // label not found if (!foundVariable(label)) { // label not found
@ -412,10 +404,6 @@ int PmuppScript::addY(const QString str)
collName = coll->GetName(); collName = coll->GetName();
idx = j; idx = j;
break; break;
/* //as35
std::cerr << std::endl << "**ERROR** couldn't find '" << label[j].toLatin1().constData() << "' in collection '" << coll->GetName().toLatin1().constData() << "'" << std::endl << std::endl;
return -4;
*/ //as35
} }
} }
} }
@ -459,10 +447,6 @@ int PmuppScript::addY(const QString str)
collName = coll->GetName(); collName = coll->GetName();
idx = i; idx = i;
break; break;
/* //as35
std::cerr << std::endl << "**ERROR** couldn't find '" << label[i].toLatin1().constData() << "' in collection '" << coll->GetName().toLatin1().constData() << "'" << std::endl << std::endl;
return -4;
*/ //as35
} }
} }
// second check variables // second check variables