diff --git a/configure.ac b/configure.ac index e211ea63..9ecabaf4 100644 --- a/configure.ac +++ b/configure.ac @@ -1263,8 +1263,6 @@ AC_CONFIG_FILES([Makefile \ src/musredit_qt5/Makefile \ src/musredit/Makefile \ src/musrgui/Makefile \ - src/musredit_qt5/musredit_startup.xml \ - src/musredit/musredit_startup.xml \ src/musrgui/musrgui_startup.xml]) AC_OUTPUT @@ -1425,3 +1423,15 @@ echo " Programs: ${INSTALLDIR}/bin" echo " XML configuration files: ${HOME}/.musrfit" echo " Documentation: ${DOCDIR}" echo "" + +dnl -------------- +dnl create header file that musredit knows at runtime where to find the documentation +dnl -------------- +if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit_qt5"; then + echo \#define MUSRFIT_PREFIX \"${INSTALLDIR}\" > src/musredit_qt5/musrfit-info.h + echo \#define MUSRFIT_DOC_DIR \"${DOCDIR}\" >> src/musredit_qt5/musrfit-info.h +fi +if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit"; then + echo \#define MUSRFIT_PREFIX \"${INSTALLDIR}\" > src/musredit/musrfit-info.h + echo \#define MUSRFIT_DOC_DIR \"${DOCDIR}\" >> src/musredit/musrfit-info.h +fi diff --git a/src/Makefile.am b/src/Makefile.am index 5a1540a8..3d24b418 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -60,9 +60,6 @@ write_musrRoot_runHeader_SOURCES = write_musrRoot_runHeader.cpp musrRootValidation_SOURCES = musrRootValidation.cpp dump_header_SOURCES = dump_header.cpp -xmldir = $(HOME)/.musrfit -xml_DATA = musrfit_startup.xml - LIBADD = $(PMUSR_LIBS) $(MUSR_ROOT_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(PNEXUS_LIBS) AM_CXXFLAGS = $(LOCAL_BIN_CXXFLAGS) @@ -75,42 +72,3 @@ endif LIBS = $(PMUSR_LIBS) $(USERFCN_LIBS) $(MUSR_ROOT_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(PNEXUS_LIBS) \ $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(LIBXML2_LIBS) - -install-xmlDATA: $(xml_DATA) - test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)" - @if test -e "$(DESTDIR)$(xmldir)/$(xml_DATA)"; then \ - DIFF="$$(diff "$(DESTDIR)$(xmldir)/$(xml_DATA)" "$(xml_DATA)" 2>&1)"; \ - if test "x$$DIFF" != "x"; then \ - echo " " && \ - echo " musrfit_startup.xml in $(xmldir)" && \ - echo " is different from the distribution's version." && \ - echo " Do you want to overwrite it? [y/N]" && \ - read OVERWRITE && \ - if test "$$OVERWRITE" = "y" || test "$$OVERWRITE" = "Y"; then \ - echo "$(INSTALL_DATA) '$(xml_DATA)' '$(DESTDIR)$(xmldir)'" && \ - $(INSTALL_DATA) '$(xml_DATA)' '$(DESTDIR)$(xmldir)'; \ - fi; \ - fi; \ - else \ - echo "$(INSTALL_DATA) '$(xml_DATA)' '$(DESTDIR)$(xmldir)'" && \ - $(INSTALL_DATA) '$(xml_DATA)' '$(DESTDIR)$(xmldir)'; \ - fi - -uninstall-xmlDATA: - @if test -e "$(DESTDIR)$(xmldir)/$(xml_DATA)"; then \ - DIFF="$$(diff "$(DESTDIR)$(xmldir)/$(xml_DATA)" "$(xml_DATA)" 2>&1)"; \ - if test "x$$DIFF" != "x"; then \ - echo " " && \ - echo " musrfit_startup.xml in $(xmldir)" && \ - echo " is different from the distribution's version." && \ - echo " Do you want to remove it? [y/N]" && \ - read REMOVE && \ - if test "$$REMOVE" = "y" || test "$$REMOVE" = "Y"; then \ - echo "$(RM) '$(DESTDIR)$(xmldir)/$(xml_DATA)'" && \ - $(RM) "$(DESTDIR)$(xmldir)/$(xml_DATA)"; \ - fi; \ - else \ - echo "$(RM) '$(DESTDIR)$(xmldir)/$(xml_DATA)'" && \ - $(RM) "$(DESTDIR)$(xmldir)/$(xml_DATA)"; \ - fi; \ - fi diff --git a/src/classes/PStartupHandler.cpp b/src/classes/PStartupHandler.cpp index 6ce00364..e2bde964 100644 --- a/src/classes/PStartupHandler.cpp +++ b/src/classes/PStartupHandler.cpp @@ -27,6 +27,9 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include +#include + #include #include #include @@ -140,6 +143,23 @@ PStartupHandler::PStartupHandler() } } } + + // if musrfit_startup.xml is still not found, will create a default one + if (!fStartupFileFound) { + cout << endl << "**INFO** no musrfit_startup.xml file found, will write a default one." << endl; + if (!WriteDefaulStartupFile()) { + cerr << endl << "**ERROR** couldn't write default musrfit_startup.xml." << endl; + } else { + home = getenv("HOME"); + if (home != 0) { + sprintf(startup_path_name, "%s/.musrfit/musrfit_startup.xml", home); + if (StartupFileExists(startup_path_name)) { + fStartupFilePath = TString(startup_path_name); + fStartupFileFound = true; + } + } + } + } } //-------------------------------------------------------------------------- @@ -566,6 +586,107 @@ Bool_t PStartupHandler::StartupFileExists(Char_t *fln) return result; } +//-------------------------------------------------------------------------- +// WriteDefaulStartupFile +//-------------------------------------------------------------------------- +Bool_t PStartupHandler::WriteDefaulStartupFile() +{ + // get home + Char_t startup_path_name[256]; + Char_t *home=0; + home = getenv("HOME"); + if (home == 0) { + cerr << endl << "**ERROR** couldn't obtain $HOME." << endl; + return false; + } + + // first check that $HOME/.musrfit exists and if NOT create it + struct stat info; + + sprintf(startup_path_name, "%s/.musrfit", home); + if (!stat(startup_path_name, &info)) { + if (!(info.st_mode & S_IFDIR)) + return false; + } else { + if (mkdir(startup_path_name, 0777)) { + cerr << endl << "**ERROR** couldn't create '" << startup_path_name << "'" << endl; + return false; + } + } + + // set path-name for musrfit_startup.xml + sprintf(startup_path_name, "%s/.musrfit/musrfit_startup.xml", home); + + ofstream fout(startup_path_name, ofstream::out); + if (!fout.is_open()) { + cerr << endl << "**ERROR** couldn't open '" << startup_path_name << "' for writing." << endl; + return false; + } + + // write default musrfit_startup.xml + fout << "" << endl; + fout << "" << endl; + fout << " " << endl; + fout << " Defines default settings for the musrfit package" << endl; + fout << " " << endl; + fout << " /mnt/data/nemu/his" << endl; + fout << " /mnt/data/nemu/wkm" << endl; + fout << " /afs/psi.ch/project/nemu/data/his" << endl; + fout << " /afs/psi.ch/project/nemu/data/wkm" << endl; + fout << " /afs/psi.ch/project/bulkmusr/data/gps" << endl; + fout << " /afs/psi.ch/project/bulkmusr/data/dolly" << endl; + fout << " /afs/psi.ch/project/bulkmusr/data/gpd" << endl; + fout << " /afs/psi.ch/project/bulkmusr/data/ltf" << endl; + fout << " /afs/psi.ch/project/bulkmusr/data/alc" << endl; + fout << " /afs/psi.ch/project/bulkmusr/data/hifi" << endl; + fout << " /afs/psi.ch/project/bulkmusr/data/lem" << endl; + fout << " " << endl; + fout << " Gauss" << endl; + fout << " 0" << endl; + fout << " none" << endl; + fout << " real_and_imag" << endl; + fout << " 0.0" << endl; + fout << " 1.0" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 24 " << endl; + fout << " 25 " << endl; + fout << " 26 " << endl; + fout << " 27 " << endl; + fout << " 28 " << endl; + fout << " 29 " << endl; + fout << " 30 " << endl; + fout << " 20 " << endl; + fout << " 21 " << endl; + fout << " 22 " << endl; + fout << " 23 " << endl; + fout << " 2 " << endl; + fout << " 3 " << endl; + fout << " 5 " << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 0,0,0 " << endl; + fout << " 255,0,0 " << endl; + fout << " 0,255,0 " << endl; + fout << " 0,0,255 " << endl; + fout << " 255,0,255 " << endl; + fout << " 0,255,255 " << endl; + fout << " 153,0,255 " << endl; + fout << " 102,102,51 " << endl; + fout << " 51,102,51 " << endl; + fout << " 153,0,0 " << endl; + fout << " " << endl; + fout << " " << endl; + fout << "" << endl; + + fout.close(); + + return true; +} + // ------------------------------------------------------------------------- // end // ------------------------------------------------------------------------- diff --git a/src/external/Nonlocal/Makefile.am b/src/external/Nonlocal/Makefile.am index 1ca1d2cb..815f4e48 100644 --- a/src/external/Nonlocal/Makefile.am +++ b/src/external/Nonlocal/Makefile.am @@ -68,12 +68,3 @@ uninstall-hook: rm -f $(libdir)/libPNL_PippardFitter.so endif -xmldir = $(HOME)/.musrfit/external -xml_DATA = nonlocal_startup.xml - -install-xml_DATA: $(xml_DATA) - $(INSTALL_DATA) '$(xml_DATA)' '$xmldir' - -uninstall-xml_DATA: $(xml_DATA) - $(RM) '$(xml_DATA)' '$xmldir' - diff --git a/src/external/libPhotoMeissner/classes/Makefile.am b/src/external/libPhotoMeissner/classes/Makefile.am index 13aeba14..162fa3cd 100644 --- a/src/external/libPhotoMeissner/classes/Makefile.am +++ b/src/external/libPhotoMeissner/classes/Makefile.am @@ -65,13 +65,3 @@ uninstall-hook: rm -f $(libdir)/libPPhotoMeissner.so endif -# define default xml install -xmldir = $(HOME)/.musrfit/external -xml_DATA = ../test/photoMeissner_startup.xml - -instal-xml_DATA: $(xml_DATA) - $(INSTALL_DATA) '$(xml_DATA)' '$(xmldir)' - -uninstal-xml_DATA: $(xml_DATA) - $(RM) '$(xml_DATA)' '$(xmldir)' - diff --git a/src/external/libSpinValve/classes/Makefile.am b/src/external/libSpinValve/classes/Makefile.am index 59e5a177..f88b337f 100644 --- a/src/external/libSpinValve/classes/Makefile.am +++ b/src/external/libSpinValve/classes/Makefile.am @@ -65,13 +65,3 @@ uninstall-hook: rm -f $(libdir)/libPSpinValve.so endif -# define default xml install -xmldir = $(HOME)/.musrfit/external -xml_DATA = ../test/spinValve_startup.xml - -instal-xml_DATA: $(xml_DATA) - $(INSTALL_DATA) '$(xml_DATA)' '$(xmldir)' - -uninstal-xml_DATA: $(xml_DATA) - $(RM) '$(xml_DATA)' '$(xmldir)' - diff --git a/src/external/libSpinValve/test/spinValve_startup.xml b/src/external/libSpinValve/test/spinValve_startup.xml index c96a71dc..e4bdcdee 100644 --- a/src/external/libSpinValve/test/spinValve_startup.xml +++ b/src/external/libSpinValve/test/spinValve_startup.xml @@ -1,7 +1,6 @@ - $Id$ number_of_fields: number of sampling points in field around the Lorentzian peak range: range in which the sampling points are placed, given in units of \beta(1\pm\Delta) diff --git a/src/include/PStartupHandler.h b/src/include/PStartupHandler.h index 89602014..2f44fd9b 100644 --- a/src/include/PStartupHandler.h +++ b/src/include/PStartupHandler.h @@ -94,6 +94,7 @@ class PStartupHandler : public TObject, public TQObject PIntVector fColorList; ///< color list Bool_t StartupFileExists(Char_t *fln); + Bool_t WriteDefaulStartupFile(); ClassDef(PStartupHandler, 1) }; diff --git a/src/musredit/PAdmin.cpp b/src/musredit/PAdmin.cpp index c097fdfb..b22b2498 100644 --- a/src/musredit/PAdmin.cpp +++ b/src/musredit/PAdmin.cpp @@ -36,7 +36,10 @@ using namespace std; #include #include #include +#include +#include +#include "musrfit-info.h" #include "PAdmin.h" //-------------------------------------------------------------------------- @@ -259,7 +262,7 @@ bool PAdminXMLParser::characters(const QString& str) else flag = false; fAdmin->setMusrviewShowAvgFlag(flag); - break; + break; case eEnableMusrT0: if (str == "y") flag = true; @@ -578,13 +581,21 @@ QString PAdminXMLParser::expandPath(const QString &str) QString msg; QString newStr=""; + QProcessEnvironment procEnv = QProcessEnvironment::systemEnvironment(); + QStringList list = str.split("/"); for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) { token = *it; if (token.contains("$")) { token.remove('$'); - path = std::getenv(token.toLatin1()); + if (!procEnv.contains(token)) { + msg = QString("Couldn't find '%1'. Some things might not work properly").arg(token); + QMessageBox::warning(0, "**WARNING**", msg, QMessageBox::Ok, QMessageBox::NoButton); + newStr = ""; + break; + } + path = procEnv.value(token, ""); if (path.isEmpty()) { msg = QString("Couldn't expand '%1'. Some things might not work properly").arg(token); QMessageBox::warning(0, "**WARNING**", msg, QMessageBox::Ok, QMessageBox::NoButton); @@ -658,18 +669,25 @@ PAdmin::PAdmin() : QObject() QString path = QString("./"); QString fln = QString("musredit_startup.xml"); QString pathFln = path + fln; + QProcessEnvironment procEnv = QProcessEnvironment::systemEnvironment(); if (!QFile::exists(pathFln)) { // 2nd: check $HOME/.musrfit/musredit/musredit_startup.xml - path = std::getenv("HOME"); + path = procEnv.value("HOME", ""); pathFln = path + "/.musrfit/musredit/" + fln; if (!QFile::exists(pathFln)) { // 3rd: check $MUSRFITPATH/musredit_startup.xml - path = std::getenv("MUSRFITPATH"); + path = procEnv.value("MUSRFITPATH", ""); pathFln = path + "/" + fln; if (!QFile::exists(pathFln)) { // 4th: check $ROOTSYS/bin/musredit_startup.xml - path = std::getenv("ROOTSYS"); + path = procEnv.value("ROOTSYS", ""); pathFln = path + "/bin/" + fln; + if (!QFile::exists(pathFln)) { + // 5th: not found anyware hence create it + path = procEnv.value("HOME", ""); + pathFln = path + "/.musrfit/musredit/" + fln; + createMusreditStartupFile(); + } } } } @@ -861,6 +879,12 @@ int PAdmin::savePrefs(QString pref_fln) else data[i] = " n"; } + if (data[i].contains("") && data[i].contains("")) { + data[i] = QString(" %1").arg(fFontName); + } + if (data[i].contains("") && data[i].contains("")) { + data[i] = QString(" %1").arg(fFontSize); + } } // write prefs @@ -910,6 +934,7 @@ void PAdmin::saveRecentFiles() { // check if musredit_startup.xml is present in the current directory, and if yes, use this file to // save the recent file names otherwise use the "master" musredit_startup.xml + QString str(""); QString fln = QString("./musredit_startup.xml"); if (!QFile::exists(fln)) @@ -967,6 +992,302 @@ void PAdmin::saveRecentFiles() } } +//-------------------------------------------------------------------------- +/** + * @brief PAdmin::createMusreditStartupFile + */ +void PAdmin::createMusreditStartupFile() +{ + // get $HOME + QProcessEnvironment procEnv = QProcessEnvironment::systemEnvironment(); + QString pathName = procEnv.value("HOME", ""); + pathName += "/.musrfit/musredit"; + + // check if the directory $HOME/.musrfit/musredit exists if not create it + QDir dir(pathName); + if (!dir.exists()) { + // directory $HOME/.musrfit/musredit does not exist hence create it + dir.mkpath(pathName); + } + + // create default musredit_startup.xml file in $HOME/.musrfit/musredit + pathName += "/musredit_startup.xml"; + QFile file(pathName); + + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) + return; + + QTextStream fout(&file); + + fout << "" << endl; + fout << "" << endl; + fout << " " << endl; + fout << " This is handling default setting parameters for the musredit." << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << MUSRFIT_PREFIX << "/bin" << endl; + fout << " ./" << endl; + fout << " " << MUSRFIT_DOC_DIR << "/templates" << endl; + fout << " 3600" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " y" << endl; + fout << " n" << endl; + fout << " y" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " y" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << MUSRFIT_DOC_DIR << "/examples/test-histo-PSI-BIN.msr" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheTitle" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheFitparameterBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheTheoryBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheFunctionsBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheRunBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheCommandsBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheFourierBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#ThePlotBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheStatisticBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/Msr2Data.html" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#A_2.3_musrFT" << endl; + fout << " " << endl; + fout << " " << endl; +#ifdef Q_OS_MAC + fout << " Courier New" << endl; + fout << " 16" << endl; +#else + fout << " Monospace" << endl; + fout << " 12" << endl; +#endif + fout << " " << endl; + fout << " " << endl; + fout << " mue4" << endl; + fout << " psi" << endl; + fout << " root-npp" << endl; + fout << " y" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " y" << endl; + fout << " y" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " y" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " " << endl; + fout << " " << MUSRFIT_DOC_DIR << "/latex_images" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " asymmetry" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " asymmetry.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " simplExpo" << endl; + fout << " (rate)" << endl; + fout << " " << endl; + fout << " simpleExp.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " generExpo" << endl; + fout << " (rate exponent)" << endl; + fout << " " << endl; + fout << " generalExp.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " simpleGss" << endl; + fout << " (rate)" << endl; + fout << " " << endl; + fout << " simpleGauss.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " statGssKT" << endl; + fout << " (rate)" << endl; + fout << " " << endl; + fout << " statGssKT.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " statGssKTLF" << endl; + fout << " (frequency damping)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " dynGssKTLF" << endl; + fout << " (frequency damping hopping-rate)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 3" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " statExpKT" << endl; + fout << " (rate)" << endl; + fout << " " << endl; + fout << " statExpKT.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " statExpKTLF" << endl; + fout << " (frequency damping)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " dynExpKTLF" << endl; + fout << " (frequency damping hopping-rate)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 3" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " combiLGKT" << endl; + fout << " (lorentzRate gaussRate)" << endl; + fout << " " << endl; + fout << " combiLGKT.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " strKT" << endl; + fout << " (rate beta)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " spinGlass" << endl; + fout << " (rate hopping-rate order)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 3" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " rdAnisoHf" << endl; + fout << " (frequency rate)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " abragam" << endl; + fout << " (rate hopping-rate)" << endl; + fout << " " << endl; + fout << " abragam.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " TFieldCos" << endl; + fout << " (phase frequency)" << endl; + fout << " " << endl; + fout << " tfCos.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " internFld" << endl; + fout << " (fraction phase frequency Trate Lrate)" << endl; + fout << " " << endl; + fout << " internalField.png" << endl; + fout << " 5" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " internFldGK" << endl; + fout << " (fraction frequency Trate Lrate beta)" << endl; + fout << " " << endl; + fout << " internalFieldGK.png" << endl; + fout << " 5" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " internFldLL" << endl; + fout << " (fraction frequency Trate Lrate)" << endl; + fout << " " << endl; + fout << " internalFieldLL.png" << endl; + fout << " 4" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " bessel" << endl; + fout << " (phase frequency)" << endl; + fout << " " << endl; + fout << " bessel.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " internBsl" << endl; + fout << " (fraction phase frequency Trate Lrate)" << endl; + fout << " " << endl; + fout << " internalBessel.png" << endl; + fout << " 5" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " skewedGss" << endl; + fout << " (phase frequency rate_m rate_p)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 4" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " staticNKZF" << endl; + fout << " (damping_D0 R_b)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " staticNKTF" << endl; + fout << " (phase frequency damping_D0 R_b)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 4" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " dynamicNKZF" << endl; + fout << " (damping_D0 R_b nu_c)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 3" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " dynamicNKTF" << endl; + fout << " (phase frequency damping_D0 R_b nu_c)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 5" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " polynom" << endl; + fout << " (tshift p0 p1 ... pn)" << endl; + fout << " " << endl; + fout << " polynom.png" << endl; + fout << " 4" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " userFcn" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 0" << endl; + fout << " " << endl; + fout << " " << endl; + fout << "" << endl; + + file.close(); +} + //-------------------------------------------------------------------------- // END //-------------------------------------------------------------------------- diff --git a/src/musredit/PAdmin.h b/src/musredit/PAdmin.h index 2d0dc51d..454735d4 100644 --- a/src/musredit/PAdmin.h +++ b/src/musredit/PAdmin.h @@ -209,6 +209,7 @@ class PAdmin : public QObject QVector fTheory; ///< stores all known theories. Needed when generating theory blocks from within musredit. void saveRecentFiles(); ///< save recent file list + void createMusreditStartupFile(); ///< create default musredit_startup.xml }; #endif // _PADMIN_H_ diff --git a/src/musredit/musredit.pro b/src/musredit/musredit.pro index 1c63f74a..d35f16a4 100644 --- a/src/musredit/musredit.pro +++ b/src/musredit/musredit.pro @@ -1,10 +1,6 @@ TEMPLATE = app TARGET = musredit -!exists( musredit_startup.xml ) { - error( "Configuration file musredit_startup.xml not found! Please configure musrfit first, before trying to install musredit!" ) -} - # install path for musredit count( PREFIX, 1 ) { MUSREDIT_INSTALL_PATH = $${PREFIX}/bin @@ -67,8 +63,6 @@ macx { unix:xml.path = $$(HOME)/.musrfit/musredit macx:xml.path = $$(HOME)/.musrfit/musredit win32:xml.path = c:/musrfit/bin -xml.files = musredit_startup.xml -INSTALLS += xml CONFIG += qt \ warn_on \ @@ -78,7 +72,10 @@ QT += xml QT += webkit QT += network +INCLUDEPATH += "../include" + HEADERS = musredit.h \ + musrfit-info.h \ PHelp.h \ PTextEdit.h \ PSubTextEdit.h \ @@ -101,7 +98,8 @@ HEADERS = musredit.h \ PGetFourierBlockDialog.h \ PGetPlotBlockDialog.h \ PMsr2DataDialog.h \ - PMusrEditAbout.h + PMusrEditAbout.h \ + ../include/git-revision.h SOURCES = PHelp.cpp \ PTextEdit.cpp \ diff --git a/src/musredit/musredit_startup.xml.in b/src/musredit/musredit_startup.xml.in deleted file mode 100644 index 49a0d256..00000000 --- a/src/musredit/musredit_startup.xml.in +++ /dev/null @@ -1,260 +0,0 @@ - - - - This is handling default setting parameters for the musredit. - - - @prefix@/bin - ./ - @DOCDIR@/templates - 3600 - n - n - n - y - n - y - n - n - y - - - /home/nemu/analysis/musrfit/doc/examples/test-histo-PSI-BIN.msr - - - file://@DOCDIR@/html/user/MUSR/MusrFit.html - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTitle - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFitparameterBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTheoryBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFunctionsBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheRunBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheCommandsBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFourierBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#ThePlotBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheStatisticBlock - file://@DOCDIR@/html/user/MUSR/Msr2Data.html - file://@DOCDIR@/html/user/MUSR/MusrFit.html#A_2.3_musrFT - - - Courier New - 12 - - - mue4 - psi - root-npp - y - - - y - y - n - n - n - n - y - n - n - n - n - - @DOCDIR@/latex_images - - - asymmetry - - - asymmetry.png - 1 - - - simplExpo - (rate) - - simpleExp.png - 1 - - - generExpo - (rate exponent) - - generalExp.png - 2 - - - simpleGss - (rate) - - simpleGauss.png - 1 - - - statGssKT - (rate) - - statGssKT.png - 1 - - - statGssKTLF - (frequency damping) - - - 2 - - - dynGssKTLF - (frequency damping hopping-rate) - - - 3 - - - statExpKT - (rate) - - statExpKT.png - 1 - - - statExpKTLF - (frequency damping) - - - 2 - - - dynExpKTLF - (frequency damping hopping-rate) - - - 3 - - - combiLGKT - (lorentzRate gaussRate) - - combiLGKT.png - 2 - - - strKT - (rate beta) - - - 2 - - - spinGlass - (rate hopping-rate order) - - - 3 - - - rdAnisoHf - (frequency rate) - - - 2 - - - abragam - (rate hopping-rate) - - abragam.png - 2 - - - TFieldCos - (phase frequency) - - tfCos.png - 2 - - - internFld - (fraction phase frequency Trate Lrate) - - internalField.png - 5 - - - internFldGK - (fraction frequency Trate Lrate beta) - - internalFieldGK.png - 5 - - - internFldLL - (fraction frequency Trate Lrate) - - internalFieldLL.png - 4 - - - bessel - (phase frequency) - - bessel.png - 2 - - - internBsl - (fraction phase frequency Trate Lrate) - - internalBessel.png - 5 - - - skewedGss - (phase frequency rate_m rate_p) - - - 4 - - - staticNKZF - (damping_D0 R_b) - - - 2 - - - staticNKTF - (phase frequency damping_D0 R_b) - - - 4 - - - dynamicNKZF - (damping_D0 R_b nu_c) - - - 3 - - - dynamicNKTF - (phase frequency damping_D0 R_b nu_c) - - - 5 - - - polynom - (tshift p0 p1 ... pn) - - polynom.png - 4 - - - userFcn - - - - 0 - - - diff --git a/src/musredit_qt5/PAdmin.cpp b/src/musredit_qt5/PAdmin.cpp index 340edef1..1a7755a6 100644 --- a/src/musredit_qt5/PAdmin.cpp +++ b/src/musredit_qt5/PAdmin.cpp @@ -36,9 +36,10 @@ using namespace std; #include #include #include - +#include #include +#include "musrfit-info.h" #include "PAdmin.h" //-------------------------------------------------------------------------- @@ -681,6 +682,12 @@ PAdmin::PAdmin() : QObject() // 4th: check $ROOTSYS/bin/musredit_startup.xml path = procEnv.value("ROOTSYS", ""); pathFln = path + "/bin/" + fln; + if (!QFile::exists(pathFln)) { + // 5th: not found anyware hence create it + path = procEnv.value("HOME", ""); + pathFln = path + "/.musrfit/musredit/" + fln; + createMusreditStartupFile(); + } } } } @@ -985,6 +992,302 @@ void PAdmin::saveRecentFiles() } } +//-------------------------------------------------------------------------- +/** + * @brief PAdmin::createMusreditStartupFile + */ +void PAdmin::createMusreditStartupFile() +{ + // get $HOME + QProcessEnvironment procEnv = QProcessEnvironment::systemEnvironment(); + QString pathName = procEnv.value("HOME", ""); + pathName += "/.musrfit/musredit"; + + // check if the directory $HOME/.musrfit/musredit exists if not create it + QDir dir(pathName); + if (!dir.exists()) { + // directory $HOME/.musrfit/musredit does not exist hence create it + dir.mkpath(pathName); + } + + // create default musredit_startup.xml file in $HOME/.musrfit/musredit + pathName += "/musredit_startup.xml"; + QFile file(pathName); + + if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) + return; + + QTextStream fout(&file); + + fout << "" << endl; + fout << "" << endl; + fout << " " << endl; + fout << " This is handling default setting parameters for the musredit." << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << MUSRFIT_PREFIX << "/bin" << endl; + fout << " ./" << endl; + fout << " " << MUSRFIT_DOC_DIR << "/templates" << endl; + fout << " 3600" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " y" << endl; + fout << " n" << endl; + fout << " y" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " y" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << MUSRFIT_DOC_DIR << "/examples/test-histo-PSI-BIN.msr" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheTitle" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheFitparameterBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheTheoryBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheFunctionsBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheRunBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheCommandsBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheFourierBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#ThePlotBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#TheStatisticBlock" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/Msr2Data.html" << endl; + fout << " file://" << MUSRFIT_DOC_DIR << "/html/user/MUSR/MusrFit.html#A_2.3_musrFT" << endl; + fout << " " << endl; + fout << " " << endl; +#ifdef Q_OS_MAC + fout << " Courier New" << endl; + fout << " 16" << endl; +#else + fout << " Monospace" << endl; + fout << " 12" << endl; +#endif + fout << " " << endl; + fout << " " << endl; + fout << " mue4" << endl; + fout << " psi" << endl; + fout << " root-npp" << endl; + fout << " y" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " y" << endl; + fout << " y" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " y" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " n" << endl; + fout << " " << endl; + fout << " " << MUSRFIT_DOC_DIR << "/latex_images" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " asymmetry" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " asymmetry.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " simplExpo" << endl; + fout << " (rate)" << endl; + fout << " " << endl; + fout << " simpleExp.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " generExpo" << endl; + fout << " (rate exponent)" << endl; + fout << " " << endl; + fout << " generalExp.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " simpleGss" << endl; + fout << " (rate)" << endl; + fout << " " << endl; + fout << " simpleGauss.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " statGssKT" << endl; + fout << " (rate)" << endl; + fout << " " << endl; + fout << " statGssKT.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " statGssKTLF" << endl; + fout << " (frequency damping)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " dynGssKTLF" << endl; + fout << " (frequency damping hopping-rate)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 3" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " statExpKT" << endl; + fout << " (rate)" << endl; + fout << " " << endl; + fout << " statExpKT.png" << endl; + fout << " 1" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " statExpKTLF" << endl; + fout << " (frequency damping)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " dynExpKTLF" << endl; + fout << " (frequency damping hopping-rate)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 3" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " combiLGKT" << endl; + fout << " (lorentzRate gaussRate)" << endl; + fout << " " << endl; + fout << " combiLGKT.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " strKT" << endl; + fout << " (rate beta)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " spinGlass" << endl; + fout << " (rate hopping-rate order)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 3" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " rdAnisoHf" << endl; + fout << " (frequency rate)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " abragam" << endl; + fout << " (rate hopping-rate)" << endl; + fout << " " << endl; + fout << " abragam.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " TFieldCos" << endl; + fout << " (phase frequency)" << endl; + fout << " " << endl; + fout << " tfCos.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " internFld" << endl; + fout << " (fraction phase frequency Trate Lrate)" << endl; + fout << " " << endl; + fout << " internalField.png" << endl; + fout << " 5" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " internFldGK" << endl; + fout << " (fraction frequency Trate Lrate beta)" << endl; + fout << " " << endl; + fout << " internalFieldGK.png" << endl; + fout << " 5" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " internFldLL" << endl; + fout << " (fraction frequency Trate Lrate)" << endl; + fout << " " << endl; + fout << " internalFieldLL.png" << endl; + fout << " 4" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " bessel" << endl; + fout << " (phase frequency)" << endl; + fout << " " << endl; + fout << " bessel.png" << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " internBsl" << endl; + fout << " (fraction phase frequency Trate Lrate)" << endl; + fout << " " << endl; + fout << " internalBessel.png" << endl; + fout << " 5" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " skewedGss" << endl; + fout << " (phase frequency rate_m rate_p)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 4" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " staticNKZF" << endl; + fout << " (damping_D0 R_b)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 2" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " staticNKTF" << endl; + fout << " (phase frequency damping_D0 R_b)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 4" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " dynamicNKZF" << endl; + fout << " (damping_D0 R_b nu_c)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 3" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " dynamicNKTF" << endl; + fout << " (phase frequency damping_D0 R_b nu_c)" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 5" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " polynom" << endl; + fout << " (tshift p0 p1 ... pn)" << endl; + fout << " " << endl; + fout << " polynom.png" << endl; + fout << " 4" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " userFcn" << endl; + fout << " " << endl; + fout << " " << endl; + fout << " " << endl; + fout << " 0" << endl; + fout << " " << endl; + fout << " " << endl; + fout << "" << endl; + + file.close(); +} + //-------------------------------------------------------------------------- // END //-------------------------------------------------------------------------- diff --git a/src/musredit_qt5/PAdmin.h b/src/musredit_qt5/PAdmin.h index b966ef78..d9b05051 100644 --- a/src/musredit_qt5/PAdmin.h +++ b/src/musredit_qt5/PAdmin.h @@ -209,6 +209,7 @@ class PAdmin : public QObject QVector fTheory; ///< stores all known theories. Needed when generating theory blocks from within musredit. void saveRecentFiles(); ///< save recent file list + void createMusreditStartupFile(); ///< create default musredit_startup.xml }; #endif // _PADMIN_H_ diff --git a/src/musredit_qt5/musredit.pro b/src/musredit_qt5/musredit.pro index eaf8062c..9d351027 100644 --- a/src/musredit_qt5/musredit.pro +++ b/src/musredit_qt5/musredit.pro @@ -1,10 +1,6 @@ TEMPLATE = app TARGET = musredit -!exists( musredit_startup.xml ) { - error( "Configuration file musredit_startup.xml not found! Please configure musrfit first, before trying to install musredit!" ) -} - # install path for musredit count( PREFIX, 1 ) { MUSREDIT_INSTALL_PATH = $${PREFIX}/bin @@ -67,8 +63,6 @@ macx { unix:xml.path = $$(HOME)/.musrfit/musredit macx:xml.path = $$(HOME)/.musrfit/musredit win32:xml.path = c:/musrfit/bin -xml.files = musredit_startup.xml -INSTALLS += xml CONFIG += qt \ warn_on \ @@ -84,6 +78,7 @@ QT += svg INCLUDEPATH += "../include" HEADERS = musredit.h \ + musrfit-info.h \ PHelp.h \ PTextEdit.h \ PSubTextEdit.h \ diff --git a/src/musredit_qt5/musredit_startup.xml.in b/src/musredit_qt5/musredit_startup.xml.in deleted file mode 100644 index 0c0a859e..00000000 --- a/src/musredit_qt5/musredit_startup.xml.in +++ /dev/null @@ -1,260 +0,0 @@ - - - - This is handling default setting parameters for the musredit. - - - @prefix@/bin - ./ - @DOCDIR@/templates - 3600 - n - n - n - y - n - y - n - n - y - - - /home/nemu/analysis/musrfit/doc/examples/test-histo-PSI-BIN.msr - - - file://@DOCDIR@/html/user/MUSR/MusrFit.html - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTitle - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFitparameterBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTheoryBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFunctionsBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheRunBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheCommandsBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFourierBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#ThePlotBlock - file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheStatisticBlock - file://@DOCDIR@/html/user/MUSR/Msr2Data.html - file://@DOCDIR@/html/user/MUSR/MusrFit.html#A_2.3_musrFT - - - Monospace - 12 - - - mue4 - psi - root-npp - y - - - y - y - n - n - n - n - y - n - n - n - n - - @DOCDIR@/latex_images - - - asymmetry - - - asymmetry.png - 1 - - - simplExpo - (rate) - - simpleExp.png - 1 - - - generExpo - (rate exponent) - - generalExp.png - 2 - - - simpleGss - (rate) - - simpleGauss.png - 1 - - - statGssKT - (rate) - - statGssKT.png - 1 - - - statGssKTLF - (frequency damping) - - - 2 - - - dynGssKTLF - (frequency damping hopping-rate) - - - 3 - - - statExpKT - (rate) - - statExpKT.png - 1 - - - statExpKTLF - (frequency damping) - - - 2 - - - dynExpKTLF - (frequency damping hopping-rate) - - - 3 - - - combiLGKT - (lorentzRate gaussRate) - - combiLGKT.png - 2 - - - strKT - (rate beta) - - - 2 - - - spinGlass - (rate hopping-rate order) - - - 3 - - - rdAnisoHf - (frequency rate) - - - 2 - - - abragam - (rate hopping-rate) - - abragam.png - 2 - - - TFieldCos - (phase frequency) - - tfCos.png - 2 - - - internFld - (fraction phase frequency Trate Lrate) - - internalField.png - 5 - - - internFldGK - (fraction frequency Trate Lrate beta) - - internalFieldGK.png - 5 - - - internFldLL - (fraction frequency Trate Lrate) - - internalFieldLL.png - 4 - - - bessel - (phase frequency) - - bessel.png - 2 - - - internBsl - (fraction phase frequency Trate Lrate) - - internalBessel.png - 5 - - - skewedGss - (phase frequency rate_m rate_p) - - - 4 - - - staticNKZF - (damping_D0 R_b) - - - 2 - - - staticNKTF - (phase frequency damping_D0 R_b) - - - 4 - - - dynamicNKZF - (damping_D0 R_b nu_c) - - - 3 - - - dynamicNKTF - (phase frequency damping_D0 R_b nu_c) - - - 5 - - - polynom - (tshift p0 p1 ... pn) - - polynom.png - 4 - - - userFcn - - - - 0 - - - diff --git a/src/musrfit_startup.xml b/src/musrfit_startup.xml deleted file mode 100644 index 3aa5ab57..00000000 --- a/src/musrfit_startup.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - Defines default settings for the musrfit package - - /mnt/data/nemu/his - /mnt/data/nemu/wkm - /afs/psi.ch/project/nemu/data/his - /afs/psi.ch/project/nemu/data/wkm - /afs/psi.ch/project/bulkmusr/data/gps - /afs/psi.ch/project/bulkmusr/data/dolly - /afs/psi.ch/project/bulkmusr/data/gpd - /afs/psi.ch/project/bulkmusr/data/ltf - /afs/psi.ch/project/bulkmusr/data/alc - /afs/psi.ch/project/bulkmusr/data/hifi - /afs/psi.ch/project/bulkmusr/data/lem - - Gauss - 0 - none - real_and_imag - 0.0 - 1.0 - - - - - 24 - 25 - 26 - 27 - 28 - 29 - 30 - 20 - 21 - 22 - 23 - 2 - 3 - 5 - - - - 0,0,0 - 255,0,0 - 0,255,0 - 0,0,255 - 255,0,255 - 0,255,255 - 153,0,255 - 102,102,51 - 51,102,51 - 153,0,0 - - -