adopted cmake to newest DKS version.

This patch fixes compilation errors that arise with recent ROOT versions (e.g., 6.34.02),
which require a ROOT::Minuit2::MnStrategy object to be passed when initializing the
ROOT::Minuit2::MnX (X = Migrad, Simplex, Minimize) minimizers (i.e., instead of the integer
representing the "strategy").

.gitignore

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

CMakeLists.txt

@@ -1,9 +1,10 @@
-# - musrfit
+# - musrfit --- DKS -----------------------------------------------------------
 cmake_minimum_required(VERSION 3.17)
 
-project(musrfit VERSION 1.9.2 LANGUAGES C CXX)
+project(musrfit VERSION 1.9.9 LANGUAGES C CXX)
 
 #--- musrfit specific options -------------------------------------------------
+option(dks "build musrfit with DKS (GPU/MIC) support" ON)
 option(nexus "build optional NeXus support. Needed for ISIS" OFF)
 option(ASlibs "build optional ASlibs" OFF)
 option(BMWlibs "build optional BMWlibs" OFF)
@@ -71,7 +72,7 @@ find_package(PkgConfig REQUIRED)
 find_package(Git REQUIRED)
 
 #--- check for ROOT -----------------------------------------------------------
-find_package(ROOT 6.18 REQUIRED COMPONENTS Gui MathMore Minuit2 XMLParser)
+find_package(ROOT 6.16 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)
@@ -109,13 +110,49 @@ 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 (try_OpenMP AND NOT APPLE)
+  endif (OpenMP_CXX_FOUND)
+endif (try_OpenMP)
+
+#--- check for CUDA and/or OpenCL followed by DKS -----------------------------
+if (dks)
+  find_package(CUDA)
+  if (CUDA_FOUND)
+    message (STATUS "CUDA include: ${CUDA_INCLUDE_DIRS}")
+    message (STATUS "CUDA libs: ${CUDA_TOOLKIT_ROOT_DIR}/lib64")
+    message (STATUS "CUDA version: ${CUDA_VERSION}")
+    add_definitions(${DKS_CMAKE_CXX_FLAGS})
+  endif (CUDA_FOUND)
+
+  if (NOT CUDA_FOUND)
+    message(STATUS "CUDA not found, looking for OpenCL")
+    find_package(OpenCL)
+    if (OpenCL_FOUND)
+      message(STATUS "OpenCL version : ${OpenCL_VERSION_STRING}")
+      message(STATUS "OpenCL include dir: ${OpenCL_INCLUDE_DIR}")
+      message(STATUS "OpenCL library dir: ${OpenCL_LIBRARY}")
+      add_definitions(-DDKS_OPENCL)
+    endif (OpenCL_FOUND)
+  endif (NOT CUDA_FOUND)
+
+  if (NOT CUDA_FOUND AND NOT OpenCL_FOUND)
+    message(WARNING ">> Neither CUDA nor OpenCL found which are required for DKS, hence disable DKS support <<")
+  else (NOT CUDA_FOUND AND NOT OpenCL_FOUND)
+    find_package(DKS "1.2.0"
+	    HINTS "/usr/local/lib/"
+	  )
+ endif (NOT CUDA_FOUND AND NOT OpenCL_FOUND) 
+endif (dks)
+
+if (DKS_FOUND)
+  message(STATUS "DKS version : ${DKS_VERSION}")
+  message(STATUS "DKS include dir : ${DKS_INCLUDE_DIR}")
+  message(STATUS "DKS library : ${DKS_LIBRARY}")  
+endif (DKS_FOUND)	
 
 #--- check for Qt -------------------------------------------------------------
 if (qt_based_tools)
@@ -200,8 +237,10 @@ endif (qt_based_tools)
 
 #--- if NeXus check also for HDF4, HDF5, and MXML -----------------------------
 if (nexus)
-  find_package(HDF5 COMPONENTS CXX REQUIRED )
-  find_package(HDF4 REQUIRED)
+  find_package(HDF5 COMPONENTS CXX REQUIRED)
+  if (HAVE_HDF4)
+    find_package(HDF4 REQUIRED)
+  endif (HAVE_HDF4)  
   find_package(NEXUS REQUIRED)
   add_definitions(-DPNEXUS_ENABLED)
 endif (nexus)
