start working on the deadtime correction.

Generate git-revision.h into CMAKE_BINARY_DIR/src/ (which is in the
include path) instead of the source tree. Remove the header from
add_executable() source lists, and add missing add_dependencies on
git_revision for all Qt5/Qt6 targets.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

.gitea/workflows/deploy-pages.yml

@@ -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

.gitignore

@@ -0,0 +1,2 @@
+# ignore all files generated from an in-repo build
+build/

CMakeLists.txt

@@ -1,7 +1,12 @@
 # - musrfit
 cmake_minimum_required(VERSION 3.17)
 
-project(musrfit VERSION 1.9.1 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.9.11 LANGUAGES C CXX)
 
 #--- musrfit specific options -------------------------------------------------
 option(nexus "build optional NeXus support. Needed for ISIS" OFF)
@@ -92,11 +97,19 @@ endif ()
 set(ROOT_GRTEQ_24 ${ROOT_GRTEQ_24} CACHE INTERNAL "ROOT Version check")
 
 #--- check for boost ----------------------------------------------------------
-find_package(Boost REQUIRED
+find_package(Boost QUIET)
-  COMPONENTS
+if (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
-    system
+  find_package(Boost REQUIRED
-    filesystem
+    COMPONENTS
-)
+      filesystem
+  )
+else (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
+  find_package(Boost REQUIRED
+    COMPONENTS
+      system
+      filesystem
+  )
+endif (Boost_VERSION VERSION_GREATER_EQUAL "1.89")
 message(STATUS "Boost libs: ${Boost_LIBRARIES}")
 
 #--- check for gsl ------------------------------------------------------------
@@ -109,13 +122,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)
+  if (OpenMP_CXX_FOUND)
     add_definitions(-DHAVE_GOMP)
     set(HAVE_GOMP 1 CACHE INTERNAL "Have GOMP")
-  endif (OpenMP_FOUND)
+  endif (OpenMP_CXX_FOUND)
-endif (try_OpenMP AND NOT APPLE)
+endif (try_OpenMP)
 
 #--- check for Qt -------------------------------------------------------------
 if (qt_based_tools)
@@ -198,11 +211,41 @@ 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(HDF5 COMPONENTS CXX REQUIRED)
-  find_package(HDF4 REQUIRED)
+  if (HAVE_HDF4)
-  find_package(NEXUS REQUIRED)
+    #--- check for HDF4 -----------------------------------------------------------
+    # Find HDF4 manually (pkg-config often doesn't have hdf4)
+    find_path(HDF4_INCLUDE_DIR
+      NAMES mfhdf.h
+      PATHS /usr/include /usr/local/include
+      PATH_SUFFIXES hdf
+    )
+
+    find_library(HDF4_DF_LIBRARY
+      NAMES df libdf
+      PATHS /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
+    )
+
+    find_library(HDF4_MFHDF_LIBRARY
+      NAMES mfhdf libmfhdf
+      PATHS /usr/lib64 /usr/lib /usr/local/lib64 /usr/local/lib
+    )
+
+    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()
+
+    include_directories(${HDF4_INCLUDE_DIRS})
+    add_definitions(-DHAVE_HDF4)
+  endif (HAVE_HDF4)  
   add_definitions(-DPNEXUS_ENABLED)
 endif (nexus)
 
@@ -222,10 +265,50 @@ 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)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+
+# 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)
+if("${isSystemDir}" STREQUAL "-1")
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+endif("${isSystemDir}" STREQUAL "-1")
+set(rpath ${CMAKE_INSTALL_RPATH})
+string(APPEND rpath ";/usr/local/lib")
+set(CMAKE_INSTALL_RPATH "${rpath}")
+
 #--- propagate to the sub-directories -----------------------------------------
 add_subdirectory(src)
 
 #--- write summary of the installation
+cmake_host_system_information(RESULT PROCESSOR QUERY PROCESSOR_DESCRIPTION)
+
 message("")
 message("|-----------------------------------------------------------------------|")
 message("|                                                                       |")
