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 2019-01-22 15:22:59 +01:00
commit 467a799056
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/PTheory.h
View File

@ -193,10 +193,10 @@ static PTheoDataBase fgTheoDataBase[THEORY_MAX] = {
"internFld", "if", "(fraction phase frequency Trate Lrate)", "(fraction phase frequency Trate Lrate tshift)"},
{THEORY_INTERNAL_FIELD_KORNILOV, THEORY_PARAM_INTERNAL_FIELD_KORNILOV, false,
"internFldGK", "ifgk", "(fraction frequency Trate Lrate beta)", "(fraction frequency Trate Lrate beta tshift)"},
"internFldGK", "ifgk", "(fraction frequency sigma lambda beta)", "(fraction frequency sigma lambda beta tshift)"},
{THEORY_INTERNAL_FIELD_LARKIN, THEORY_PARAM_INTERNAL_FIELD_LARKIN, false,
"internFldLL", "ifll", "(fraction frequency Trate Lrate beta)", "(fraction frequency Trate Lrate beta tshift)"},
"internFldLL", "ifll", "(fraction frequency sigma lambda beta)", "(fraction frequency sigma lambda beta tshift)"},
{THEORY_BESSEL, THEORY_PARAM_BESSEL, false,
"bessel", "b", "(phase frequency)", "(phase frequency tshift)"},

2
src/musredit_qt5/musredit/musredit.pro
View File

@ -9,11 +9,13 @@ packagesExist(Qt5WebEngine) {
isEmpty( HAVE_QT_WEB_ENGINE ) {
packagesExist(QtWebKit) {
message("QtWebKit found")
DEFINES += HAVE_QT_WEB_KIT
HAVE_QT_WEB_ENGINE = 0
}
# Mac calls it Qt5WebKit, hence
packagesExist(Qt5WebKit) {
message("Qt5WebKit found")
DEFINES += HAVE_QT_WEB_KIT
HAVE_QT_WEB_ENGINE = 0
}
}