@@ -222,10 +261,48 @@ else ()
   set(IS_GIT_REPO 0)
 endif ()
 
+#--- start create git-revision.h ----------------------------------------------
+if (IS_GIT_REPO)
+  execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/src/git_revision.sh)
+
+  set(HAVE_GIT_REV_H "-DHAVE_GIT_REV_H")  
+  set(GIT_REV_H "git-revision.h")
+else (IS_GIT_REPO)
+  set(HAVE_GIT_REV_H "")  
+  set(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 +310,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(" ----------------")
@@ -250,6 +328,7 @@ message(" GSL     found in ${GSL_INCLUDE_DIRS}, Version: ${GSL_VERSION}")
 message(" BOOST   found in ${Boost_INCLUDE_DIRS}, Version: ${Boost_VERSION}")
 message(" LibXML2 found in ${LIBXML2_INCLUDE_DIR}, Version: ${LIBXML2_VERSION_STRING}")
 message(" ROOT    found in ${ROOT_INCLUDE_DIRS}, Version: ${ROOT_VERSION}")
+
 if (OpenMP_FOUND)
   if (OpenMP_CXX_VERSION)
     message(" OpenMP  found Version: ${OpenMP_CXX_VERSION}")
@@ -257,10 +336,29 @@ if (OpenMP_FOUND)
     message(" OpenMP  found")
   endif (OpenMP_CXX_VERSION)
 endif (OpenMP_FOUND)
+message("")
+
+if (CUDA_FOUND)
+  message(" CUDA    found in ${CUDA_INCLUDE_DIRECTORIES} (Version: ${CUDA_VERSION})")
+endif (CUDA_FOUND)
+if (OpenCL_FOUND)
+  message(" OpenCL  found in ${OpenCL_INCLUDE_DIR} (Version: ${OpenCL_VERSION_STRING})")
+endif (OpenCL_FOUND)
+if (DKS_FOUND)
+  message(" DKS     found in ${DKS_INCLUDE_DIR} (Version: ${DKS_VERSION})")
+endif (DKS_FOUND)
+
+if (NOT CUDA_FOUND AND NOT OpenCL_FOUND AND NOT DKS_FOUND) 
+  message(" **WARNING** configured without DKS support! DKS, CUDA, OpenCL not found?")
+endif (NOT CUDA_FOUND AND NOT OpenCL_FOUND AND NOT DKS_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)

ChangeLog

@@ -12,6 +12,42 @@ or
 
 https://bitbucket.org/muonspin/musrfit/commits/all
 
+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
 =============================
 
@@ -195,6 +231,7 @@ NEW 2016-04-28 msr2data gets a new option: paramList which allows to
                extract a subset of all the parameters of a collection
                of msr-files.
 NEW 2016-04-22 Added the theory function muMinusExpTF for mu minus fits
+NEW 2016-03-08 added a theory translator for DKS
 NEW 2016-02-23 It is now possible to export the averaged data/Fourier
 CHANGED 2016-12-18 updated the docu.
 CHANGED 2016-12-18 a couple of little improvements in musredit.
@@ -202,6 +239,7 @@ CHANGED 2016-08-10 drop NeXus support for Version < 4.4
 CHANGED 2016-04-26 start-/endTimeBin are now class members. This reduces 
                the number of recalculations.
 FIXED 2016-08-02 run lists are now properly loaded if containing nS-nE elements.
+FIXED 2016-04-14 added missing DKS selector in GetPhaseOptRealFourier.
 
 changes since 0.16.0
 ===================================

README.md

@@ -32,6 +32,7 @@ For a more exhaustive user documentation see:
 
 <andreas.suter@psi.ch>
 
-For the beta-NMR related parts, please contact Zaher Salman
+For the beta-NMR related parts, please contact
+
 <zaher.salman@psi.ch>
 

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/BMWlibs/test-libGapIntegrals-ASCII.msr

@@ -11,7 +11,7 @@ FITPARAMETER
 ###############################################################
 THEORY
 asymmetry      1
-userFcn  libGapIntegrals TGapDWave 2 3 4 5
+userFcn  libGapIntegrals TGapPointPWave 2 3
 
 ###############################################################
 RUN data/libGapIntegrals-test PIM3 PSI ASCII   (name beamline institute data-file-format)

doc/examples/DepthProfiles/1300Ar/depth_profile_startup.xml

@@ -6,6 +6,30 @@
     <trim_sp>
         <data_path>./TRIMSP/</data_path>
         <rge_fln_pre>SiC_1300x_52nm_48nm_E</rge_fln_pre>
-        <energy_vect start="1000" stop="22000" step="1000"/>
+        <energy_list>
+            <energy>1000</energy>
+            <energy>2000</energy>
+            <energy>3000</energy>
+            <energy>4000</energy>
+            <energy>5000</energy>
+            <energy>6000</energy>
+            <energy>7000</energy>
+            <energy>8000</energy>
+            <energy>9000</energy>
+            <energy>10000</energy>
+            <energy>11000</energy>
+            <energy>12000</energy>
+            <energy>13000</energy>
+            <energy>14000</energy>
+            <energy>15000</energy>
+            <energy>16000</energy>
+            <energy>17000</energy>
+            <energy>17000</energy>
+            <energy>18000</energy>
+            <energy>19000</energy>
+            <energy>20000</energy>
+            <energy>21000</energy>
+            <energy>22000</energy>
+        </energy_list>
     </trim_sp>
 </depthProf>

doc/examples/DepthProfiles/1300x/depth_profile_startup.xml

@@ -6,6 +6,30 @@
     <trim_sp>
         <data_path>./TRIMSP/</data_path>
         <rge_fln_pre>SiC_1300x_52nm_48nm_E</rge_fln_pre>
-        <energy_vect start="1000" stop="22000" step="1000"/>
+        <energy_list>
+            <energy>1000</energy>
+            <energy>2000</energy>
+            <energy>3000</energy>
+            <energy>4000</energy>
+            <energy>5000</energy>
+            <energy>6000</energy>
+            <energy>7000</energy>
+            <energy>8000</energy>
+            <energy>9000</energy>
+            <energy>10000</energy>
+            <energy>11000</energy>
+            <energy>12000</energy>
+            <energy>13000</energy>
+            <energy>14000</energy>
+            <energy>15000</energy>
+            <energy>16000</energy>
+            <energy>17000</energy>
+            <energy>17000</energy>
+            <energy>18000</energy>
+            <energy>19000</energy>
+            <energy>20000</energy>
+            <energy>21000</energy>
+            <energy>22000</energy>
+        </energy_list>
     </trim_sp>
 </depthProf>

doc/examples/DepthProfiles/PECVD_Si/depth_profile_startup.xml

@@ -6,6 +6,30 @@
     <trim_sp>
         <data_path>./TRIMSP/</data_path>
         <rge_fln_pre>Si10_2.0_E</rge_fln_pre>
-        <energy_vect start="1000" stop="22000" step="1000"/>
+        <energy_list>
+            <energy>1000</energy>
+            <energy>2000</energy>
+            <energy>3000</energy>
+            <energy>4000</energy>
+            <energy>5000</energy>
+            <energy>6000</energy>
+            <energy>7000</energy>
+            <energy>8000</energy>
+            <energy>9000</energy>
+            <energy>10000</energy>
+            <energy>11000</energy>
+            <energy>12000</energy>
+            <energy>13000</energy>
+            <energy>14000</energy>
+            <energy>15000</energy>
+            <energy>16000</energy>
+            <energy>17000</energy>
+            <energy>17000</energy>
+            <energy>18000</energy>
+            <energy>19000</energy>
+            <energy>20000</energy>
+            <energy>21000</energy>
+            <energy>22000</energy>
+        </energy_list>
     </trim_sp>
 </depthProf>

doc/examples/DepthProfiles/PECVD_thermal_SiC/depth_profile_startup.xml

@@ -6,6 +6,30 @@
     <trim_sp>
         <data_path>./TRIMSP/</data_path>
         <rge_fln_pre>SiO2_70nm2.0_30nm2.2_SiC_E</rge_fln_pre>
-        <energy_vect start="1000" stop="22000" step="1000"/>
+        <energy_list>
+            <energy>1000</energy>
+            <energy>2000</energy>
+            <energy>3000</energy>
+            <energy>4000</energy>
+            <energy>5000</energy>
+            <energy>6000</energy>
+            <energy>7000</energy>
+            <energy>8000</energy>
+            <energy>9000</energy>
+            <energy>10000</energy>
+            <energy>11000</energy>
+            <energy>12000</energy>
+            <energy>13000</energy>
+            <energy>14000</energy>
+            <energy>15000</energy>
+            <energy>16000</energy>
+            <energy>17000</energy>
+            <energy>17000</energy>
+            <energy>18000</energy>
+            <energy>19000</energy>
+            <energy>20000</energy>
+            <energy>21000</energy>
+            <energy>22000</energy>
+        </energy_list>
     </trim_sp>
 </depthProf>

doc/examples/UserFcn/PUserFcn.cpp

@@ -8,7 +8,7 @@
 ***************************************************************************/
 
 /***************************************************************************
- *   Copyright (C) 2007-2023 by Andreas Suter                              *
+ *   Copyright (C) 2007-2025 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-2025 by Andreas Suter                              *
  *   andreas.suter@psi.ch                                                  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *

doc/examples/UserFcn/PUserFcnLinkDef.h

@@ -4,7 +4,7 @@
 
 ***************************************************************************/
 
-#ifdef __CINT__
+#ifdef __CLING__
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -12,4 +12,4 @@
 
 #pragma link C++ class PUserFcn+;
 
-#endif //__CINT__
+#endif //__CLING__

doc/examples/test-histo-HAL9500.msr

@@ -2,106 +2,106 @@ MnSi, FLC68.2, 50 K
 ###############################################################
 FITPARAMETER
 #      Nr. Name       Value     Step      Pos_Error Boundaries   
-        1 Rate_1      1.6687    0.0086      none        
-        2 Field_1     73089.883 0.090       none        
-        3 Rate_2      1.968     0.032       none        
-        4 Field_2     72289.02  0.24        none        
+        1 Rate_1      1.6686    -0.0085     0.0086      
+        2 Field_1     73089.887 -0.090      0.090       
+        3 Rate_2      1.967     -0.032      0.032       
+        4 Field_2     72289.02  -0.24       0.24        
         
-        5 Asym_1      0.2949    0.0030      none        
-        6 Frc_1       0.7316    0.0059      none        
-        7 Phase_1     55.61     0.52        none        
-        8 N0_1        940.35    0.54        none        
-        9 Bkg_1       1.523     0.064       none        
+        5 Asym_1      0.2949    -0.0030     0.0030      
+        6 Frc_1       0.7316    -0.0058     0.0059      
+        7 Phase_1     55.61     -0.52       0.52        
+        8 N0_1        940.36    -0.54       0.54        
+        9 Bkg_1       1.524     -0.064      0.064       
 
-       10 Asym_2      0.2960    0.0030      none        
-       11 Frc_2       0.7475    0.0059      none        
-       12 Phase_2     30.77     0.50        none        
-       13 N0_2        961.49    0.55        none        
-       14 Bkg_2       1.928     0.065       none        
+       10 Asym_2      0.2960    -0.0030     0.0030      
+       11 Frc_2       0.7475    -0.0058     0.0059      
+       12 Phase_2     30.77     -0.50       0.50        
+       13 N0_2        961.50    -0.55       0.55        
+       14 Bkg_2       1.929     -0.065      0.065       
 
-       15 Asym_3      0.3002    0.0029      none        
-       16 Frc_3       0.7462    0.0056      none        
-       17 Phase_3     18.03     0.48        none        
-       18 N0_3        1024.28   0.57        none        
-       19 Bkg_3       1.919     0.067       none        
+       15 Asym_3      0.3002    -0.0029     0.0029      
+       16 Frc_3       0.7462    -0.0056     0.0057      
+       17 Phase_3     18.03     -0.48       0.48        
+       18 N0_3        1024.29   -0.57       0.57        
+       19 Bkg_3       1.920     -0.067      0.067       
 
-       20 Asym_4      0.3088    0.0029      none        
-       21 Frc_4       0.7333    0.0054      none        
-       22 Phase_4     336.94    0.47        none        
-       23 N0_4        1029.36   0.57        none        
-       24 Bkg_4       1.863     0.067       none        
+       20 Asym_4      0.3088    -0.0029     0.0029      
+       21 Frc_4       0.7333    -0.0053     0.0054      
+       22 Phase_4     336.94    -0.48       0.47        
+       23 N0_4        1029.37   -0.57       0.57        
+       24 Bkg_4       1.865     -0.067      0.067       
 
-       25 Asym_5      0.3094    0.0029      none        
-       26 Frc_5       0.7416    0.0055      none        
-       27 Phase_5     280.32    0.48        none        
-       28 N0_5        1002.69   0.56        none        
-       29 Bkg_5       1.979     0.067       none        
+       25 Asym_5      0.3094    -0.0029     0.0029      
+       26 Frc_5       0.7416    -0.0054     0.0055      
+       27 Phase_5     280.33    -0.48       0.48        
+       28 N0_5        1002.70   -0.56       0.56        
+       29 Bkg_5       1.981     -0.067      0.067       
 
-       30 Asym_6      0.3153    0.0032      none        
-       31 Frc_6       0.7403    0.0058      none        
-       32 Phase_6     211.07    0.51        none        
-       33 N0_6        853.43    0.52        none        
-       34 Bkg_6       1.656     0.061       none        
+       30 Asym_6      0.3153    -0.0032     0.0032      
+       31 Frc_6       0.7403    -0.0057     0.0058      
+       32 Phase_6     211.07    -0.51       0.51        
+       33 N0_6        853.44    -0.52       0.52        
+       34 Bkg_6       1.658     -0.061      0.061       
 
-       35 Asym_7      0.3118    0.0032      none        
-       36 Frc_7       0.7378    0.0059      none        
-       37 Phase_7     161.74    0.51        none        
-       38 N0_7        858.76    0.52        none        
-       39 Bkg_7       1.594     0.061       none        
+       35 Asym_7      0.3118    -0.0032     0.0032      
+       36 Frc_7       0.7377    -0.0058     0.0059      
+       37 Phase_7     161.75    -0.51       0.51        
+       38 N0_7        858.77    -0.52       0.52        
+       39 Bkg_7       1.595     -0.061      0.062       
 
-       40 Asym_8      0.2985    0.0031      none        
-       41 Frc_8       0.7373    0.0061      none        
-       42 Phase_8     133.69    0.53        none        
-       43 N0_8        871.20    0.52        none        
-       44 Bkg_8       1.746     0.062       none        
+       40 Asym_8      0.2985    -0.0031     0.0031      
+       41 Frc_8       0.7373    -0.0060     0.0061      
+       42 Phase_8     133.70    -0.53       0.53        
+       43 N0_8        871.20    -0.52       0.52        
+       44 Bkg_8       1.748     -0.062      0.062       
 
-       45 Asym_9      0.2874    0.0027      none        
-       46 Frc_9       0.7340    0.0054      none        
-       47 Phase_9     158.63    0.47        none        
-       48 N0_9        1184.29   0.61        none        
-       49 Bkg_9       2.542     0.073       none        
+       45 Asym_9      0.2874    -0.0027     0.0027      
+       46 Frc_9       0.7340    -0.0054     0.0055      
+       47 Phase_9     158.63    -0.47       0.47        
+       48 N0_9        1184.30   -0.61       0.61        
+       49 Bkg_9       2.544     -0.073      0.073       
 
-       50 Asym_10     0.2846    0.0027      none        
-       51 Frc_10      0.7453    0.0055      none        
-       52 Phase_10    128.05    0.47        none        
-       53 N0_10       1193.66   0.61        none        
-       54 Bkg_10      2.394     0.073       none        
+       50 Asym_10     0.2845    -0.0027     0.0027      
+       51 Frc_10      0.7452    -0.0055     0.0055      
+       52 Phase_10    128.05    -0.47       0.47        
+       53 N0_10       1193.67   -0.61       0.61        
+       54 Bkg_10      2.396     -0.073      0.073       
 
-       55 Asym_11     0.2877    0.0026      none        
-       56 Frc_11      0.7463    0.0053      none        
-       57 Phase_11    102.43    0.45        none        
-       58 N0_11       1280.00   0.63        none        
-       59 Bkg_11      2.730     0.075       none        
+       55 Asym_11     0.2877    -0.0026     0.0026      
+       56 Frc_11      0.7462    -0.0052     0.0053      
+       57 Phase_11    102.42    -0.45       0.45        
+       58 N0_11       1280.01   -0.63       0.63        
+       59 Bkg_11      2.732     -0.075      0.075       
 
-       60 Asym_12     0.2919    0.0025      none        
-       61 Frc_12      0.7405    0.0050      none        
-       62 Phase_12    42.97     0.43        none        
-       63 N0_12       1383.96   0.66        none        
-       64 Bkg_12      2.807     0.078       none        
+       60 Asym_12     0.2919    -0.0025     0.0025      
+       61 Frc_12      0.7405    -0.0050     0.0050      
+       62 Phase_12    42.97     -0.43       0.43        
+       63 N0_12       1383.97   -0.66       0.66        
+       64 Bkg_12      2.809     -0.078      0.078       
 
-       65 Asym_13     0.2903    0.0025      none        
-       66 Frc_13      0.7494    0.0050      none        
-       67 Phase_13    350.74    0.43        none        
-       68 N0_13       1393.01   0.66        none        
-       69 Bkg_13      2.738     0.078       none        
+       65 Asym_13     0.2903    -0.0025     0.0025      
+       66 Frc_13      0.7493    -0.0050     0.0050      
+       67 Phase_13    350.74    -0.43       0.43        
+       68 N0_13       1393.02   -0.66       0.66        
+       69 Bkg_13      2.740     -0.078      0.079       
 
-       70 Asym_14     0.2968    0.0025      none        
-       71 Frc_14      0.7327    0.0049      none        
-       72 Phase_14    288.56    0.43        none        
-       73 N0_14       1374.46   0.66        none        
-       74 Bkg_14      2.768     0.078       none        
+       70 Asym_14     0.2968    -0.0025     0.0025      
+       71 Frc_14      0.7327    -0.0049     0.0050      
+       72 Phase_14    288.57    -0.43       0.43        
+       73 N0_14       1374.47   -0.66       0.66        
+       74 Bkg_14      2.771     -0.078      0.078       
 
-       75 Asym_15     0.2799    0.0025      none        
-       76 Frc_15      0.7427    0.0052      none        
-       77 Phase_15    282.56    0.45        none        
-       78 N0_15       1365.97   0.65        none        
-       79 Bkg_15      2.809     0.078       none        
+       75 Asym_15     0.2799    -0.0025     0.0025      
+       76 Frc_15      0.7427    -0.0052     0.0053      
+       77 Phase_15    282.56    -0.45       0.45        
+       78 N0_15       1365.99   -0.66       0.65        
+       79 Bkg_15      2.811     -0.078      0.078       
 
-       80 Asym_16     0.2771    0.0026      none        
-       81 Frc_16      0.7344    0.0055      none        
-       82 Phase_16    212.46    0.48        none        
-       83 N0_16       1256.94   0.63        none        
-       84 Bkg_16      2.458     0.074       none        
+       80 Asym_16     0.2771    -0.0026     0.0026      
+       81 Frc_16      0.7344    -0.0054     0.0055      
+       82 Phase_16    212.46    -0.48       0.48        
+       83 N0_16       1256.95   -0.63       0.63        
+       84 Bkg_16      2.460     -0.074      0.075       
 
 ###############################################################
 THEORY
@@ -257,9 +257,12 @@ t0              20039.0
 
 ###############################################################
 COMMANDS
+#OpenCL-GPU
+CUDA
 MAX_LIKELIHOOD
-PRINT_LEVEL 2
+#PRINT_LEVEL 2
 MINIMIZE
+MINOS
 SAVE
 
 ###############################################################
@@ -278,5 +281,5 @@ phase            par(7, 5, 16)
 range            7.1    7.5
 
 ###############################################################
-STATISTIC --- 2018-10-15 15:55:36
-  maxLH = 1286508.7, NDF = 1246064, maxLH/NDF = 1.032458
+STATISTIC --- 2023-11-09 09:38:03
+  maxLH = 1286509.8, NDF = 1246064, maxLH/NDF = 1.032459

doc/examples/test-histo-MusrRoot.msr

@@ -2,23 +2,23 @@ LSCO x=0.02 (224-227), T=12.00 (K), E=5.57 keV, WEW B=~49(G)/8.62(A), Tr=15.02 (
 ###############################################################
 FITPARAMETER
 #       No Name        Value     Step        Pos_Error   Boundaries
-        1 AsymT       0.05053   -0.00071    0.00072     0       0.33    
+        1 AsymT       0.05052   -0.00071    0.00072     0       0.33    
         2 Field       48.298    -0.094      0.095       
         3 RateT       0.129     -0.010      0.010       0       none    
         4 AsymL       0         0           none        0       0.33    
         5 RateL       0         0           none        
         6 AlphaLR     0.9784    -0.0013     0.0013      
         7 PhaseL      6.6       -1.6        1.6         -40     40      
-        8 BkgL        6.920     -0.048      0.048       
+        8 BkgL        6.921     -0.048      0.048       
         9 RelPhaseR   178.8     -1.9        1.9         150     210     
-       10 NormR       419.46    -0.40       0.40        
+       10 NormR       419.47    -0.40       0.40        
        11 BkgR        8.393     -0.050      0.050       
        12 AlphaTB     1.1025    -0.0015     0.0015      
        13 RelPhaseT   269.1     -1.9        1.9         240     300     
-       14 BkgT        7.466     -0.049      0.049       
+       14 BkgT        7.467     -0.049      0.049       
        15 NormB       393.08    -0.39       0.39        
        16 RelPhaseB   90.7      -2.0        2.0         60      120     
-       17 BkgB        7.092     -0.048      0.048       
+       17 BkgB        7.092     -0.048      0.047       
        18 One         1         0           none        
        19 Zero        0         0           none        
 
@@ -96,5 +96,5 @@ range    0   9   -0.15   0.15
 view_packing 500
 
 ###############################################################
-STATISTIC --- 2018-11-13 07:58:56
-  maxLH = 3971.7, NDF = 4001, maxLH/NDF = 0.992668
+STATISTIC --- 2023-10-25 11:01:10
+  maxLH = 3971.7, NDF = 4001, maxLH/NDF = 0.992678

doc/examples/test-histo-PSI-BIN.msr

@@ -8,9 +8,9 @@ FITPARAMETER
         4 Phase_L     178.95    -0.41       0.41        
         5 Phase_R     1.75      -0.39       0.39        
         6 N0_L        1097.9    -1.0        1.0         
-        7 N0_R        1159.7    -1.0        1.0         
+        7 N0_R        1159.8    -1.0        1.0         
         8 Bkg_L       54.47     -0.20       0.20        
-        9 Bkg_R       46.70     -0.19       0.19        
+        9 Bkg_R       46.71     -0.19       0.19        
 
 ###############################################################
 THEORY
@@ -47,6 +47,7 @@ t0              202.0
 
 ###############################################################
 COMMANDS
+CUDA
 SCALE_N0_BKG TRUE
 MINIMIZE
 MINOS
@@ -63,11 +64,11 @@ FOURIER
 units            Gauss   # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
 fourier_power    12
 apodization      NONE    # NONE, WEAK, MEDIUM, STRONG
-plot             POWER   # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
+plot             POWER   # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL
 phase            8.5
 #range_for_phase_correction 50.0 70.0
-range            0.0    200.0
+range            0    200
 
 ###############################################################
-STATISTIC --- 2015-01-05 14:09:47
-  chisq = 663.9, NDF = 515, chisq/NDF = 1.289169
+STATISTIC --- 2024-06-07 15:33:49
+  chisq = 663.9, NDF = 515, chisq/NDF = 1.289084

doc/html/.buildinfo

@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: b18a215470778ea2da02b3cad4d0e07c
+config: fae482e1a3134e03efb428cbbe21a254
 tags: 645f666f9bcd5a90fca523b33c5a78b7