mupp: fix crash in PmuppGui::getValues plotting a variable.

getValues()/getErrors() return a std::vector by value, but the QVector was built from begin() of one call and end() of a second call -> iterators into two distinct temporaries -> UB and a segfault in getValues(). Bind the result to a single local before taking begin()/end(). Same in getPosErr/getNegErr. This surfaced reliably when plotting a <python>-generated variable added via the GUI (the script path was unaffected as it reads getValues() only once). Also fix check() to validate the actually selected collections (GetCollection(idx[i]) instead of GetCollection(i)). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
mupp: simplify the python example to a single <python> block.
2026-05-27 15:52:02 +02:00 · 2026-05-27 14:04:03 +02:00 · 2026-05-27 13:55:38 +02:00 · 2026-05-27 13:04:29 +02:00 · 2026-05-27 13:03:17 +02:00 · 2026-05-26 20:43:05 +02:00
933 changed files with 72685 additions and 47617 deletions
@@ -0,0 +1,45 @@
+name: Build and Deploy Documentation
+
+on:
+  push:
+    branches:
+      - root6
+  workflow_dispatch:
+
+jobs:
+  build-and-deploy:
+    runs-on: ubuntu-latest
+    container:
+      image: gitea.psi.ch/images/alpine-jupyterbook
+    steps:
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Install system dependencies
+        run: |
+          apk add doxygen graphviz
+
+      - name: Build musrfit-tech-docu
+        run: |
+          cd doc
+          mkdir technical 
+          doxygen musrfit_dox.cfg
+          doxygen musredit_qt6_dox.cfg
+          doxygen mupp_qt6_dox.cfg
+          doxygen musrStep_qt6_dox.cfg
+          doxygen musrWiz_qt6_dox.cfg
+
+      - name: Configure Git
+        run: |
+          git config --global user.name "Gitea Actions"
+          git config --global user.email "actions@gitea.local"
+
+      - name: Push to gitea-pages branch
+        run: |
+          git checkout --orphan gitea-pages
+          git reset --hard
+          cp -r ./doc/technical/html/* .
+          git add .
+          git commit -m "Deploy site"
+          git push --verbose -f https://${{secrets.GITHUB_TOKEN}}@gitea.psi.ch/${{ github.repository }}.git gitea-pages
@@ -0,0 +1,2 @@
+# ignore all files generated from an in-repo build
+build/
@@ -1,7 +1,19 @@
 # - musrfit
 cmake_minimum_required(VERSION 3.17)

-project(musrfit VERSION 1.9.3 LANGUAGES C CXX)
+# cmake: use BoostConfig.cmake instead of FindBoost
+if (CMAKE_VERSION GREATER_EQUAL "3.3")
+  cmake_policy(SET CMP0167 NEW)
+endif ()  
+
+project(musrfit VERSION 1.10.0 LANGUAGES C CXX)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+set(CMAKE_INSTALL_LIBDIR lib CACHE PATH "Object code libraries")
+include(GNUInstallDirs)

 #--- musrfit specific options -------------------------------------------------
 option(nexus "build optional NeXus support. Needed for ISIS" OFF)
@@ -73,11 +85,6 @@ find_package(Git REQUIRED)
 #--- check for ROOT -----------------------------------------------------------
 find_package(ROOT 6.18 REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser)
 if (ROOT_mathmore_FOUND)
-  execute_process(COMMAND root-config --bindir OUTPUT_VARIABLE ROOT_BINDIR)
-  string(STRIP ${ROOT_BINDIR} ROOT_BINDIR)
-  execute_process(COMMAND root-config --version OUTPUT_VARIABLE ROOT_VERSION)
-  string(STRIP ${ROOT_VERSION} ROOT_VERSION)
-  message("-- Found ROOT: ${ROOT_BINDIR} (found version: ${ROOT_VERSION})")
  #---Define useful ROOT functions and macros (e.g. ROOT_GENERATE_DICTIONARY)
  include(${ROOT_USE_FILE})
 endif (ROOT_mathmore_FOUND)
@@ -92,11 +99,14 @@ endif ()
 set(ROOT_GRTEQ_24 ${ROOT_GRTEQ_24} CACHE INTERNAL "ROOT Version check")

 #--- check for boost ----------------------------------------------------------
-find_package(Boost REQUIRED
-  COMPONENTS
-    system
-    filesystem
-)
+find_package(Boost QUIET)
+if (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
+  find_package(Boost REQUIRED COMPONENTS filesystem)
+  set(BOOST_LINK_LIBS Boost::filesystem)
+else (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
+  find_package(Boost REQUIRED COMPONENTS system filesystem)
+  set(BOOST_LINK_LIBS Boost::filesystem Boost::system)
+endif (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
 message(STATUS "Boost libs: ${Boost_LIBRARIES}")

 #--- check for gsl ------------------------------------------------------------
@@ -109,13 +119,13 @@ find_package(FFTW3 REQUIRED)
 find_package(LibXml2 REQUIRED)

 #--- check for OpenMP ---------------------------------------------------------
-if (try_OpenMP AND NOT APPLE)
+if (try_OpenMP)
  find_package(OpenMP)
-  if (OpenMP_FOUND)
-    add_definitions(-DHAVE_GOMP)
+  if (OpenMP_CXX_FOUND)
+    add_compile_definitions(HAVE_GOMP)
    set(HAVE_GOMP 1 CACHE INTERNAL "Have GOMP")
-  endif (OpenMP_FOUND)
-endif (try_OpenMP AND NOT APPLE)
+  endif (OpenMP_CXX_FOUND)
+endif (try_OpenMP)

 #--- check for Qt -------------------------------------------------------------
 if (qt_based_tools)
@@ -198,12 +208,38 @@ if (qt_based_tools)
  endif (qt_version STREQUAL 3)
 endif (qt_based_tools)

-#--- if NeXus check also for HDF4, HDF5, and MXML -----------------------------
+#--- if NeXus check also for HDF4 (optional), HDF5 ----------------------------
 if (nexus)
-  find_package(HDF5 COMPONENTS CXX REQUIRED )
-  find_package(HDF4 REQUIRED)
-  find_package(NEXUS REQUIRED)
-  add_definitions(-DPNEXUS_ENABLED)
+  find_package(HDF5 COMPONENTS CXX REQUIRED)
+  if (HAVE_HDF4)
+    #--- check for HDF4 -----------------------------------------------------------
+    # Find HDF4 manually (pkg-config often doesn't have hdf4)
+    find_path(HDF4_INCLUDE_DIR
+      NAMES mfhdf.h
+      PATH_SUFFIXES hdf
+    )
+
+    find_library(HDF4_DF_LIBRARY
+      NAMES df libdf
+    )
+
+    find_library(HDF4_MFHDF_LIBRARY
+      NAMES mfhdf libmfhdf
+    )
+
+    if (HDF4_INCLUDE_DIR AND HDF4_DF_LIBRARY AND HDF4_MFHDF_LIBRARY)
+      set(HDF4_FOUND TRUE)
+      set(HDF4_INCLUDE_DIRS ${HDF4_INCLUDE_DIR})
+      set(HDF4_LIBRARIES ${HDF4_MFHDF_LIBRARY} ${HDF4_DF_LIBRARY})
+      message(STATUS "Found HDF4: ${HDF4_INCLUDE_DIR}")
+      message(STATUS "  HDF4 libraries: ${HDF4_LIBRARIES}")
+    else()
+      message(FATAL_ERROR "HDF4 library not found. Please install libhdf4-dev or hdf-devel")
+    endif()
+
+    add_compile_definitions(HAVE_HDF4)
+  endif (HAVE_HDF4)
+  add_compile_definitions(PNEXUS_ENABLED)
 endif (nexus)

 #--- check for Cuba lib if BMWlibs are enabled --------------------------------
@@ -222,6 +258,21 @@ else ()
  set(IS_GIT_REPO 0)
 endif ()

+#--- start create git-revision.h ----------------------------------------------
+if (IS_GIT_REPO)
+  add_custom_target(git_revision ALL
+    COMMAND sh ${CMAKE_SOURCE_DIR}/src/git_revision.sh ${CMAKE_BINARY_DIR}/src
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMENT "Checking git revision"
+  )
+
+  set(HAVE_GIT_REV_H "-DHAVE_GIT_REV_H")
+else (IS_GIT_REPO)
+  set(HAVE_GIT_REV_H "")
+endif (IS_GIT_REPO)
+
+#--- end create git-revision.h ------------------------------------------------
+
 #--- rpath related things -----------------------------------------------------
 # use, i.e. don't skip the full RPATH for the build tree
 set(CMAKE_SKIP_BUILD_RPATH FALSE)
@@ -230,25 +281,33 @@ set(CMAKE_SKIP_BUILD_RPATH FALSE)
 # (but later on when installing)
 set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)

-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")

 # add the automatically determined parts of the RPATH
 # which point to directories outside the build tree to the install RPATH
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

 # the RPATH to be used when installing, but only if it's not a system directory
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir)
 if("${isSystemDir}" STREQUAL "-1")
-    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
 endif("${isSystemDir}" STREQUAL "-1")
-set(rpath ${CMAKE_INSTALL_RPATH})
-string(APPEND rpath ";/usr/local/lib")
-set(CMAKE_INSTALL_RPATH "${rpath}")
+if (UNIX)
+  set(rpath ${CMAKE_INSTALL_RPATH})
+  string(APPEND rpath ";/usr/local/lib")
+  set(CMAKE_INSTALL_RPATH "${rpath}")
+endif ()

 #--- propagate to the sub-directories -----------------------------------------
 add_subdirectory(src)

+#--- testing ------------------------------------------------------------------
+enable_testing()
+add_subdirectory(tests)
+
 #--- write summary of the installation
+cmake_host_system_information(RESULT PROCESSOR QUERY PROCESSOR_DESCRIPTION)
+
 message("")
 message("|-----------------------------------------------------------------------|")
 message("|                                                                       |")
@@ -256,8 +315,9 @@ message("|                            Summary
 message("|                                                                       |")
 message("|-----------------------------------------------------------------------|")
 message("")
-message(" System: ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} - ${CMAKE_HOST_SYSTEM_VERSION}")
-message(" -------")
+message(" System:    ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} - ${CMAKE_HOST_SYSTEM_VERSION}")
+message(" Processor: ${PROCESSOR} (${CMAKE_SYSTEM_PROCESSOR})")
+message(" ----------")
 message("")
 message(" musrfit Version: ${musrfit_VERSION}")
 message(" ----------------")
@@ -283,9 +343,12 @@ endif (OpenMP_FOUND)

 if (nexus)
  message("")
-  message(" HDF4    found in ${HDF4_INCLUDE_DIRS}")
+  if (HAVE_HDF4)
+    message(" HDF4    found in ${HDF4_INCLUDE_DIRS}")
+  else (HAVE_HDF4)
+    message(" HDF4    not present.")	  
+  endif (HAVE_HDF4)	  
  message(" HDF5    found in ${HDF5_INCLUDE_DIRS}, Version: ${HDF5_VERSION}")
-  message(" NeXus   found in ${NEXUS_INCLUDE_DIR}, Version: ${NEXUS_VERSION_STRING}")
 endif (nexus)

 message("")
@@ -381,6 +444,35 @@ message("")
 message("-------------------------------------------------------------------------")
 message("")

+#--- generate and install cmake package config files --------------------------
+include(CMakePackageConfigHelpers)
+
+configure_package_config_file(
+  ${CMAKE_SOURCE_DIR}/cmake/musrfitConfig.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/musrfitConfig.cmake
+  INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/musrfit
+)
+
+write_basic_package_version_file(
+  ${CMAKE_CURRENT_BINARY_DIR}/musrfitConfigVersion.cmake
+  VERSION ${PROJECT_VERSION}
+  COMPATIBILITY AnyNewerVersion
+)
+
+install(
+  EXPORT musrfitTargets
+  FILE musrfitTargets.cmake
+  NAMESPACE musrfit::
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/musrfit
+)
+
+install(
+  FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/musrfitConfig.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/musrfitConfigVersion.cmake
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/musrfit
+)
+
 #--- cpack specific info ......................................................
 file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR} PROJECT_SOURCE_DIR_NATIVE)
 file(TO_NATIVE_PATH ${PROJECT_BINARY_DIR} PROJECT_BINARY_DIR_NATIVE)
@@ -6,11 +6,59 @@ The ChangeLog will describe feature changes rather than coding detail changes.

 For detailed information about changes have a look here:

-https://gitlab.psi.ch/nemu/musrfit/activity
+https://gitea.psi.ch/LMU/musrfit

 or 

-https://bitbucket.org/muonspin/musrfit/commits/all
+https://bitbucket.org/muonspin/musrfit
+
+Release of V1.10.0, 2026/02/21
+==============================
+
+ditch the use of the NeXus lib. NeXus files are now directly read via hdf4/5
+add deadtime correction of pulsed sources, assuming the relevant parameters are
+present in the file.
+
+Release of V1.9.10, 2026/01/16
+==============================
+
+function handling lifted from boost/spirit classic/qi to x3
+
+Release of V1.9.9, 2025/06/08
+=============================
+
+add THEORY functions for local Gaussian / global Lorentzian, and a simple F-mu-F function.
+
+Release of V1.9.8, 2025/03/24
+=============================
+
+add a user interface option to export data from a msr-file view (single- or multiple files).
+
+Release of V1.9.7, 2025/01/18
+=============================
+
+allow spaces in RUN block path-filename
+
+Release of V1.9.6, 2024/12/02
+=============================
+
+added jump to block feature in musredit.
+
+
+Release of V1.9.5, 2024/06/24
+=============================
+
+yaml export of ALL fit-parameters, as initiated by R.M.L. McFadden.
+
+Release of V1.9.4, 2024/06/08
+=============================
+
+enable OpenMP for macOS.
+
+Release of V1.9.3, 2024/04/19
+=============================
+
+fix of function string generation from AST.

 Release of V1.9.2, 2023/10/25
 =============================
@@ -18,7 +18,7 @@ directory and
   cd build 
   cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS (or where ever musrfit should be installed)
   cmake --build ./ --clean-first
-   make install                              (as superuser -- maybe)
+   cmake --install ./                           (as superuser -- maybe)
   /sbin/ldconfig                            (as superuser)
    
 cmake configuration allows a couple of switches.  For details check the documentation at 
@@ -31,7 +31,7 @@ An example with NeXus support and BMWlibs needed would look like this
   cd build
   cmake ../ -Dnexus=1 -DBMWlibs=1 -DCMAKE_INSTALL_PREFIX=$ROOTSYS 
   cmake --build ./ --clean-first
-   make install                              (as superuser -- maybe)
+   cmake --install ./                        (as superuser -- maybe)
   /sbin/ldconfig                            (as superuser)

 In the optimal case everything is ready to be used ;-)
@@ -43,7 +43,7 @@ In the optimal case everything is ready to be used ;-)
 More information regarding software requirements and the installation process 
 can be found here:

-   http://lmu.web.psi.ch/musrfit/user/MUSR/MusrFitSetup.html
+   https://lmu.pages.psi.ch/musrfit-docu/setup-standard.html

 #---------------------------------------------------------------------
 # this is the end ...
@@ -32,7 +32,7 @@ Documentation

 For a more exhaustive user documentation see:

-  http://lmu.web.psi.ch/musrfit/user/html/index.html
+  https://lmu.pages.psi.ch/musrfit-docu/index.html

 Contacts

@@ -1,37 +1,37 @@
-# musrfit - muSR and beta-NMR data analysis package #
-
-### Contents ###
-
-This is a data analysis package to analyze time differential muSR and beta-NMR data.
-Currently it allows the following:
-
-* set up most commonly used fitting functions for muSR and beta-NMR
-* fit data, including global fits
-* show the fit results and the residuals
-* show the Fourier transform of the data
-* easily extract the fit parameters and import in other programs (gnuplot, qtiplot/origin, ...)
-* generate input fitting files for follow-up runs
-* generate global input fitting files based on a single run template
-* implement more sophisticated user functions
-  (e.g. GL vortex lattice, Meissner screening including low-energy muon stopping profiles)
-
-### Currently supported platforms: ###
-
-* Linux
-* Mac OS X
-* Windows 10 1809 or newer - current state is for the commited ones
-* Web based implementation - http://musruser.psi.ch/cgi-bin/musrfit.cgi
-
-### Documentation ####
-
-For a more exhaustive user documentation see:
-
-  http://lmu.web.psi.ch/musrfit/user/html/index.html
-
-### Contacts ###
-
-<andreas.suter@psi.ch>
-
-For the beta-NMR related parts, please contact Zaher Salman
-<zaher.salman@psi.ch>
-
+# musrfit - muSR and beta-NMR data analysis package #
+
+### Contents ###
+
+This is a data analysis package to analyze time differential muSR and beta-NMR data.
+Currently it allows the following:
+
+* set up most commonly used fitting functions for muSR and beta-NMR
+* fit data, including global fits
+* show the fit results and the residuals
+* show the Fourier transform of the data
+* easily extract the fit parameters and import in other programs (gnuplot, qtiplot/origin, ...)
+* generate input fitting files for follow-up runs
+* generate global input fitting files based on a single run template
+* implement more sophisticated user functions
+  (e.g. GL vortex lattice, Meissner screening including low-energy muon stopping profiles)
+
+### Currently supported platforms: ###
+
+* Linux
+* Mac OS X
+* Windows 10 1809 or newer - current state is for the commited ones
+* Web based implementation - http://musruser.psi.ch/cgi-bin/musrfit.cgi
+
+### Documentation ####
+
+For a more exhaustive user documentation see:
+
+  https://lmu.pages.psi.ch/musrfit-docu/index.html
+
+### Contacts ###
+
+<andreas.suter@psi.ch>
+
+For the beta-NMR related parts, please contact Zaher Salman
+<zaher.salman@psi.ch>
+
@@ -17,7 +17,7 @@ set (CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING")
 set (CPACK_RESOURCE_FILE_README "@PROJECT_SOURCE_DIR@/README.md")
 set (CPACK_RESOURCE_FILE_WELCOME "@PROJECT_SOURCE_DIR@/cmake/welcome.txt")

-set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "@CMAKE_INSTALL_PREFIX@;@CMAKE_INSTALL_PREFIX@/bin;@CMAKE_INSTALL_PREFIX@/include;@CMAKE_INSTALL_PREFIX@/share;@CMAKE_INSTALL_PREFIX@/lib64;@CMAKE_INSTALL_PREFIX@/lib;@CMAKE_INSTALL_PREFIX@/pkgconfig")
+set (CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "@CMAKE_INSTALL_PREFIX@;@CMAKE_INSTALL_PREFIX@/bin;@CMAKE_INSTALL_PREFIX@/include;@CMAKE_INSTALL_PREFIX@/share;@CMAKE_INSTALL_PREFIX@/lib64;@CMAKE_INSTALL_PREFIX@/lib;@CMAKE_INSTALL_PREFIX@/pkgconfig;@CMAKE_INSTALL_PREFIX@/share/applications;@CMAKE_INSTALL_PREFIX@/share/icons;@CMAKE_INSTALL_PREFIX@/share/icons/hicolor;@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/48x48;@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/48x48/apps")

 # we do not have any absolute paths, so do not need DESTDIR
 set (CPACK_SET_DESTDIR "OFF")
@@ -74,9 +74,7 @@ endfunction()
 #as35   return()
 #as35 endif()

-find_path(FFTW3_INCLUDE NAMES fftw3.h
-  HINTS "/usr/include" "/opt/local/include" "/app/include"
-)
+find_path(FFTW3_INCLUDE NAMES fftw3.h)

 find_library(FFTW3_LIBRARY fftw3)
 find_library(FFTW3_OMP_LIBRARY fftw3_omp)
@@ -1,97 +0,0 @@
-## Process this file with cmake
-#=============================================================================
-#  NeXus - Neutron & X-ray Common Data Format
-#
-#  CMakeLists for building the NeXus library and applications.
-#
-#  Copyright (C) 2011 Stephen Rankin
-#
-#  This library is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by the
-#  Free Software Foundation; either version 2 of the License, or (at your
-#  option) any later version.
-#
-#  This library is distributed in the hope that it will be useful, but WITHOUT
-#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
-#  for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public License
-#  along with this library; if not, write to the Free Software Foundation,
-#  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-#  For further information, see <http://www.nexusformat.org>
-#
-#
-#=============================================================================
-
-
-#------------------------------------------------------------------------------
-# find the runtime binaries of the HDF4 library
-#------------------------------------------------------------------------------
-find_library(HDF4_DF_LIBRARY NAMES df hdf
-             HINTS ENV HDF4_ROOT 
-             PATH_SUFFIXES hdf)
-             
-
-if(HDF4_DF_LIBRARY MATCHES HDF4_DF_LIBRARY-NOTFOUND)
-    message(FATAL_ERROR "Could not find HDF4 DF library!")
-else()
-    get_filename_component(HDF4_LIBRARY_DIRS ${HDF4_DF_LIBRARY} PATH)
-    message(STATUS "Found HDF4 DF library: ${HDF4_DF_LIBRARY}")
-    message(STATUS "HDF4 libary path: ${HDF4_LIBRARY_DIRS}")
-endif()
-
-find_library(HDF4_MFHDF_LIBRARY NAMES mfhdf 
-             HINTS ENV HDF4_ROOT
-             PATH_SUFFIXES hdf)
-
-if(HDF4_MFHDF_LIBRARY MATCHES HDF4_MFHDF_LIBRARY-NOTFOUND)
-    message(FATAL_ERROR "Could not find HDF5 MFHDF library!")
-else()
-    message(STATUS "Found HDF4 MFHDF library: ${HDF4_MFHDF_LIBRARY}")
-endif()
-
-
-#------------------------------------------------------------------------------
-# find the HDF4 header file
-#------------------------------------------------------------------------------
-find_path(HDF4_INCLUDE_DIRS mfhdf.h 
-          HINTS ENV HDF4_ROOT 
-          PATH_SUFFIXES hdf)
-          
-if(HDF4_INCLUDE_DIRS MATCHES HDF4_INCLUDE_DIRS-NOTFOUND)
-    message(FATAL_ERROR "Could not find HDF4 header files")
-else()
-    message(STATUS "Found HDF4 header files in: ${HDF4_INCLUDE_DIRS}")
-endif()
-
-#------------------------------------------------------------------------------
-# search for additional packages required to link against HDF4
-#------------------------------------------------------------------------------
-find_package(JPEG REQUIRED)
-
-#------------------------------------------------------------------------------
-# add libraries to the link list for NAPI
-#------------------------------------------------------------------------------
-get_filename_component(LIB_EXT ${HDF4_DF_LIBRARY} EXT)
-if(LIB_EXT MATCHES .a)
-    message(STATUS "HDF4 DF library is static")
-    list(APPEND NAPI_LINK_LIBS "-Wl,-whole-archive" ${HDF4_DF_LIBRARY} "-Wl,-no-whole-archive")
-else()
-    list(APPEND NAPI_LINK_LIBS ${HDF4_DF_LIBRARY})
-endif()
-
-
-get_filename_component(LIB_EXT ${HDF4_MFHDF_LIBRARY} EXT)
-if(LIB_EXT MATCHES .a)
-    message(STATUS "HDF4 MFHDF library is static")
-    list(APPEND NAPI_LINK_LIBS "-Wl,-whole-archive" ${HDF4_MFHDF_LIBRARY} "-Wl,-no-whole-archive")
-else()
-    list(APPEND NAPI_LINK_LIBS ${HDF4_MFHDF_LIBRARY})
-endif()
-
-list(APPEND NAPI_LINK_LIBS jpeg)
-
-include_directories ( SYSTEM ${HDF4_INCLUDE_DIRS} )
-link_directories(${HDF4_LIBRARY_DIRS})
@@ -1,34 +0,0 @@
-# - find MXML
-# find the MXML lib and includes
-# This module defines 
-#  LIBMXML_INCLUDE_DIR, where to find mxml.h
-#  LIBMXML_LIBRARY, library to link against
-#  LIBMXML_FOUND, if false, do not try to use the MXML lib
-
-find_path(LIBMXML_INCLUDE_DIR mxml.h
-  HINT "/usr/include"
-)
-# find position of mxml.h from the end
-string(FIND "${LIBMXML_INCLUDE_DIR}" "/mxml.h" pos REVERSE)
-# truncate the string
-string(SUBSTRING "${LIBMXML_INCLUDE_DIR}" 0 ${pos} substr)
-set(LIBMXML_INCLUDE_DIR ${substr})
-unset(substr)
-
-find_library(LIBMXML_LIBRARY mxml)
-
-# get version string
-# currently do not know from where to get it automatically
-
-# handle the QUIETLY and REQUIRED arguments and set LIBMXML_FOUND to TRUE if
-# all listed variables are TRUE
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MXML
-                                  REQUIRED_VARS LIBMXML_LIBRARY LIBMXML_INCLUDE_DIR)
-
-if (NOT LIBMXML_FOUND)
-  unset(LIBMXML_LIBRARY)
-endif()
-
-mark_as_advanced(LIBMXML_INCLUDE_DIR LIBMXML_LIBRARY)
-
@@ -1,45 +0,0 @@
-# - Find NeXus library
-# Find the native NEXUS includes and library
-# This module defines
-#  NEXUS_INCLUDE_DIR, where to find NeXus.h, etc.
-#  NEXUS_LIBRARY, library to link against to use NEXUS
-#  NEXUS_FOUND, if false, do not try to use NEXUS.
-
-find_path(NEXUS_INCLUDE_DIR napi.h
-  HINTS "/usr/local/include" "/opt/nexus/include" "/usr/local/include/nexus"
-)
-# find position of napi.h from the end
-string(FIND "${NEXUS_INCLUDE_DIR}" "/napi.h" pos REVERSE)
-# truncate the string
-string(SUBSTRING "${NEXUS_INCLUDE_DIR}" 0 ${pos} substr)
-set(NEXUS_INCLUDE_DIR ${substr})
-unset(substr)
-
-find_library(NEXUS_LIBRARY NeXus 
-  HINTS "/usr/lib" "/usr/lib64" "/usr/local/lib" "/usr/local/lib64" "/opt/nexus/lib")
-
-# get version string
-if (NEXUS_INCLUDE_DIR AND EXISTS ${NEXUS_INCLUDE_DIR}/napi.h)
-  file(STRINGS "${NEXUS_INCLUDE_DIR}/napi.h" NEXUS_version_str
-       REGEX "^#define[\t ]+NEXUS_VERSION[\t ].*")
-
-  string(REGEX REPLACE "^#define[\t ]+NEXUS_VERSION[\t ]+\"([^\"]*).*"
-         "\\1" NEXUS_VERSION_STRING "${NEXUS_version_str}")
-  unset(NEXUS_version_str)
-endif()
-
-# handle the QUIETLY and REQUIRED arguments and set NEXUS_FOUND to TRUE if
-# all listed variables are TRUE
-include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(NEXUS
-                                  REQUIRED_VARS NEXUS_LIBRARY NEXUS_INCLUDE_DIR
-                                  VERSION_VAR NEXUS_VERSION_STRING)
-
-if (NOT NEXUS_FOUND)
-  unset(NEXUS_LIBRARY)
-endif()
-
-mark_as_advanced(NEXUS_INCLUDE_DIR NEXUS_LIBRARY)
-
-
-
@@ -1,30 +0,0 @@
-# configure_musrfit_version_file.cmake.in:
-set(SRC_DIR "@CMAKE_SOURCE_DIR@")
-set(BIN_DIR "@CMAKE_CURRENT_BINARY_DIR@")
-
-# Set variables
-set(CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
-set(MUSRFIT_VERSION "@MUSRFIT_VERSION@")
-
-# Get the current working branch
-execute_process(
-  COMMAND git rev-parse --abbrev-ref HEAD
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE GIT_BRANCH
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-# Get the latest abbreviated commit hash of the working branch
-execute_process(
-  COMMAND git log -1 --pretty="%h, %ci"
-  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  OUTPUT_VARIABLE GIT_CURRENT_SHA1
-  OUTPUT_STRIP_TRAILING_WHITESPACE
-)
-
-configure_file(
-  ${SRC_DIR}/cmake/git-revision.h.in
-  ${BIN_DIR}/git-revision.h
-  @ONLY
-)
-# EOF
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Name=MuSRedit
+Comment=editor and launcher for the musrfit data analysis
+GenericName=musrfit editor
+Exec=musredit %F
+Icon=musredit
+Terminal=false
+Type=Application
+StartupWMClass=MuSRedit
+Categories=Science;DataEditing;
+MimeType=text/plain;
+Keywords=muSR;fitting;musrfit;physics;muon;
+StartupNotify=true
@@ -91,6 +91,8 @@ rm -rf $RPM_BUILD_ROOT
 %_prefix/lib64/*
 %license COPYING
 %doc %_prefix/share/doc/musrfit
+%{_datadir}/applications/musredit.desktop
+%{_datadir}/icons/hicolor/48x48/apps/musredit.png



@@ -0,0 +1,15 @@
+# musrfitConfig.cmake.in
+# CMake package configuration template for musrfit.
+# Generated by configure_package_config_file().
+
+@PACKAGE_INIT@
+
+include(CMakeFindDependencyMacro)
+
+find_dependency(ROOT REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser)
+find_dependency(Boost REQUIRED COMPONENTS filesystem)
+find_dependency(GSL REQUIRED)
+
+include("${CMAKE_CURRENT_LIST_DIR}/musrfitTargets.cmake")
+
+check_required_components(musrfit)
@@ -10,3 +10,10 @@ then
 fi
 /sbin/ldconfig

+#update .desktop and icons
+if command -v update-desktop-database &>/dev/null; then
+  update-desktop-database -q /usr/share/applications || true
+fi
+if command -v gtk-update-icon-cache &>/dev/null; then
+  gtk-update-icon-cache -q -t /usr/share/icons/hicolor || true
+fi
@@ -3,3 +3,11 @@
 echo "  >> musrfit post uninstall script started ..."

 /sbin/ldconfig
+
+#update .desktop and icons
+if command -v update-desktop-database &>/dev/null; then
+  update-desktop-database -q /usr/share/applications || true
+fi
+if command -v gtk-update-icon-cache &>/dev/null; then
+  gtk-update-icon-cache -q -t /usr/share/icons/hicolor || true
+fi
@@ -8,7 +8,7 @@
 ***************************************************************************/

 /***************************************************************************
- *   Copyright (C) 2007-2024 by Andreas Suter                              *
+ *   Copyright (C) 2007-2026 by Andreas Suter                              *
 *   andreas.suter@psi.ch                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
@@ -8,7 +8,7 @@
 ***************************************************************************/

 /***************************************************************************
- *   Copyright (C) 2007-2021 by Andreas Suter                              *
+ *   Copyright (C) 2007-2026 by Andreas Suter                              *
 *   andreas.suter@psi.ch                                                  *
 *                                                                         *
 *   This program is free software; you can redistribute it and/or modify  *
--- a/Show More
+++ b/Show More