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

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2021-11-01 08:22:44 +01:00
commit 3e6d55f0e8
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/musredit_qt5/musrWiz/PAdmin.cpp
View File

@ -534,7 +534,7 @@ bool PInstrumentDefXMLParser::startElement()
return false; return false;
backward.push_back(ival); backward.push_back(ival);
} }
detect.setForwards(backward); detect.setBackwards(backward);
// detector alpha // detector alpha
str = qAttr.value("alpha").toString(); str = qAttr.value("alpha").toString();
dval = str.toDouble(&ok); dval = str.toDouble(&ok);

8
src/musredit_qt5/musrWiz/PMusrWiz.cpp
View File

@ -2420,14 +2420,14 @@ int PMusrWiz::writeMsrFileSingleHisto()
fout << "PLOT " << fMsrData->getFitType()-1 << endl; fout << "PLOT " << fMsrData->getFitType()-1 << endl;
fout << "lifetimecorrection" << endl; fout << "lifetimecorrection" << endl;
fout << "runs 1-" << setup->getNoOfLogicalDetectors() << endl; fout << "runs 1-" << setup->getNoOfLogicalDetectors() << endl;
fout << "range 0.0 " << fMsrData->getFitEnd() << endl; fout << "range 0.0 " << fMsrData->getFitEnd() << " -0.35 0.35" << endl;
fout << "view_packing " << fMsrData->getPacking() << endl; fout << "view_packing " << fMsrData->getPacking() << endl;
fout << endl << line << endl; fout << endl << line << endl;
#else #else
fout << "PLOT " << fMsrData->getFitType()-1 << Qt::endl; fout << "PLOT " << fMsrData->getFitType()-1 << Qt::endl;
fout << "lifetimecorrection" << Qt::endl; fout << "lifetimecorrection" << Qt::endl;
fout << "runs 1-" << setup->getNoOfLogicalDetectors() << Qt::endl; fout << "runs 1-" << setup->getNoOfLogicalDetectors() << Qt::endl;
fout << "range 0.0 " << fMsrData->getFitEnd() << Qt::endl; fout << "range 0.0 " << fMsrData->getFitEnd() << " -0.35 0.35" << Qt::endl;
fout << "view_packing " << fMsrData->getPacking() << Qt::endl; fout << "view_packing " << fMsrData->getPacking() << Qt::endl;
fout << Qt::endl << line << Qt::endl; fout << Qt::endl << line << Qt::endl;
#endif #endif
@ -2826,7 +2826,7 @@ int PMusrWiz::writeMsrFileAsymmetry()
fout << "runs 1-" << setup->getNoOfLogicalAsymDetectors() << endl; fout << "runs 1-" << setup->getNoOfLogicalAsymDetectors() << endl;
else else
fout << "runs 1" << endl; fout << "runs 1" << endl;
fout << "range 0.0 " << fMsrData->getFitEnd() << endl; fout << "range 0.0 " << fMsrData->getFitEnd() << " -0.35 0.35" << endl;
fout << "view_packing " << fMsrData->getPacking() << endl; fout << "view_packing " << fMsrData->getPacking() << endl;
fout << endl << line << endl; fout << endl << line << endl;
#else #else
@ -2836,7 +2836,7 @@ int PMusrWiz::writeMsrFileAsymmetry()
fout << "runs 1-" << setup->getNoOfLogicalAsymDetectors() << Qt::endl; fout << "runs 1-" << setup->getNoOfLogicalAsymDetectors() << Qt::endl;
else else
fout << "runs 1" << Qt::endl; fout << "runs 1" << Qt::endl;
fout << "range 0.0 " << fMsrData->getFitEnd() << Qt::endl; fout << "range 0.0 " << fMsrData->getFitEnd() << " -0.35 0.35" << Qt::endl;
fout << "view_packing " << fMsrData->getPacking() << Qt::endl; fout << "view_packing " << fMsrData->getPacking() << Qt::endl;
fout << Qt::endl << line << Qt::endl; fout << Qt::endl << line << Qt::endl;
#endif #endif

2
src/musredit_qt6/musrWiz/PAdmin.cpp
View File

@ -535,7 +535,7 @@ bool PInstrumentDefXMLParser::startElement()
return false; return false;
backward.push_back(ival); backward.push_back(ival);
} }
detect.setForwards(backward); detect.setBackwards(backward);
// detector alpha // detector alpha
str = qAttr.value("alpha").toString(); str = qAttr.value("alpha").toString();
dval = str.toDouble(&ok); dval = str.toDouble(&ok);

4
src/musredit_qt6/musrWiz/PMusrWiz.cpp
View File

@ -2263,7 +2263,7 @@ int PMusrWiz::writeMsrFileSingleHisto()
fout << "PLOT " << fMsrData->getFitType()-1 << Qt::endl; fout << "PLOT " << fMsrData->getFitType()-1 << Qt::endl;
fout << "lifetimecorrection" << Qt::endl; fout << "lifetimecorrection" << Qt::endl;
fout << "runs 1-" << setup->getNoOfLogicalDetectors() << Qt::endl; fout << "runs 1-" << setup->getNoOfLogicalDetectors() << Qt::endl;
fout << "range 0.0 " << fMsrData->getFitEnd() << Qt::endl; fout << "range 0.0 " << fMsrData->getFitEnd() << " -0.35 0.35" << Qt::endl;
fout << "view_packing " << fMsrData->getPacking() << Qt::endl; fout << "view_packing " << fMsrData->getPacking() << Qt::endl;
fout << Qt::endl << line << Qt::endl; fout << Qt::endl << line << Qt::endl;
@ -2498,7 +2498,7 @@ int PMusrWiz::writeMsrFileAsymmetry()
fout << "runs 1-" << setup->getNoOfLogicalAsymDetectors() << Qt::endl; fout << "runs 1-" << setup->getNoOfLogicalAsymDetectors() << Qt::endl;
else else
fout << "runs 1" << Qt::endl; fout << "runs 1" << Qt::endl;
fout << "range 0.0 " << fMsrData->getFitEnd() << Qt::endl; fout << "range 0.0 " << fMsrData->getFitEnd() << " -0.35 0.35" << Qt::endl;
fout << "view_packing " << fMsrData->getPacking() << Qt::endl; fout << "view_packing " << fMsrData->getPacking() << Qt::endl;
fout << Qt::endl << line << Qt::endl; fout << Qt::endl << line << Qt::endl;