@@ -233,8 +316,9 @@ message("|                            Summary
 message("|                                                                       |")
 message("|-----------------------------------------------------------------------|")
 message("")
-message(" System: ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} - ${CMAKE_HOST_SYSTEM_VERSION}")
+message(" System:    ${CMAKE_HOST_SYSTEM_NAME} ${CMAKE_SYSTEM_PROCESSOR} - ${CMAKE_HOST_SYSTEM_VERSION}")
-message(" -------")
+message(" Processor: ${PROCESSOR} (${CMAKE_SYSTEM_PROCESSOR})")
+message(" ----------")
 message("")
 message(" musrfit Version: ${musrfit_VERSION}")
 message(" ----------------")
@@ -260,9 +344,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("")

ChangeLog

@@ -6,11 +6,57 @@ 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.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
+=============================
+
+switch over to smart pointers wherever possible.
 
 Release of V1.9.1, 2023/05/16
 =============================

INSTALL

@@ -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 ...

README

@@ -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
 

README.md

@@ -26,13 +26,12 @@ Currently it allows the following:
 
 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 ###
 
 <andreas.suter@psi.ch>
 
-For the beta-NMR related parts, please contact
+For the beta-NMR related parts, please contact Zaher Salman
-
 <zaher.salman@psi.ch>
 

cmake/FindHDF4.cmake

@@ -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})

cmake/FindMXML.cmake

@@ -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)
-

cmake/FindNEXUS.cmake

@@ -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)
-
-
-

cmake/configure_musrfit_version_file.cmake.in

@@ -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

doc/examples/UserFcn/PUserFcn.cpp

