diff --git a/ChangeLog b/ChangeLog index 22205ca43..8167a12ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,13 @@ or 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 ============================== diff --git a/doc/examples/test-asy-NeXus2.msr b/doc/examples/test-asy-NeXus2.msr index 73b640cfa..573f55df7 100644 --- a/doc/examples/test-asy-NeXus2.msr +++ b/doc/examples/test-asy-NeXus2.msr @@ -1,34 +1,34 @@ -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 - 2 asym 0.1708 -0.0017 0.0017 0 0.3 - 3 phase 3.90 -0.38 0.38 0 100 - 4 field 71.003 -0.036 0.036 0 none - 5 rate 0.1526 -0.0024 0.0024 0 100 - 6 beta 1.231 -0.046 0.047 + 1 alpha 1.02389 -0.00095 0.00095 + 2 asym 0.23641 -0.00097 0.00098 0 0.3 + 3 phase 0 0 none 0 100 + 4 field 20.301 -0.010 0.010 0 none + 5 rate 0.0037 -0.0013 0.0013 0 100 ############################################################### 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 -backward 17-32 +forward 1-48 +backward 49-96 backgr.fix 0 0 -data 40 1500 40 1500 -fit 0.2 14 +data 10 2048 10 2048 +deadtime-cor file +fit 0.144 14 packing 1 ############################################################### @@ -39,19 +39,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 -view_packing 5 +range 0 14 -0.32 0.32 +view_packing 10 ############################################################### -STATISTIC --- 2012-03-20 10:28:41 - chisq = 796.7, NDF = 846, chisq/NDF = 0.941749 +STATISTIC --- 2026-02-23 13:12:14 + chisq = 1159.8, NDF = 863, chisq/NDF = 1.343877 diff --git a/doc/examples/test-histo-NeXus2.msr b/doc/examples/test-histo-NeXus2.msr index 0070f72d9..ceef5c04f 100644 --- a/doc/examples/test-histo-NeXus2.msr +++ b/doc/examples/test-histo-NeXus2.msr @@ -1,49 +1,50 @@ -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 - 3 field 70.998 -0.025 0.025 0 none - 4 asym 0.1700 -0.0011 0.0012 0 0.3 - 5 rate 0.1523 -0.0017 0.0017 0 100 - 6 beta 1.255 -0.033 0.033 - 7 Norm_L 2410.44 -0.83 0.83 - 8 BG_L 0 0 none 0 none - 9 Norm_R 2121.43 -0.77 0.77 0 none - 10 BG_R 0 0 none 0 none - 11 relPhase 182.29 -0.31 0.31 0 none + 1 phaseL 0 0 none + 2 field 20.3381 -0.0085 0.0085 0 none + 3 asym 0.23440 -0.00051 0.00051 0 0.3 + 4 rate 0.0234 -0.0041 0.0035 0 100 + 5 Norm_L 1151.30 -0.53 0.53 + 6 BG_L 0 0 none 0 none + 7 Norm_R 1179.09 -0.59 0.58 0 none + 8 BG_R 0 0 none 0 none + 9 relPhase 178.57 -0.20 0.20 0 none ############################################################### THEORY -asymmetry 4 -generExpo 5 6 (rate exponent) +asymmetry 3 +simpleGss 4 (rate) TFieldCos fun1 fun2 (phase frequency) ############################################################### FUNCTIONS -fun1 = par2 + map1 -fun2 = gamma_mu * par3 +fun1 = par1 + map1 +fun2 = gamma_mu * par2 ############################################################### GLOBAL fittype 0 (single histogram fit) -data 40 1500 -fit 0.2 14 +data 5 2048 +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 5 +backgr.fit 6 +map 1 0 0 0 0 0 0 0 0 0 +forward 1-48 +#deadtime-cor file + +RUN data/emu00139040 XXXX ISIS NEXUS (name beamline institute data-file-format) norm 7 backgr.fit 8 -map 1 0 0 0 0 0 0 0 0 0 -forward 1-16 - -RUN data/EMU00005989_v2 XXXX ISIS NEXUS (name beamline institute data-file-format) -norm 9 -backgr.fit 10 -map 11 0 0 0 0 0 0 0 0 0 -forward 17-32 +map 9 0 0 0 0 0 0 0 0 0 +forward 49-96 ############################################################### COMMANDS @@ -59,15 +60,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 parR1, par9 ############################################################### PLOT 0 (single histo plot) lifetimecorrection runs 1 2 -range 0 14 -0.22 0.22 -view_packing 2 +range 0 20 -0.35 0.35 +view_packing 10 ############################################################### -STATISTIC --- 2019-03-12 18:08:05 - maxLH = 2585.1, NDF = 1696, maxLH/NDF = 1.524236 +STATISTIC --- 2026-02-23 13:09:55 + maxLH = 4228.9, NDF = 3726, maxLH/NDF = 1.134977 diff --git a/src/musredit_qt6/musredit/PTextEdit.cpp b/src/musredit_qt6/musredit/PTextEdit.cpp index 7c5f9f439..9e9f31aff 100644 --- a/src/musredit_qt6/musredit/PTextEdit.cpp +++ b/src/musredit_qt6/musredit/PTextEdit.cpp @@ -3570,7 +3570,8 @@ bool PTextEdit::getTheme() bool done = false; if (QFile::exists(str)) { QFile fln(str); - fln.open(QIODevice::ReadOnly | QIODevice::Text); + if (!fln.open(QIODevice::ReadOnly | QIODevice::Text)) + return false; QTextStream fin(&fln); QString line(""); while (!fin.atEnd() && !done) { diff --git a/tests/maxLH_check/CMakeLists.txt b/tests/maxLH_check/CMakeLists.txt index 95e6371b6..7a07e1e64 100644 --- a/tests/maxLH_check/CMakeLists.txt +++ b/tests/maxLH_check/CMakeLists.txt @@ -26,11 +26,11 @@ add_maxLH_test(test-histo-HAL9500 test-histo-HAL9500.msr 1286509.8) add_maxLH_test(test-histo-HAL9500-RRF test-histo-HAL9500-RRF.msr 22187.4) add_maxLH_test(test-histo-muMinus test-histo-muMinus.msr 238962.6) add_maxLH_test(test-histo-NeXus test-histo-NeXus.msr 3273.57) -add_maxLH_test(test-histo-NeXus2 test-histo-NeXus2.msr 2582.50) +add_maxLH_test(test-histo-NeXus2 test-histo-NeXus2.msr 4233.1) # asymmetry fits (chisq) add_maxLH_test(test-asy-PSI-BIN test-asy-PSI-BIN.msr 566.76) add_maxLH_test(test-asy-MUD test-asy-MUD.msr 133.96) -add_maxLH_test(test-asy-NeXus2 test-asy-NeXus2.msr 796.72) +add_maxLH_test(test-asy-NeXus2 test-asy-NeXus2.msr 1166.4) add_maxLH_test(test-asy-HAL9500-RRF test-asy-HAL9500-RRF.msr 7402.28) add_maxLH_test(test-asy-LF-BaB6 test-asy-LF-BaB6.msr 1911.88) \ No newline at end of file diff --git a/tests/musrview_check/ref/musrview-asy-NeXus2-fourier-avg/test-asy-NeXus2_0_F.png b/tests/musrview_check/ref/musrview-asy-NeXus2-fourier-avg/test-asy-NeXus2_0_F.png index 7a1762ac1..4de121510 100644 Binary files a/tests/musrview_check/ref/musrview-asy-NeXus2-fourier-avg/test-asy-NeXus2_0_F.png and b/tests/musrview_check/ref/musrview-asy-NeXus2-fourier-avg/test-asy-NeXus2_0_F.png differ diff --git a/tests/musrview_check/ref/musrview-asy-NeXus2-fourier/test-asy-NeXus2_0_F.png b/tests/musrview_check/ref/musrview-asy-NeXus2-fourier/test-asy-NeXus2_0_F.png index 79c050dea..6f764aa3b 100644 Binary files a/tests/musrview_check/ref/musrview-asy-NeXus2-fourier/test-asy-NeXus2_0_F.png and b/tests/musrview_check/ref/musrview-asy-NeXus2-fourier/test-asy-NeXus2_0_F.png differ diff --git a/tests/musrview_check/ref/musrview-asy-NeXus2/test-asy-NeXus2_0.png b/tests/musrview_check/ref/musrview-asy-NeXus2/test-asy-NeXus2_0.png index 619df90c3..c1dbd7585 100644 Binary files a/tests/musrview_check/ref/musrview-asy-NeXus2/test-asy-NeXus2_0.png and b/tests/musrview_check/ref/musrview-asy-NeXus2/test-asy-NeXus2_0.png differ diff --git a/tests/musrview_check/ref/musrview-histo-NeXus2-fourier-avg/test-histo-NeXus2_0_F.png b/tests/musrview_check/ref/musrview-histo-NeXus2-fourier-avg/test-histo-NeXus2_0_F.png index 26954d8ed..5efec5c50 100644 Binary files a/tests/musrview_check/ref/musrview-histo-NeXus2-fourier-avg/test-histo-NeXus2_0_F.png and b/tests/musrview_check/ref/musrview-histo-NeXus2-fourier-avg/test-histo-NeXus2_0_F.png differ diff --git a/tests/musrview_check/ref/musrview-histo-NeXus2-fourier/test-histo-NeXus2_0_F.png b/tests/musrview_check/ref/musrview-histo-NeXus2-fourier/test-histo-NeXus2_0_F.png index 387ded551..089e25884 100644 Binary files a/tests/musrview_check/ref/musrview-histo-NeXus2-fourier/test-histo-NeXus2_0_F.png and b/tests/musrview_check/ref/musrview-histo-NeXus2-fourier/test-histo-NeXus2_0_F.png differ diff --git a/tests/musrview_check/ref/musrview-histo-NeXus2/test-histo-NeXus2_0.png b/tests/musrview_check/ref/musrview-histo-NeXus2/test-histo-NeXus2_0.png index cf604ffcf..9e26e83ed 100644 Binary files a/tests/musrview_check/ref/musrview-histo-NeXus2/test-histo-NeXus2_0.png and b/tests/musrview_check/ref/musrview-histo-NeXus2/test-histo-NeXus2_0.png differ