diff --git a/ChangeLog b/ChangeLog index 03dd8f9ec..8079b18b9 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 a51b6901c..de96e9e44 100644 --- a/doc/examples/test-asy-NeXus2.msr +++ b/doc/examples/test-asy-NeXus2.msr @@ -2,11 +2,11 @@ Ag_T=100_F=20 ############################################################### FITPARAMETER # No Name Value Step Pos_Error Boundaries - 1 alpha 1.02825 -0.00097 0.00098 - 2 asym 0.23163 -0.00083 0.00103 0 0.3 - 3 phase 0.000 -0.000 0.011 0 100 - 4 field 20.310 -0.010 0.010 0 none - 5 rate 0.00031 -0.00031 0.00134 0 100 + 1 alpha 1.02344 -0.00095 0.00095 + 2 asym 0.23676 -0.00098 0.00098 0 0.3 + 3 phase 0 0 none 0 100 + 4 field 20.300 -0.010 0.010 0 none + 5 rate 0.0040 -0.0013 0.0013 0 100 ############################################################### THEORY @@ -27,7 +27,8 @@ forward 1-48 backward 49-96 backgr.fix 0 0 data 10 2048 10 2048 -fit 0.2 14 +deadtime-cor file +fit 0.144 14 packing 1 ############################################################### @@ -52,5 +53,5 @@ range 0 14 -0.32 0.32 view_packing 10 ############################################################### -STATISTIC --- 2026-02-06 14:00:49 - chisq = 1092.3, NDF = 858, chisq/NDF = 1.273055 +STATISTIC --- 2026-02-21 13:10:28 + chisq = 1166.4, NDF = 863, chisq/NDF = 1.351562 diff --git a/doc/examples/test-histo-NeXus2.msr b/doc/examples/test-histo-NeXus2.msr index 869aff59e..b5e608fd0 100644 --- a/doc/examples/test-histo-NeXus2.msr +++ b/doc/examples/test-histo-NeXus2.msr @@ -2,27 +2,26 @@ Ag_T=100_F=20 ############################################################### FITPARAMETER # No Name Value Step Pos_Error Boundaries - 1 zero 0 0 none - 2 phase 0.000000011 -0.000000011 0.005772888 0 100 - 3 field 20.3391 -0.0085 0.0085 0 none - 4 asym 0.23461 -0.00051 0.00051 0 0.3 - 5 rate 0.0239 -0.0040 0.0035 0 100 - 6 Norm_L 1151.24 -0.53 0.53 - 7 BG_L 0 0 none 0 none - 8 Norm_R 1178.60 -0.58 0.58 0 none - 9 BG_R 0 0 none 0 none - 10 relPhase 178.49 -0.20 0.20 0 none + 1 phaseL 0 0 none + 2 field 20.3390 -0.0085 0.0086 0 none + 3 asym 0.23461 -0.00051 0.00051 0 0.3 + 4 rate 0.0239 -0.0040 0.0035 0 100 + 5 Norm_L 1151.24 -0.53 0.53 + 6 BG_L 0 0 none 0 none + 7 Norm_R 1178.60 -0.58 0.58 0 none + 8 BG_R 0 0 none 0 none + 9 relPhase 178.49 -0.20 0.20 0 none ############################################################### THEORY -asymmetry 4 -simpleGss 5 (rate) +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 @@ -35,16 +34,16 @@ packing 1 ############################################################### RUN data/emu00139040 EMU ISIS NEXUS (name beamline institute data-file-format) -norm 6 -backgr.fit 7 +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 8 -backgr.fit 9 -map 10 0 0 0 0 0 0 0 0 0 +norm 7 +backgr.fit 8 +map 9 0 0 0 0 0 0 0 0 0 forward 49-96 ############################################################### @@ -61,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, par10 +phase parR1, par9 ############################################################### PLOT 0 (single histo plot) lifetimecorrection runs 1 2 range 0 20 -0.35 0.35 -#view_packing 10 +view_packing 10 ############################################################### -STATISTIC --- 2026-02-08 15:32:12 - maxLH = 4233.1, NDF = 3725, maxLH/NDF = 1.136412 +STATISTIC --- 2026-02-21 13:06:21 + maxLH = 4233.1, NDF = 3726, maxLH/NDF = 1.136107 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