@@ -8,7 +8,7 @@
 ***************************************************************************/
 
 /***************************************************************************
- *   Copyright (C) 2007-2023 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  *

doc/examples/UserFcn/PUserFcn.h

@@ -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  *

doc/examples/test-asy-NeXus2.msr

@@ -1,33 +1,32 @@
-nc-ZnO T=80 F=69
+Ag_T=100_F=20
 ###############################################################
 FITPARAMETER
 #       No Name        Value     Step        Pos_Error   Boundaries
-        1 alpha       0.88008   -0.00063    0.00063     
+        1 alpha       1.02825   -0.00097    0.00098     
-        2 asym        0.1708    -0.0017     0.0017      0       0.3     
+        2 asym        0.23163   -0.00083    0.00103     0       0.3     
-        3 phase       3.90      -0.38       0.38        0       100     
+        3 phase       0.000     -0.000      0.011       0       100     
-        4 field       71.003    -0.036      0.036       0       none    
+        4 field       20.310    -0.010      0.010       0       none    
-        5 rate        0.1526    -0.0024     0.0024      0       100     
+        5 rate        0.00031   -0.00031    0.00134     0       100     
-        6 beta        1.231     -0.046      0.047       
 
 ###############################################################
 THEORY
 asymmetry      2
 TFieldCos      3  fun1       (phase frequency)
-generExpo      5     6       (rate exponent)
+simplExpo      5          (rate)
 
 ###############################################################
 FUNCTIONS
 fun1 = gamma_mu * par4
 
 ###############################################################
-RUN data/EMU00005989_v2 EMU ISIS NEXUS   (name beamline institute data-file-format)
+RUN data/emu00139040 EMU ISIS NEXUS   (name beamline institute data-file-format)
 fittype         2         (asymmetry fit)
 alpha           1
 map             0    0    0    0    0    0    0    0    0    0
-forward         1-16 
+forward         1-48 
-backward        17-32 
+backward        49-96 
 backgr.fix      0           0           
-data            40      1500    40      1500    
+data            10      2048    10      2048    
 fit             0.2     14     
 packing         1
 
@@ -39,19 +38,19 @@ SAVE
 
 ###############################################################
 FOURIER
-units            Gauss   # units either 'Gauss', 'MHz', or 'Mc/s'
+units            Gauss   # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
 fourier_power    10
 apodization      STRONG  # NONE, WEAK, MEDIUM, STRONG
-plot             REAL    # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
+plot             REAL    # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
 range            0    100
 phase            par2
 
 ###############################################################
 PLOT 2   (asymmetry plot)
 runs     1   
-range    0   14   -0.22   0.22
+range    0   14   -0.32   0.32
-view_packing 5
+view_packing 10
 
 ###############################################################
-STATISTIC --- 2012-03-20 10:28:41
+STATISTIC --- 2026-02-06 14:00:49
-  chisq = 796.7, NDF = 846, chisq/NDF = 0.941749
+  chisq = 1092.3, NDF = 858, chisq/NDF = 1.273055

doc/examples/test-histo-NeXus2.msr

@@ -1,23 +1,22 @@
-nc-ZnO T=80 F=69
+Ag_T=100_F=20
 ###############################################################
 FITPARAMETER
 #       No Name        Value     Step        Pos_Error   Boundaries
         1 zero        0         0           none        
-        2 phase       2.81      -0.30       0.30        0       100     
+        2 phase       0.000000011  -0.000000011 0.005772888 0       100     
-        3 field       70.998    -0.025      0.025       0       none    
+        3 field       20.3391   -0.0085     0.0085      0       none    
-        4 asym        0.1700    -0.0011     0.0012      0       0.3     
+        4 asym        0.23461   -0.00051    0.00051     0       0.3     
-        5 rate        0.1523    -0.0017     0.0017      0       100     
+        5 rate        0.0239    -0.0040     0.0035      0       100     
-        6 beta        1.255     -0.033      0.033       
+        6 Norm_L      1151.24   -0.53       0.53        
-        7 Norm_L      2410.44   -0.83       0.83        
+        7 BG_L        0         0           none        0       none    
-        8 BG_L        0         0           none        0       none    
+        8 Norm_R      1178.60   -0.58       0.58        0       none    
-        9 Norm_R      2121.43   -0.77       0.77        0       none    
+        9 BG_R        0         0           none        0       none    
-       10 BG_R        0         0           none        0       none    
+       10 relPhase    178.49    -0.20       0.20        0       none    
-       11 relPhase    182.29    -0.31       0.31        0       none    
 
 ###############################################################
 THEORY
 asymmetry      4
-generExpo      5     6       (rate exponent)
+simpleGss      5          (rate)
 TFieldCos   fun1  fun2       (phase frequency)
 
 ###############################################################
@@ -28,22 +27,25 @@ fun2 = gamma_mu * par3
 ###############################################################
 GLOBAL
 fittype         0         (single histogram fit)
-data            40      1500    
+data            5       2048    
-fit             0.2     14     
+t0              10.0    
+deadtime-cor    file
+fit             0.144   30     
 packing         1
 
 ###############################################################
-RUN data/EMU00005989_v2 XXXX ISIS NEXUS   (name beamline institute data-file-format)
+RUN data/emu00139040 EMU ISIS NEXUS   (name beamline institute data-file-format)
-norm            7
+norm            6
-backgr.fit      8
+backgr.fit      7
 map             1    0    0    0    0    0    0    0    0    0
-forward         1-16 
+forward         1-48 
+#deadtime-cor    file
 
-RUN data/EMU00005989_v2 XXXX ISIS NEXUS   (name beamline institute data-file-format)
+RUN data/emu00139040 XXXX ISIS NEXUS   (name beamline institute data-file-format)
-norm            9
+norm            8
-backgr.fit      10
+backgr.fit      9
-map            11    0    0    0    0    0    0    0    0    0
+map            10    0    0    0    0    0    0    0    0    0
-forward         17-32 
+forward         49-96 
 
 ###############################################################
 COMMANDS
@@ -59,15 +61,15 @@ fourier_power    11
 apodization      STRONG  # NONE, WEAK, MEDIUM, STRONG
 plot             REAL    # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
 range            0    200
-phase            parR2 par11
+phase            parR2, par10
 
 ###############################################################
 PLOT 0   (single histo plot)
 lifetimecorrection
 runs        1   2
-range    0   14   -0.22   0.22
+range    0   20   -0.35   0.35
-view_packing 2
+#view_packing 10
 
 ###############################################################
-STATISTIC --- 2019-03-12 18:08:05
+STATISTIC --- 2026-02-08 15:32:12
-  maxLH = 2585.1, NDF = 1696, maxLH/NDF = 1.524236
+  maxLH = 4233.1, NDF = 3725, maxLH/NDF = 1.136412

doc/examples/test-histo-ROOT-NPP.msr

@@ -15,9 +15,6 @@ asymmetry      3
 simplExpo      4          (rate)
 TFieldCos      1     2       (phase frequency)
 
-###############################################################
-#FUNCTIONS
-
 ###############################################################
 RUN data/lem08_his_2279 MUE4 PSI ROOT-NPP   (name beamline institute data-file-format)
 fittype         0         (single histogram fit)
@@ -39,6 +36,14 @@ MINIMIZE
 MINOS
 SAVE
 
+###############################################################
+FOURIER
+units            Gauss   # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
+fourier_power    10
+apodization      STRONG  # NONE, WEAK, MEDIUM, STRONG
+plot             POWER   # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
+dc-corrected     true
+
 ###############################################################
 PLOT 0   (single histo plot)
 runs     1