diff --git a/ChangeLog b/ChangeLog index 2b67498d..4780180f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ # ChangeLog #--------------------------------------------------------------------- +rather than updating this document, the changes can be followed here: + +https://gitlab.psi.ch/nemu/musrfit/activity + +or + +https://bitbucket.org/muonspin/musrfit/commits/all + changes since 0.18.0 =================================== @@ -132,6 +140,8 @@ NEW 2015-02-13 first implementation of a standalone Fourier transform/plotter: A first simple minded lifetime correction is implemented as well. NEW 2015-02-04 Integration of libBNMR for fitting beta-NMR relaxation data into automake of musrfit. +NEW 2015-01-17 adding a branch for ROOT 6.x. This needs some minor adaptations due + to the new rootcint/rootclang and the stricter c++11. NEW 2014-12-18 first implementation of a GLOBAL block which allows to shorten a typical msr-file. Duplicate entries from the RUN blocks can be added here. Furthermore, the 'lifetimecorrection' flag is diff --git a/Makefile.am b/Makefile.am index a0467d7b..2eb24308 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,8 +6,7 @@ EXTRA_DIST = autogen.sh acinclude.m4 # The following is to install the documentation # It is a bit lengthy because one cannot simply install whole directories (except copying them recursively -- which also takes the .svn directories...) -DOCDIRS = templates \ - examples \ +DOCDIRS = examples \ examples/data \ examples/ASlibs \ examples/ASlibs/data \ diff --git a/acinclude.m4 b/acinclude.m4 index ad9419c9..7d1ff84c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -49,7 +49,7 @@ AC_DEFUN([ROOT_PATH], fi AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin) AC_PATH_PROG(ROOTEXEC, root , no, $rootbin) - AC_PATH_PROG(ROOTCLING, rootcling, no, $rootbin) + AC_PATH_PROG(ROOTCLING, rootcling , no, $rootbin) if test ! x"$ROOTCONF" = "xno" && \ test ! x"$ROOTCLING" = "xno" ; then diff --git a/configure.ac b/configure.ac index 6e43f26f..b78343e9 100644 --- a/configure.ac +++ b/configure.ac @@ -1354,7 +1354,6 @@ AC_CONFIG_FILES([Makefile \ src/musredit_qt5/Makefile \ src/musredit/Makefile \ src/musrgui/Makefile \ - src/musredit/musredit_startup.xml \ src/musrgui/musrgui_startup.xml]) AC_OUTPUT diff --git a/doc/examples/UserFcn/Makefile.PUserFcn b/doc/examples/UserFcn/Makefile.PUserFcn index c2e9aeed..2557e897 100644 --- a/doc/examples/UserFcn/Makefile.PUserFcn +++ b/doc/examples/UserFcn/Makefile.PUserFcn @@ -46,11 +46,11 @@ clean:; @rm -f $(OBJS) *Dict* core* $(OBJS): %.o: %.cpp $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -# Generate the ROOT CINT dictionary +# Generate the ROOT CLING dictionary PUserFcnDict.cpp: PUserFcn.h PUserFcnLinkDef.h @echo "Generating dictionary $@..." - rootcint -f $@ -c -p -I$(ROOTINCLUDE) $^ + rootcling -f $@ -c -p -I$(ROOTINCLUDE) $^ install: all @echo "Installing shared lib: libTApproximation.so" diff --git a/doc/examples/test-asy-MUD.msr b/doc/examples/test-asy-MUD.msr index 9c53c561..cd2afe95 100644 --- a/doc/examples/test-asy-MUD.msr +++ b/doc/examples/test-asy-MUD.msr @@ -3,7 +3,7 @@ MgB12H12 No2 ZF T=150 FITPARAMETER # Nr. Name Value Step Pos_Error Boundaries 1 alpha 1 0 none 0 2 - 2 asy 0.17503 -0.00082 0.00083 0 0.33 + 2 asy 0.17503 -0.00081 0.00083 0 0.33 3 rate 0.1649 -0.0016 0.0016 0 none 4 beta 0.892 -0.016 0.016 0.5 2 @@ -19,7 +19,7 @@ alpha 1 map 0 0 0 0 0 0 0 0 0 0 0 forward 1 backward 2 -background 79 391 80 409 # estimated bkg: 21.0224 / 17.1702 +background 79 391 80 409 # estimated bkg: 21.0833 / 17.2249 data 438 12785 436 12787 t0 432.0 431.0 fit 0 8 @@ -34,10 +34,10 @@ SAVE ############################################################### FOURIER -units Gauss # units either 'Gauss', 'MHz', or 'Mc/s' +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 #range_for_phase_correction 50.0 70.0 range 0 200 @@ -48,5 +48,5 @@ runs 1 range 0 8 0 0.25 ############################################################### -STATISTIC --- 2012-03-20 10:11:27 - chisq = 133.9, NDF = 99, chisq/NDF = 1.352819 +STATISTIC --- 2017-02-08 07:07:39 + chisq = 134.0, NDF = 99, chisq/NDF = 1.353150 diff --git a/doc/examples/test-histo-muMinus.msr b/doc/examples/test-histo-muMinus.msr index 795f4b5a..8bc3d7ad 100644 --- a/doc/examples/test-histo-muMinus.msr +++ b/doc/examples/test-histo-muMinus.msr @@ -5,11 +5,11 @@ FITPARAMETER 1 N_0 321.0 1.4 none 2 tau_0 1.9066 0.0038 none 0 none 3 Rate_0 0.0983 0.0052 none 0 none - 4 Freq_0 135.53824 0.00073 none + 4 Freq_0 135.53823 0.00073 none 5 N_1 306.1 1.3 none 6 tau_1 0.7409 0.0026 none 0 none - 7 Rate_1 0.026 0.027 none 0 none + 7 Rate_1 0.027 0.031 none 0 none 8 Freq_1 136.8968 0.0033 none 9 Asym_F1_0 0.0490 0.0015 none 0 none @@ -28,7 +28,7 @@ FITPARAMETER 20 N_bgk_F3 1.465 0.033 none 21 Asym_F4_0 0.0512 0.0015 none 0 none - 22 Asym_F4_1 0.0521 0.0029 none 0 none + 22 Asym_F4_1 0.0521 0.0030 none 0 none 23 Phase_F4 144.6 1.5 none 24 N_bgk_F4 2.311 0.034 none @@ -40,7 +40,7 @@ FITPARAMETER 29 Asym_F6_0 0.0502 0.0015 none 0 none 30 Asym_F6_1 0.0517 0.0030 none 0 none 31 Phase_F6 232.1 1.5 none - 32 N_bgk_F6 1.735 0.033 none + 32 N_bgk_F6 1.735 0.034 none 33 Asym_F7_0 0.0488 0.0015 none 0 none 34 Asym_F7_1 0.0575 0.0030 none 0 none @@ -48,12 +48,12 @@ FITPARAMETER 36 N_bgk_F7 1.593 0.033 none 37 Asym_F8_0 0.0547 0.0015 none 0 none - 38 Asym_F8_1 0.0468 0.0029 none 0 none + 38 Asym_F8_1 0.0468 0.0030 none 0 none 39 Phase_F8 321.7 1.4 none 40 N_bgk_F8 1.469 0.033 none 41 Asym_B1_0 0.0476 0.0015 none 0 none - 42 Asym_B1_1 0.0535 0.0029 none 0 none + 42 Asym_B1_1 0.0535 0.0030 none 0 none 43 Phase_B1 3.6 1.5 none 44 N_bgk_B1 1.378 0.033 none @@ -64,8 +64,8 @@ FITPARAMETER 49 Asym_B3_0 0.0494 0.0015 none 0 none 50 Asym_B3_1 0.0555 0.0030 none 0 none - 51 Phase_B3 98.1 1.5 none - 52 N_bgk_B3 0.969 0.032 none + 51 Phase_B3 98.2 1.5 none + 52 N_bgk_B3 0.968 0.032 none 53 Asym_B4_0 0.0505 0.0015 none 0 none 54 Asym_B4_1 0.0527 0.0030 none 0 none @@ -78,7 +78,7 @@ FITPARAMETER 60 N_bgk_B5 1.642 0.033 none 61 Asym_B6_0 0.0512 0.0015 none 0 none - 62 Asym_B6_1 0.0477 0.0029 none 0 none + 62 Asym_B6_1 0.0477 0.0030 none 0 none 63 Phase_B6 231.7 1.5 none 64 N_bgk_B6 1.650 0.033 none @@ -183,7 +183,7 @@ SAVE ############################################################### PLOT 4 (mu minus plot) -runs 1-16 +runs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 range 0 9 ############################################################### @@ -191,9 +191,9 @@ FOURIER units Tesla # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s' fourier_power 14 apodization MEDIUM # NONE, WEAK, MEDIUM, STRONG -plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE -range 0.8 1.2 +plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL +range 0.8 1.2 ############################################################### -STATISTIC --- 2016-04-25 17:05:56 +STATISTIC --- 2017-02-08 07:11:01 maxLH = 238962.5, NDF = 230264, maxLH/NDF = 1.037776 diff --git a/doc/html/user/MUSR/BmwLibs.html b/doc/html/user/MUSR/BmwLibs.html index 051059ca..9f343c80 100644 --- a/doc/html/user/MUSR/BmwLibs.html +++ b/doc/html/user/MUSR/BmwLibs.html @@ -1,7 +1,7 @@ - - + + MUSR :: BmwLibs @@ -14,14 +14,14 @@ - + - - + + - - + + - + - + - - - - - + + - - + + + + - - - - - + + - - - - - + + + + + + + + diff --git a/src/musredit_qt5/icons/document-new-plain.svg b/src/musredit_qt5/musredit/icons/document-new-plain.svg similarity index 100% rename from src/musredit_qt5/icons/document-new-plain.svg rename to src/musredit_qt5/musredit/icons/document-new-plain.svg diff --git a/src/musredit_qt5/musredit/icons/document-open-dark.svg b/src/musredit_qt5/musredit/icons/document-open-dark.svg new file mode 100644 index 00000000..ef9cbb30 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/document-open-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/document-open-plain.svg b/src/musredit_qt5/musredit/icons/document-open-plain.svg similarity index 100% rename from src/musredit_qt5/icons/document-open-plain.svg rename to src/musredit_qt5/musredit/icons/document-open-plain.svg diff --git a/src/musredit_qt5/musredit/icons/document-print-dark.svg b/src/musredit_qt5/musredit/icons/document-print-dark.svg new file mode 100644 index 00000000..6eb876ee --- /dev/null +++ b/src/musredit_qt5/musredit/icons/document-print-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/document-print-plain.svg b/src/musredit_qt5/musredit/icons/document-print-plain.svg similarity index 100% rename from src/musredit_qt5/icons/document-print-plain.svg rename to src/musredit_qt5/musredit/icons/document-print-plain.svg diff --git a/src/musredit_qt5/musredit/icons/document-save-dark.svg b/src/musredit_qt5/musredit/icons/document-save-dark.svg new file mode 100644 index 00000000..3df75d57 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/document-save-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/document-save-plain.svg b/src/musredit_qt5/musredit/icons/document-save-plain.svg similarity index 100% rename from src/musredit_qt5/icons/document-save-plain.svg rename to src/musredit_qt5/musredit/icons/document-save-plain.svg diff --git a/src/musredit_qt5/musredit/icons/edit-copy-dark.svg b/src/musredit_qt5/musredit/icons/edit-copy-dark.svg new file mode 100644 index 00000000..6de6a598 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/edit-copy-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/edit-copy-plain.svg b/src/musredit_qt5/musredit/icons/edit-copy-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-copy-plain.svg rename to src/musredit_qt5/musredit/icons/edit-copy-plain.svg diff --git a/src/musredit_qt5/musredit/icons/edit-cut-dark.svg b/src/musredit_qt5/musredit/icons/edit-cut-dark.svg new file mode 100644 index 00000000..99ab04ef --- /dev/null +++ b/src/musredit_qt5/musredit/icons/edit-cut-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/edit-cut-plain.svg b/src/musredit_qt5/musredit/icons/edit-cut-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-cut-plain.svg rename to src/musredit_qt5/musredit/icons/edit-cut-plain.svg diff --git a/src/musredit_qt5/musredit/icons/edit-find-dark.svg b/src/musredit_qt5/musredit/icons/edit-find-dark.svg new file mode 100644 index 00000000..fb62e414 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/edit-find-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/edit-find-plain.svg b/src/musredit_qt5/musredit/icons/edit-find-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-find-plain.svg rename to src/musredit_qt5/musredit/icons/edit-find-plain.svg diff --git a/src/musredit_qt5/musredit/icons/edit-paste-dark.svg b/src/musredit_qt5/musredit/icons/edit-paste-dark.svg new file mode 100644 index 00000000..ba4f3cb5 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/edit-paste-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/edit-paste-plain.svg b/src/musredit_qt5/musredit/icons/edit-paste-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-paste-plain.svg rename to src/musredit_qt5/musredit/icons/edit-paste-plain.svg diff --git a/src/musredit_qt5/musredit/icons/edit-redo-dark.svg b/src/musredit_qt5/musredit/icons/edit-redo-dark.svg new file mode 100644 index 00000000..19d34158 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/edit-redo-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/edit-redo-plain.svg b/src/musredit_qt5/musredit/icons/edit-redo-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-redo-plain.svg rename to src/musredit_qt5/musredit/icons/edit-redo-plain.svg diff --git a/src/musredit_qt5/musredit/icons/edit-undo-dark.svg b/src/musredit_qt5/musredit/icons/edit-undo-dark.svg new file mode 100644 index 00000000..7ab68cf0 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/edit-undo-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/edit-undo-plain.svg b/src/musredit_qt5/musredit/icons/edit-undo-plain.svg similarity index 100% rename from src/musredit_qt5/icons/edit-undo-plain.svg rename to src/musredit_qt5/musredit/icons/edit-undo-plain.svg diff --git a/src/musredit_qt5/musredit/icons/go-next-use-dark.svg b/src/musredit_qt5/musredit/icons/go-next-use-dark.svg new file mode 100644 index 00000000..6c188cf0 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/go-next-use-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/go-next-use-plain.svg b/src/musredit_qt5/musredit/icons/go-next-use-plain.svg similarity index 100% rename from src/musredit_qt5/icons/go-next-use-plain.svg rename to src/musredit_qt5/musredit/icons/go-next-use-plain.svg diff --git a/src/musredit_qt5/musredit/icons/go-previous-use-dark.svg b/src/musredit_qt5/musredit/icons/go-previous-use-dark.svg new file mode 100644 index 00000000..01ef7277 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/go-previous-use-dark.svg @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/musredit_qt5/icons/go-previous-use-plain.svg b/src/musredit_qt5/musredit/icons/go-previous-use-plain.svg similarity index 100% rename from src/musredit_qt5/icons/go-previous-use-plain.svg rename to src/musredit_qt5/musredit/icons/go-previous-use-plain.svg diff --git a/src/musredit_qt5/icons/inkscape/document-new.svg b/src/musredit_qt5/musredit/icons/inkscape/document-new.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/document-new.svg rename to src/musredit_qt5/musredit/icons/inkscape/document-new.svg diff --git a/src/musredit_qt5/icons/inkscape/document-open.svg b/src/musredit_qt5/musredit/icons/inkscape/document-open.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/document-open.svg rename to src/musredit_qt5/musredit/icons/inkscape/document-open.svg diff --git a/src/musredit_qt5/icons/inkscape/document-print.svg b/src/musredit_qt5/musredit/icons/inkscape/document-print.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/document-print.svg rename to src/musredit_qt5/musredit/icons/inkscape/document-print.svg diff --git a/src/musredit_qt5/icons/inkscape/document-save.svg b/src/musredit_qt5/musredit/icons/inkscape/document-save.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/document-save.svg rename to src/musredit_qt5/musredit/icons/inkscape/document-save.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-copy.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-copy.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-copy.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-copy.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-cut.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-cut.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-cut.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-cut.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-find.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-find.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-find.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-find.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-paste.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-paste.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-paste.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-paste.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-redo.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-redo.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-redo.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-redo.svg diff --git a/src/musredit_qt5/icons/inkscape/edit-undo.svg b/src/musredit_qt5/musredit/icons/inkscape/edit-undo.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/edit-undo.svg rename to src/musredit_qt5/musredit/icons/inkscape/edit-undo.svg diff --git a/src/musredit_qt5/icons/inkscape/go-next-use.svg b/src/musredit_qt5/musredit/icons/inkscape/go-next-use.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/go-next-use.svg rename to src/musredit_qt5/musredit/icons/inkscape/go-next-use.svg diff --git a/src/musredit_qt5/icons/inkscape/go-previous-use.svg b/src/musredit_qt5/musredit/icons/inkscape/go-previous-use.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/go-previous-use.svg rename to src/musredit_qt5/musredit/icons/inkscape/go-previous-use.svg diff --git a/src/musredit_qt5/icons/inkscape/msr2data.svg b/src/musredit_qt5/musredit/icons/inkscape/msr2data.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/msr2data.svg rename to src/musredit_qt5/musredit/icons/inkscape/msr2data.svg diff --git a/src/musredit_qt5/icons/inkscape/musrAsym.svg b/src/musredit_qt5/musredit/icons/inkscape/musrAsym.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrAsym.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrAsym.svg diff --git a/src/musredit_qt5/icons/inkscape/musrFT.svg b/src/musredit_qt5/musredit/icons/inkscape/musrFT.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrFT.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrFT.svg diff --git a/src/musredit_qt5/icons/inkscape/musrSingleHisto.svg b/src/musredit_qt5/musredit/icons/inkscape/musrSingleHisto.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrSingleHisto.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrSingleHisto.svg diff --git a/src/musredit_qt5/icons/inkscape/musrchisq.svg b/src/musredit_qt5/musredit/icons/inkscape/musrchisq.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrchisq.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrchisq.svg diff --git a/src/musredit_qt5/icons/inkscape/musrdump.svg b/src/musredit_qt5/musredit/icons/inkscape/musrdump.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrdump.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrdump.svg diff --git a/src/musredit_qt5/icons/inkscape/musrfit.svg b/src/musredit_qt5/musredit/icons/inkscape/musrfit.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrfit.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrfit.svg diff --git a/src/musredit_qt5/icons/inkscape/musrprefs.svg b/src/musredit_qt5/musredit/icons/inkscape/musrprefs.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrprefs.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrprefs.svg diff --git a/src/musredit_qt5/icons/inkscape/musrswap.svg b/src/musredit_qt5/musredit/icons/inkscape/musrswap.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrswap.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrswap.svg diff --git a/src/musredit_qt5/icons/inkscape/musrt0.svg b/src/musredit_qt5/musredit/icons/inkscape/musrt0.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrt0.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrt0.svg diff --git a/src/musredit_qt5/icons/inkscape/musrview.svg b/src/musredit_qt5/musredit/icons/inkscape/musrview.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/musrview.svg rename to src/musredit_qt5/musredit/icons/inkscape/musrview.svg diff --git a/src/musredit_qt5/icons/inkscape/view-refresh.svg b/src/musredit_qt5/musredit/icons/inkscape/view-refresh.svg similarity index 100% rename from src/musredit_qt5/icons/inkscape/view-refresh.svg rename to src/musredit_qt5/musredit/icons/inkscape/view-refresh.svg diff --git a/src/musredit_qt5/musredit/icons/msr2data-dark.svg b/src/musredit_qt5/musredit/icons/msr2data-dark.svg new file mode 100644 index 00000000..87af256a --- /dev/null +++ b/src/musredit_qt5/musredit/icons/msr2data-dark.svg @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/msr2data-plain.svg b/src/musredit_qt5/musredit/icons/msr2data-plain.svg similarity index 100% rename from src/musredit_qt5/icons/msr2data-plain.svg rename to src/musredit_qt5/musredit/icons/msr2data-plain.svg diff --git a/src/musredit_qt5/icons/musrAsym-plain.svg b/src/musredit_qt5/musredit/icons/musrAsym-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrAsym-plain.svg rename to src/musredit_qt5/musredit/icons/musrAsym-plain.svg diff --git a/src/musredit_qt5/musredit/icons/musrFT-dark.svg b/src/musredit_qt5/musredit/icons/musrFT-dark.svg new file mode 100644 index 00000000..55763817 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrFT-dark.svg @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrFT-plain.svg b/src/musredit_qt5/musredit/icons/musrFT-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrFT-plain.svg rename to src/musredit_qt5/musredit/icons/musrFT-plain.svg diff --git a/src/musredit_qt5/icons/musrSingleHisto-plain.svg b/src/musredit_qt5/musredit/icons/musrSingleHisto-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrSingleHisto-plain.svg rename to src/musredit_qt5/musredit/icons/musrSingleHisto-plain.svg diff --git a/src/musredit_qt5/musredit/icons/musrStep-32x32-dark.svg b/src/musredit_qt5/musredit/icons/musrStep-32x32-dark.svg new file mode 100644 index 00000000..fec88e9f --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrStep-32x32-dark.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musredit/icons/musrStep-32x32.svg b/src/musredit_qt5/musredit/icons/musrStep-32x32.svg new file mode 100644 index 00000000..176bb47e --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrStep-32x32.svg @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musredit/icons/musrWiz-32x32-dark.svg b/src/musredit_qt5/musredit/icons/musrWiz-32x32-dark.svg new file mode 100644 index 00000000..9f6d2e8e --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrWiz-32x32-dark.svg @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musredit/icons/musrWiz-32x32.svg b/src/musredit_qt5/musredit/icons/musrWiz-32x32.svg new file mode 100644 index 00000000..1b3cafe5 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrWiz-32x32.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musredit/icons/musrchisq-dark.svg b/src/musredit_qt5/musredit/icons/musrchisq-dark.svg new file mode 100644 index 00000000..2086780e --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrchisq-dark.svg @@ -0,0 +1,153 @@ + + + + + + + + image/svg+xml + + + + + + χ2 + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrchisq-plain.svg b/src/musredit_qt5/musredit/icons/musrchisq-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrchisq-plain.svg rename to src/musredit_qt5/musredit/icons/musrchisq-plain.svg diff --git a/src/musredit_qt5/musredit/icons/musrdump-dark.svg b/src/musredit_qt5/musredit/icons/musrdump-dark.svg new file mode 100644 index 00000000..13d8cf23 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrdump-dark.svg @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + DUMP + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrdump-plain.svg b/src/musredit_qt5/musredit/icons/musrdump-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrdump-plain.svg rename to src/musredit_qt5/musredit/icons/musrdump-plain.svg diff --git a/src/musredit_qt5/icons/musredit.icns b/src/musredit_qt5/musredit/icons/musredit.icns similarity index 100% rename from src/musredit_qt5/icons/musredit.icns rename to src/musredit_qt5/musredit/icons/musredit.icns diff --git a/src/musredit_qt5/icons/musredit.ico b/src/musredit_qt5/musredit/icons/musredit.ico similarity index 100% rename from src/musredit_qt5/icons/musredit.ico rename to src/musredit_qt5/musredit/icons/musredit.ico diff --git a/src/musredit_qt5/icons/musrfit-16x16.gif b/src/musredit_qt5/musredit/icons/musrfit-16x16.gif similarity index 100% rename from src/musredit_qt5/icons/musrfit-16x16.gif rename to src/musredit_qt5/musredit/icons/musrfit-16x16.gif diff --git a/src/musredit_qt5/icons/musrfit-16x16.ico b/src/musredit_qt5/musredit/icons/musrfit-16x16.ico similarity index 100% rename from src/musredit_qt5/icons/musrfit-16x16.ico rename to src/musredit_qt5/musredit/icons/musrfit-16x16.ico diff --git a/src/musredit_qt5/icons/musrfit-16x16.png b/src/musredit_qt5/musredit/icons/musrfit-16x16.png similarity index 100% rename from src/musredit_qt5/icons/musrfit-16x16.png rename to src/musredit_qt5/musredit/icons/musrfit-16x16.png diff --git a/src/musredit_qt5/icons/musrfit-16x16.xpm b/src/musredit_qt5/musredit/icons/musrfit-16x16.xpm similarity index 100% rename from src/musredit_qt5/icons/musrfit-16x16.xpm rename to src/musredit_qt5/musredit/icons/musrfit-16x16.xpm diff --git a/src/musredit_qt5/musredit/icons/musrfit-dark.svg b/src/musredit_qt5/musredit/icons/musrfit-dark.svg new file mode 100644 index 00000000..45a532c6 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrfit-dark.svg @@ -0,0 +1,190 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/musredit/icons/musrfit-help-dark.svg b/src/musredit_qt5/musredit/icons/musrfit-help-dark.svg new file mode 100644 index 00000000..de27d7cd --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrfit-help-dark.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? + + diff --git a/src/musredit_qt5/musredit/icons/musrfit-help-plain.svg b/src/musredit_qt5/musredit/icons/musrfit-help-plain.svg new file mode 100644 index 00000000..75338437 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrfit-help-plain.svg @@ -0,0 +1,171 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ? + + diff --git a/src/musredit_qt5/icons/musrfit-plain.svg b/src/musredit_qt5/musredit/icons/musrfit-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrfit-plain.svg rename to src/musredit_qt5/musredit/icons/musrfit-plain.svg diff --git a/src/musredit_qt5/icons/musrfit.gif b/src/musredit_qt5/musredit/icons/musrfit.gif similarity index 100% rename from src/musredit_qt5/icons/musrfit.gif rename to src/musredit_qt5/musredit/icons/musrfit.gif diff --git a/src/musredit_qt5/musredit/icons/musrprefs-dark.svg b/src/musredit_qt5/musredit/icons/musrprefs-dark.svg new file mode 100644 index 00000000..8687353f --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrprefs-dark.svg @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + PREFS + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrprefs-plain.svg b/src/musredit_qt5/musredit/icons/musrprefs-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrprefs-plain.svg rename to src/musredit_qt5/musredit/icons/musrprefs-plain.svg diff --git a/src/musredit_qt5/musredit/icons/musrswap-dark.svg b/src/musredit_qt5/musredit/icons/musrswap-dark.svg new file mode 100644 index 00000000..79151fc6 --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrswap-dark.svg @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + MLOG + MSR + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrswap-plain.svg b/src/musredit_qt5/musredit/icons/musrswap-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrswap-plain.svg rename to src/musredit_qt5/musredit/icons/musrswap-plain.svg diff --git a/src/musredit_qt5/musredit/icons/musrt0-dark.svg b/src/musredit_qt5/musredit/icons/musrt0-dark.svg new file mode 100644 index 00000000..3630dd7f --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrt0-dark.svg @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + T0 + diff --git a/src/musredit_qt5/icons/musrt0-plain.svg b/src/musredit_qt5/musredit/icons/musrt0-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrt0-plain.svg rename to src/musredit_qt5/musredit/icons/musrt0-plain.svg diff --git a/src/musredit_qt5/musredit/icons/musrview-dark.svg b/src/musredit_qt5/musredit/icons/musrview-dark.svg new file mode 100644 index 00000000..1831940f --- /dev/null +++ b/src/musredit_qt5/musredit/icons/musrview-dark.svg @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/musredit_qt5/icons/musrview-plain.svg b/src/musredit_qt5/musredit/icons/musrview-plain.svg similarity index 100% rename from src/musredit_qt5/icons/musrview-plain.svg rename to src/musredit_qt5/musredit/icons/musrview-plain.svg diff --git a/src/musredit_qt5/musredit/icons/view-refresh-dark.svg b/src/musredit_qt5/musredit/icons/view-refresh-dark.svg new file mode 100644 index 00000000..0b66cbef --- /dev/null +++ b/src/musredit_qt5/musredit/icons/view-refresh-dark.svg @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/musredit_qt5/icons/view-refresh-plain.svg b/src/musredit_qt5/musredit/icons/view-refresh-plain.svg similarity index 100% rename from src/musredit_qt5/icons/view-refresh-plain.svg rename to src/musredit_qt5/musredit/icons/view-refresh-plain.svg diff --git a/src/musredit_qt5/latex_images/abragam.png b/src/musredit_qt5/musredit/latex_images/abragam.png similarity index 100% rename from src/musredit_qt5/latex_images/abragam.png rename to src/musredit_qt5/musredit/latex_images/abragam.png diff --git a/src/musredit_qt5/latex_images/abragam.tex b/src/musredit_qt5/musredit/latex_images/abragam.tex similarity index 100% rename from src/musredit_qt5/latex_images/abragam.tex rename to src/musredit_qt5/musredit/latex_images/abragam.tex diff --git a/src/musredit_qt5/latex_images/asymmetry.png b/src/musredit_qt5/musredit/latex_images/asymmetry.png similarity index 100% rename from src/musredit_qt5/latex_images/asymmetry.png rename to src/musredit_qt5/musredit/latex_images/asymmetry.png diff --git a/src/musredit_qt5/latex_images/asymmetry.tex b/src/musredit_qt5/musredit/latex_images/asymmetry.tex similarity index 100% rename from src/musredit_qt5/latex_images/asymmetry.tex rename to src/musredit_qt5/musredit/latex_images/asymmetry.tex diff --git a/src/musredit_qt5/latex_images/bessel.png b/src/musredit_qt5/musredit/latex_images/bessel.png similarity index 100% rename from src/musredit_qt5/latex_images/bessel.png rename to src/musredit_qt5/musredit/latex_images/bessel.png diff --git a/src/musredit_qt5/latex_images/bessel.tex b/src/musredit_qt5/musredit/latex_images/bessel.tex similarity index 100% rename from src/musredit_qt5/latex_images/bessel.tex rename to src/musredit_qt5/musredit/latex_images/bessel.tex diff --git a/src/musredit_qt5/latex_images/combiLGKT.png b/src/musredit_qt5/musredit/latex_images/combiLGKT.png similarity index 100% rename from src/musredit_qt5/latex_images/combiLGKT.png rename to src/musredit_qt5/musredit/latex_images/combiLGKT.png diff --git a/src/musredit_qt5/latex_images/combiLGKT.tex b/src/musredit_qt5/musredit/latex_images/combiLGKT.tex similarity index 100% rename from src/musredit_qt5/latex_images/combiLGKT.tex rename to src/musredit_qt5/musredit/latex_images/combiLGKT.tex diff --git a/src/musredit_qt5/latex_images/generalExp.png b/src/musredit_qt5/musredit/latex_images/generalExp.png similarity index 100% rename from src/musredit_qt5/latex_images/generalExp.png rename to src/musredit_qt5/musredit/latex_images/generalExp.png diff --git a/src/musredit_qt5/latex_images/generalExp.tex b/src/musredit_qt5/musredit/latex_images/generalExp.tex similarity index 100% rename from src/musredit_qt5/latex_images/generalExp.tex rename to src/musredit_qt5/musredit/latex_images/generalExp.tex diff --git a/src/musredit_qt5/latex_images/internalBessel.png b/src/musredit_qt5/musredit/latex_images/internalBessel.png similarity index 100% rename from src/musredit_qt5/latex_images/internalBessel.png rename to src/musredit_qt5/musredit/latex_images/internalBessel.png diff --git a/src/musredit_qt5/latex_images/internalBessel.tex b/src/musredit_qt5/musredit/latex_images/internalBessel.tex similarity index 100% rename from src/musredit_qt5/latex_images/internalBessel.tex rename to src/musredit_qt5/musredit/latex_images/internalBessel.tex diff --git a/src/musredit_qt5/latex_images/internalField.png b/src/musredit_qt5/musredit/latex_images/internalField.png similarity index 100% rename from src/musredit_qt5/latex_images/internalField.png rename to src/musredit_qt5/musredit/latex_images/internalField.png diff --git a/src/musredit_qt5/latex_images/internalField.tex b/src/musredit_qt5/musredit/latex_images/internalField.tex similarity index 100% rename from src/musredit_qt5/latex_images/internalField.tex rename to src/musredit_qt5/musredit/latex_images/internalField.tex diff --git a/src/musredit_qt5/latex_images/internalFieldGK.png b/src/musredit_qt5/musredit/latex_images/internalFieldGK.png similarity index 100% rename from src/musredit_qt5/latex_images/internalFieldGK.png rename to src/musredit_qt5/musredit/latex_images/internalFieldGK.png diff --git a/src/musredit_qt5/latex_images/internalFieldLL.png b/src/musredit_qt5/musredit/latex_images/internalFieldLL.png similarity index 100% rename from src/musredit_qt5/latex_images/internalFieldLL.png rename to src/musredit_qt5/musredit/latex_images/internalFieldLL.png diff --git a/src/musredit_qt5/latex_images/polynom.png b/src/musredit_qt5/musredit/latex_images/polynom.png similarity index 100% rename from src/musredit_qt5/latex_images/polynom.png rename to src/musredit_qt5/musredit/latex_images/polynom.png diff --git a/src/musredit_qt5/latex_images/polynom.tex b/src/musredit_qt5/musredit/latex_images/polynom.tex similarity index 100% rename from src/musredit_qt5/latex_images/polynom.tex rename to src/musredit_qt5/musredit/latex_images/polynom.tex diff --git a/src/musredit_qt5/latex_images/simpleExp.png b/src/musredit_qt5/musredit/latex_images/simpleExp.png similarity index 100% rename from src/musredit_qt5/latex_images/simpleExp.png rename to src/musredit_qt5/musredit/latex_images/simpleExp.png diff --git a/src/musredit_qt5/latex_images/simpleExp.tex b/src/musredit_qt5/musredit/latex_images/simpleExp.tex similarity index 100% rename from src/musredit_qt5/latex_images/simpleExp.tex rename to src/musredit_qt5/musredit/latex_images/simpleExp.tex diff --git a/src/musredit_qt5/latex_images/simpleGauss.png b/src/musredit_qt5/musredit/latex_images/simpleGauss.png similarity index 100% rename from src/musredit_qt5/latex_images/simpleGauss.png rename to src/musredit_qt5/musredit/latex_images/simpleGauss.png diff --git a/src/musredit_qt5/latex_images/simpleGauss.tex b/src/musredit_qt5/musredit/latex_images/simpleGauss.tex similarity index 100% rename from src/musredit_qt5/latex_images/simpleGauss.tex rename to src/musredit_qt5/musredit/latex_images/simpleGauss.tex diff --git a/src/musredit_qt5/latex_images/statExpKT.png b/src/musredit_qt5/musredit/latex_images/statExpKT.png similarity index 100% rename from src/musredit_qt5/latex_images/statExpKT.png rename to src/musredit_qt5/musredit/latex_images/statExpKT.png diff --git a/src/musredit_qt5/latex_images/statExpKT.tex b/src/musredit_qt5/musredit/latex_images/statExpKT.tex similarity index 100% rename from src/musredit_qt5/latex_images/statExpKT.tex rename to src/musredit_qt5/musredit/latex_images/statExpKT.tex diff --git a/src/musredit_qt5/latex_images/statGssKT.png b/src/musredit_qt5/musredit/latex_images/statGssKT.png similarity index 100% rename from src/musredit_qt5/latex_images/statGssKT.png rename to src/musredit_qt5/musredit/latex_images/statGssKT.png diff --git a/src/musredit_qt5/latex_images/statGssKT.tex b/src/musredit_qt5/musredit/latex_images/statGssKT.tex similarity index 100% rename from src/musredit_qt5/latex_images/statGssKT.tex rename to src/musredit_qt5/musredit/latex_images/statGssKT.tex diff --git a/src/musredit_qt5/latex_images/textogif b/src/musredit_qt5/musredit/latex_images/textogif similarity index 100% rename from src/musredit_qt5/latex_images/textogif rename to src/musredit_qt5/musredit/latex_images/textogif diff --git a/src/musredit_qt5/latex_images/tfCos.png b/src/musredit_qt5/musredit/latex_images/tfCos.png similarity index 100% rename from src/musredit_qt5/latex_images/tfCos.png rename to src/musredit_qt5/musredit/latex_images/tfCos.png diff --git a/src/musredit_qt5/latex_images/tfCos.tex b/src/musredit_qt5/musredit/latex_images/tfCos.tex similarity index 100% rename from src/musredit_qt5/latex_images/tfCos.tex rename to src/musredit_qt5/musredit/latex_images/tfCos.tex diff --git a/src/musredit_qt5/main.cpp b/src/musredit_qt5/musredit/main.cpp similarity index 96% rename from src/musredit_qt5/main.cpp rename to src/musredit_qt5/musredit/main.cpp index 8948dca1..950b6682 100644 --- a/src/musredit_qt5/main.cpp +++ b/src/musredit_qt5/musredit/main.cpp @@ -53,7 +53,7 @@ int main( int argc, char ** argv ) cout << endl << endl; return 0; } else if (!strcmp(argv[1], "--version") || !strcmp(argv[1], "-v")) { - cout << endl << "musredit git-rev: " << GIT_REVISION; + cout << endl << "musredit git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1; cout << endl << endl; return 0; } diff --git a/src/musredit_qt5/musredit.cfg b/src/musredit_qt5/musredit/musredit.cfg similarity index 100% rename from src/musredit_qt5/musredit.cfg rename to src/musredit_qt5/musredit/musredit.cfg diff --git a/src/musredit_qt5/musredit.dox b/src/musredit_qt5/musredit/musredit.dox similarity index 100% rename from src/musredit_qt5/musredit.dox rename to src/musredit_qt5/musredit/musredit.dox diff --git a/src/musredit_qt5/musredit.h b/src/musredit_qt5/musredit/musredit.h similarity index 100% rename from src/musredit_qt5/musredit.h rename to src/musredit_qt5/musredit/musredit.h diff --git a/src/musredit_qt5/musredit/musredit.pro b/src/musredit_qt5/musredit/musredit.pro new file mode 100644 index 00000000..8c6be817 --- /dev/null +++ b/src/musredit_qt5/musredit/musredit.pro @@ -0,0 +1,180 @@ +TEMPLATE = app +TARGET = musredit + +packagesExist(Qt5WebEngine) { + message("Qt5WebEngine found") + DEFINES += HAVE_QT_WEB_ENGINE + HAVE_QT_WEB_ENGINE = 1 +} +isEmpty( HAVE_QT_WEB_ENGINE ) { + packagesExist(QtWebKit) { + message("QtWebKit found") + HAVE_QT_WEB_ENGINE = 0 + } + # Mac calls it Qt5WebKit, hence + packagesExist(Qt5WebKit) { + message("Qt5WebKit found") + HAVE_QT_WEB_ENGINE = 0 + } +} +isEmpty(HAVE_QT_WEB_ENGINE) { + message("Neither Qt(5)WebKit nor Qt5WebEngine found. Something is wrong, please check") +} + +QMAKE_CXXFLAGS += -std=c++11 + +# install path for musredit +count( PREFIX, 1 ) { + MUSREDIT_INSTALL_PATH = $${PREFIX}/bin +} +isEmpty( MUSREDIT_INSTALL_PATH ) { + MUSR_FIT_PATH = $$(MUSRFITPATH) + count( MUSR_FIT_PATH, 1 ) { + MUSREDIT_INSTALL_PATH = $$(MUSRFITPATH) + } +} +isEmpty( MUSREDIT_INSTALL_PATH ) { + ROOT_SYS_PATH = $$(ROOTSYS) + count( ROOT_SYS_PATH, 1 ) { + MUSREDIT_INSTALL_PATH = $$(ROOTSYS)/bin + } +} +isEmpty( MUSREDIT_INSTALL_PATH ) { + MUSREDIT_INSTALL_PATH = /usr/local/bin +} + +unix { + message( "Determined installation path: $${MUSREDIT_INSTALL_PATH}" ) +} + +unix:target.path = $${MUSREDIT_INSTALL_PATH} +macx:target.path = /Applications +win32:target.path = c:/musrfit/bin + +INSTALLS += target + +# This is only needed for SL5.1 +exists ( /opt/fontconfig-2.8.0/lib/libfontconfig.so ) { + unix:LIBS += -L/opt/fontconfig-2.8.0/lib/ -lfontconfig +} + +exists( /usr/bin/cygwin1.dll ) { + QMAKE_CXXFLAGS += -D_WIN32GCC + QMAKE_LFLAGS_APP = -Wl,--enable-auto-import +} + +isEmpty( CC ) { + CC = gcc +} + +isEmpty( CXX ) { + CXX = g++ +} + +QMAKE_CC = $${CC} +QMAKE_CXX = $${CXX} +QMAKE_LINK = $${CXX} + +# set proper permission for Mac OSX +macx { + QMAKE_INSTALL_FILE = install -m 6755 -p -o $$(USER) -g staff +} + +# install path for the XML configuration file +unix:xml.path = $$(HOME)/.musrfit/musredit +macx:xml.path = $$(HOME)/.musrfit/musredit +win32:xml.path = c:/musrfit/bin + +CONFIG += qt \ + warn_on \ + release + +QT += widgets +QT += xml +isEqual(HAVE_QT_WEB_ENGINE, 0) { + QT += webkitwidgets +} +isEqual(HAVE_QT_WEB_ENGINE, 1) { + QT += webenginewidgets +} +QT += network +QT += printsupport +QT += svg + +INCLUDEPATH += "../" +INCLUDEPATH += "../../include" + +HEADERS = musredit.h \ + ../musrfit-info.h \ + PHelp.h \ + PTextEdit.h \ + PSubTextEdit.h \ + PAdmin.h \ + PFindDialog.h \ + PReplaceDialog.h \ + PReplaceConfirmationDialog.h \ + PFitOutputHandler.h \ + PDumpOutputHandler.h \ + PPrefsDialog.h \ + PGetMusrFTOptionsDialog.h \ + PGetTitleBlockDialog.h \ + PGetParameterBlockDialog.h \ + PGetTheoryBlockDialog.h \ + PGetFunctionsBlockDialog.h \ + PGetAsymmetryRunBlockDialog.h \ + PGetSingleHistoRunBlockDialog.h \ + PGetNonMusrRunBlockDialog.h \ + PGetFourierBlockDialog.h \ + PGetPlotBlockDialog.h \ + PMsr2DataDialog.h \ + PChangeDefaultPathsDialog.h \ + PMusrEditAbout.h \ + ../../include/git-revision.h + +SOURCES = PHelp.cpp \ + PTextEdit.cpp \ + PSubTextEdit.cpp \ + PAdmin.cpp \ + PFindDialog.cpp \ + PReplaceDialog.cpp \ + PReplaceConfirmationDialog.cpp \ + PFitOutputHandler.cpp \ + PDumpOutputHandler.cpp \ + PPrefsDialog.cpp \ + PGetMusrFTOptionsDialog.cpp \ + PGetTitleBlockDialog.cpp \ + PGetParameterBlockDialog.cpp \ + PGetTheoryBlockDialog.cpp \ + PGetFunctionsBlockDialog.cpp \ + PGetAsymmetryRunBlockDialog.cpp \ + PGetSingleHistoRunBlockDialog.cpp \ + PGetNonMusrRunBlockDialog.cpp \ + PGetFourierBlockDialog.cpp \ + PGetPlotBlockDialog.cpp \ + PMsr2DataDialog.cpp \ + PChangeDefaultPathsDialog.cpp \ + PMusrEditAbout.cpp \ + main.cpp + +FORMS = forms/PFindDialog.ui \ + forms/PReplaceDialog.ui \ + forms/PReplaceConfirmationDialog.ui \ + forms/PMusrEditAbout.ui \ + forms/PPrefsDialog.ui \ + forms/PGetMusrFTOptionsDialog.ui \ + forms/PGetTitleBlockDialog.ui \ + forms/PGetParameterBlockDialog.ui \ + forms/PGetTheoryBlockDialog.ui \ + forms/PGetFunctionsBlockDialog.ui \ + forms/PGetAsymmetryRunBlockDialog.ui \ + forms/PGetSingleHistoRunBlockDialog.ui \ + forms/PGetNonMusrRunBlockDialog.ui \ + forms/PGetFourierBlockDialog.ui \ + forms/PGetPlotBlockDialog.ui \ + forms/PMsr2DataDialog.ui \ + forms/PChangeDefaultPathsDialog.ui + +RESOURCES = musredit.qrc + +macx:ICON = icons/musredit.icns + diff --git a/src/musredit_qt5/musredit.qrc b/src/musredit_qt5/musredit/musredit.qrc similarity index 55% rename from src/musredit_qt5/musredit.qrc rename to src/musredit_qt5/musredit/musredit.qrc index 68883051..fb3adb66 100644 --- a/src/musredit_qt5/musredit.qrc +++ b/src/musredit_qt5/musredit/musredit.qrc @@ -1,29 +1,55 @@ icons/edit-copy-plain.svg + icons/edit-copy-dark.svg icons/edit-cut-plain.svg + icons/edit-cut-dark.svg icons/edit-find-plain.svg + icons/edit-find-dark.svg icons/go-next-use-plain.svg + icons/go-next-use-dark.svg icons/edit-paste-plain.svg + icons/edit-paste-dark.svg icons/go-previous-use-plain.svg + icons/go-previous-use-dark.svg icons/edit-redo-plain.svg + icons/edit-redo-dark.svg icons/edit-undo-plain.svg + icons/edit-undo-dark.svg icons/document-new-plain.svg + icons/document-new-dark.svg icons/document-open-plain.svg + icons/document-open-dark.svg icons/document-print-plain.svg + icons/document-print-dark.svg icons/view-refresh-plain.svg + icons/view-refresh-dark.svg icons/document-save-plain.svg - icons/musrAsym-plain.svg + icons/document-save-dark.svg + icons/musrWiz-32x32.svg + icons/musrWiz-32x32-dark.svg icons/musrchisq-plain.svg + icons/musrchisq-dark.svg icons/musrfit-plain.svg + icons/musrfit-dark.svg + icons/musrfit-help-plain.svg + icons/musrfit-help-dark.svg icons/msr2data-plain.svg + icons/msr2data-dark.svg icons/musrprefs-plain.svg - icons/musrSingleHisto-plain.svg + icons/musrprefs-dark.svg icons/musrswap-plain.svg + icons/musrswap-dark.svg + icons/musrStep-32x32.svg + icons/musrStep-32x32-dark.svg icons/musrt0-plain.svg + icons/musrt0-dark.svg icons/musrview-plain.svg + icons/musrview-dark.svg icons/musrFT-plain.svg + icons/musrFT-dark.svg icons/musrdump-plain.svg + icons/musrdump-dark.svg latex_images/abragam.png latex_images/asymmetry.png latex_images/bessel.png @@ -37,5 +63,6 @@ latex_images/statExpKT.png latex_images/statGssKT.png latex_images/tfCos.png + musredit_startup.xml.in diff --git a/src/musredit/musredit_startup.xml.in b/src/musredit_qt5/musredit/musredit_startup.xml.in similarity index 98% rename from src/musredit/musredit_startup.xml.in rename to src/musredit_qt5/musredit/musredit_startup.xml.in index 49a0d256..98bb0d84 100644 --- a/src/musredit/musredit_startup.xml.in +++ b/src/musredit_qt5/musredit/musredit_startup.xml.in @@ -19,7 +19,7 @@ y - /home/nemu/analysis/musrfit/doc/examples/test-histo-PSI-BIN.msr + @DOCDIR@/examples/test-histo-PSI-BIN.msr file://@DOCDIR@/html/user/MUSR/MusrFit.html @@ -36,7 +36,7 @@ file://@DOCDIR@/html/user/MUSR/MusrFit.html#A_2.3_musrFT - Courier New + Monospace 12 diff --git a/src/musrfit.cpp b/src/musrfit.cpp index ec89dc06..f03c6952 100644 --- a/src/musrfit.cpp +++ b/src/musrfit.cpp @@ -90,7 +90,7 @@ void* musrfit_timeout(void *args) void musrfit_syntax() { cout << endl << "usage: musrfit [ [-k, --keep-mn2-ouput] [-c, --chisq-only] [-t, --title-from-data-file]"; - cout << endl << " [-e, --estimateN0 ] [-p, --per-run-block-chisq ]"; + cout << endl << " [-e, --estimateN0] [-p, --per-run-block-chisq]"; cout << endl << " [--dump ] [--timeout ] | --version | --help"; cout << endl << " : msr input file"; cout << endl << " 'musrfit ' will execute musrfit"; @@ -540,9 +540,9 @@ int main(int argc, char *argv[]) if (argc == 2) { if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - cout << endl << "musrfit version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; + cout << endl << "musrfit version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl; #else - cout << endl << "musrfit git-rev: " << GIT_REVISION << endl << endl; + cout << endl << "musrfit git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl; #endif return PMUSR_SUCCESS; } diff --git a/src/musrt0.cpp b/src/musrt0.cpp index 197e60b7..e354ba97 100644 --- a/src/musrt0.cpp +++ b/src/musrt0.cpp @@ -232,9 +232,9 @@ Int_t main(Int_t argc, Char_t *argv[]) for (int i=1; i> musrt0 version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; + cout << endl << "musrt0 version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl; #else - cout << endl << ">> musrt0 git-rev: " << GIT_REVISION << endl << endl; + cout << endl << "musrt0 git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl; #endif return PMUSR_SUCCESS; } else if (!strcmp(argv[i], "--help")) { diff --git a/src/musrview.cpp b/src/musrview.cpp index 55e49690..00a76754 100644 --- a/src/musrview.cpp +++ b/src/musrview.cpp @@ -127,9 +127,9 @@ int main(int argc, char *argv[]) } } else if (!strcmp(argv[i], "--version")) { #ifdef HAVE_CONFIG_H - cout << endl << "musrview version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; + cout << endl << "musrview version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl; #else - cout << endl << "musrview git-rev: " << GIT_REVISION << endl << endl; + cout << endl << "musrview git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl; #endif return PMUSR_SUCCESS; } else if (!strcmp(argv[i], "--help")) { diff --git a/src/tests/MuTransition/Makefile.PSimulateMuTransition b/src/tests/MuTransition/Makefile.PSimulateMuTransition index d275bdc5..93d1a9ae 100644 --- a/src/tests/MuTransition/Makefile.PSimulateMuTransition +++ b/src/tests/MuTransition/Makefile.PSimulateMuTransition @@ -52,6 +52,9 @@ LDFLAGS = -g SOFLAGS = -dynamic endif +# installation directory +INSTALL_DIR = /usr/local + # the output from the root-config script: CXXFLAGS += $(ROOTCFLAGS) LDFLAGS += @@ -95,8 +98,8 @@ PSimulateMuTransitionDict.cpp: PSimulateMuTransition.h PSimulateMuTransitionLink install: all @echo "Installing shared lib: libPSimulateMuTransition.so" ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv PSimulateMuTransition.h $(ROOTSYS)/include + cp -pv $(SHLIB) $(INSTALL_DIR)/lib + cp -pv PSimulateMuTransition.h $(INSTALL_DIR)/include # for root6 - cp -pv PSimulateMuTransitionDict_rdict.pcm $(ROOTSYS)/lib + cp -pv PSimulateMuTransitionDict_rdict.pcm $(INSTALL_DIR)/lib endif diff --git a/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h b/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h index 25fc0db3..d806ffcf 100644 --- a/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h +++ b/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h @@ -28,7 +28,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifdef __CLING__ +// changed for root6 +#ifdef __CINT__ #pragma link off all globals; #pragma link off all classes; diff --git a/src/tests/MuTransition/runMuSimulation.C b/src/tests/MuTransition/runMuSimulation.C index 80e0e589..bb2b3606 100644 --- a/src/tests/MuTransition/runMuSimulation.C +++ b/src/tests/MuTransition/runMuSimulation.C @@ -27,20 +27,28 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +// +// either do +// root> .L runMuSimulation.C +// root> runMuSimulation() +// +// or +// root> .x runMuSimulation.C +// + +#include "TMusrRunHeader.h" +#include "PSimulateMuTransition.h" -#include "/apps/cern/root-git/include/TMusrRunHeader.h" #define NDECAYHISTS 2 + void runMuSimulation() { - // load library - gSystem->Load("$ROOTSYS/lib/libPSimulateMuTransition"); +// load libraries during root startup, defined in rootlogon.C - // load TMusrRunHeader class if not already done during root startup - if (!TClass::GetDict("TMusrRunHeader")) { - gROOT->LoadMacro("$(ROOTSYS)/lib/libTMusrRunHeader.so"); - } - +// gSystem->Load("$ROOTSYS/lib/libPSimulateMuTransition"); +// gSystem->Load("$ROOTSYS/lib/libTMusrRunHeader.so"); + char titleStr[256]; TFolder *histosFolder; TFolder *decayAnaModule, *scAnaModule; @@ -57,7 +65,7 @@ void runMuSimulation() Double_t spinFlipRate = 0.01; //if spinFlipRate > 0.001 only spin-flip processes will be simulated Double_t capRate = 0.0001;//*sqrt(T/200.); //assume that capture rate varies as sqrt(T), capRate = sigma*v*p , v ~ sqrt(T) Double_t ionRate; //assume Arrhenius behaviour ionRate = preFac*exp(-EA/kT) - ionRate = 0.0001; //2.9e7 * exp(-EA/(0.08625*T)); // Ge: 2.9*10^7MHz "attempt" frequency; 1K = 0.08625 meV + ionRate = 0.1; //2.9e7 * exp(-EA/(0.08625*T)); // Ge: 2.9*10^7MHz "attempt" frequency; 1K = 0.08625 meV Double_t B = 106.5; //field in G Double_t Bvar = 0.; //field variance Double_t Freq12 = 40.433; //Mu freq of the 12 transition @@ -222,7 +230,10 @@ void runMuSimulation() gRunHeader->Write(); fout->Close(); cout << "Histograms written to " << histogramFileName.Data() << endl; - delete fout; - delete [] histo; +// delete fout; +// delete header; +// delete histo[0]; +// delete histo[1]; +// delete gRunHeader; } diff --git a/src/tests/analyticFakeData/Makefile.PAddPoissonNoise b/src/tests/analyticFakeData/Makefile.PAddPoissonNoise index 5ce9caeb..3744fdd4 100644 --- a/src/tests/analyticFakeData/Makefile.PAddPoissonNoise +++ b/src/tests/analyticFakeData/Makefile.PAddPoissonNoise @@ -94,6 +94,13 @@ PAddPoissonNoiseDict.cpp: PAddPoissonNoise.h PAddPoissonNoiseLinkDef.h install: all @echo "Installing shared lib: libPAddPoissonNoise.so ( you must be root ;-) )" ifeq ($(OS),LINUX) +ifeq ($(ROOTSYS),/usr) + cp -pv $(SHLIB) $(ROOTSYS)/lib64/root + cp -pv PAddPoissonNoiseDict_rdict.pcm $(ROOTSYS)/lib64/root + cp -pv PAddPoissonNoise.h $(ROOTSYS)/include/root +else cp -pv $(SHLIB) $(ROOTSYS)/lib + cp -pv PAddPoissonNoiseDict_rdict.pcm $(ROOTSYS)/lib cp -pv PAddPoissonNoise.h $(ROOTSYS)/include endif +endif diff --git a/src/tests/analyticFakeData/analyticFakeData.C b/src/tests/analyticFakeData/analyticFakeData.C index 65a954da..2e641b1e 100644 --- a/src/tests/analyticFakeData/analyticFakeData.C +++ b/src/tests/analyticFakeData/analyticFakeData.C @@ -31,12 +31,18 @@ #include using namespace std; +#include "/usr/local/include/TLemRunHeader.h" +#include "/usr/local/include/TMusrRunHeader.h" +#include "/usr/include/root/PAddPoissonNoise.h" + void analyticFakeData(const TString type, UInt_t runNo) { // load library - gSystem->Load("$ROOTSYS/lib/libTLemRunHeader"); - gSystem->Load("$ROOTSYS/lib/libTMusrRunHeader"); - gSystem->Load("$ROOTSYS/lib/libPAddPoissonNoise"); +/* + cout << ">> loading libTLemRunHeader: " << gSystem->Load("/usr/local/lib/libTLemRunHeader") << endl; + cout << ">> loading libTMusrRunHeader: " << gSystem->Load("/usr/local/lib/libTMusrRunHeader") << endl; + cout << ">> loading libPAddPoissonNoise: " << gSystem->Load("$ROOTSYS/lib64/root/libPAddPoissonNoise") << endl; +*/ // generate data TFolder *histosFolder; @@ -44,7 +50,7 @@ void analyticFakeData(const TString type, UInt_t runNo) TFolder *runHeader; TFolder *runInfo; UInt_t offset = 0; - const UInt_t noOfHistos = 4; + const UInt_t noOfHistos = 16; const UInt_t noOfChannels = 426600; const Double_t timeResolution = 0.025; // ns TRandom3 rand; @@ -63,95 +69,101 @@ void analyticFakeData(const TString type, UInt_t runNo) t0.push_back(5000.0); cout << ">> define header" << endl; + TLemRunHeader *headerOld; + TMusrRunHeader *headerNew; + TMusrRunPhysicalQuantity prop; if (!type.CompareTo("TLemRunHeader")) { // feed run info header runInfo = gROOT->GetRootFolder()->AddFolder("RunInfo", "LEM RunInfo"); gROOT->GetListOfBrowsables()->Add(runInfo, "RunInfo"); - TLemRunHeader *header = new TLemRunHeader(); + headerOld = new TLemRunHeader(); tstr.Form("0%d - test", runNo); - header->SetRunTitle(tstr); - header->SetLemSetup("trivial"); - header->SetRunNumber(runNo); - header->SetStartTime(0); - header->SetStopTime(1); - header->SetModeratorHV(32.0, 0.01); - header->SetSampleHV(0.0, 0.01); - header->SetImpEnergy(31.8); - header->SetSampleTemperature(0.2, 0.001); - header->SetSampleBField(-1.0, 0.1); - header->SetTimeResolution(timeResolution); - header->SetNChannels(noOfChannels); - header->SetNHist(8); - header->SetCuts("none"); - header->SetModerator("none"); - header->SetTimeZero(t0); - runInfo->Add(header); //add header to RunInfo folder + headerOld->SetRunTitle(tstr); + headerOld->SetLemSetup("trivial"); + headerOld->SetRunNumber(runNo); + headerOld->SetStartTime(0); + headerOld->SetStopTime(1); + headerOld->SetModeratorHV(32.0, 0.01); + headerOld->SetSampleHV(0.0, 0.01); + headerOld->SetImpEnergy(31.8); + headerOld->SetSampleTemperature(0.2, 0.001); + headerOld->SetSampleBField(-1.0, 0.1); + headerOld->SetTimeResolution(timeResolution); + headerOld->SetNChannels(noOfChannels); + headerOld->SetNHist(8); + headerOld->SetCuts("none"); + headerOld->SetModerator("none"); + Double_t *tt0 = new Double_t[noOfHistos]; + for (Int_t i=0; iSetTimeZero(tt0); + delete [] tt0; + runInfo->Add(headerOld); //add header to RunInfo folder } else { // TMusrRunHeader runHeader = gROOT->GetRootFolder()->AddFolder("RunHeader", "MusrRoot RunHeader"); gROOT->GetListOfBrowsables()->Add(runHeader, "RunHeader"); - TMusrRunHeader *header = new TMusrRunHeader(true); - TMusrRunPhysicalQuantity prop; + headerNew = new TMusrRunHeader(true); // 1st write all the required RunInfo entries - header->Set("RunInfo/Generic Validator URL", "http://lmu.web.psi.ch/facilities/software/MusrRoot/validation/MusrRoot.xsd"); - header->Set("RunInfo/Specific Validator URL", "http://lmu.web.psi.ch/facilities/software/MusrRoot/validation/MusrRootHAL9500.xsd"); - header->Set("RunInfo/Generator", "analyticFakeData"); - header->Set("RunInfo/File Name", fileName); + headerNew->Set("RunInfo/Generic Validator URL", "http://lmu.web.psi.ch/facilities/software/MusrRoot/validation/MusrRoot.xsd"); + headerNew->Set("RunInfo/Specific Validator URL", "http://lmu.web.psi.ch/facilities/software/MusrRoot/validation/MusrRootHAL9500.xsd"); + headerNew->Set("RunInfo/Generator", "analyticFakeData"); + headerNew->Set("RunInfo/File Name", fileName); tstr.Form("0%d - test", runNo); - header->Set("RunInfo/Run Title", tstr); - header->Set("RunInfo/Run Number", (Int_t)runNo); - header->Set("RunInfo/Start Time", "1970-01-01 00:00:00"); - header->Set("RunInfo/Stop Time", "1970-01-01 00:00:02"); + headerNew->Set("RunInfo/Run Title", tstr); + headerNew->Set("RunInfo/Run Number", (Int_t)runNo); + headerNew->Set("RunInfo/Start Time", "1970-01-01 00:00:00"); + headerNew->Set("RunInfo/Stop Time", "1970-01-01 00:00:02"); prop.Set("Run Duration", 2, "sec"); - header->Set("RunInfo/Run Duration", prop); - header->Set("RunInfo/Laboratory", "PSI"); - header->Set("RunInfo/Instrument", "virtual"); + headerNew->Set("RunInfo/Run Duration", prop); + headerNew->Set("RunInfo/Laboratory", "PSI"); + headerNew->Set("RunInfo/Instrument", "virtual"); prop.Set("Muon Beam Momentum", 28.1, "MeV/c"); - header->Set("RunInfo/Muon Beam Momentum", prop); - header->Set("RunInfo/Muon Species", "positive muon"); - header->Set("RunInfo/Muon Source", "computer"); - header->Set("RunInfo/Setup", "virtual"); - header->Set("RunInfo/Comment", "fake data runs"); - header->Set("RunInfo/Sample Name", "virtual"); + headerNew->Set("RunInfo/Muon Beam Momentum", prop); + headerNew->Set("RunInfo/Muon Species", "positive muon"); + headerNew->Set("RunInfo/Muon Source", "computer"); + headerNew->Set("RunInfo/Setup", "virtual"); + headerNew->Set("RunInfo/Comment", "fake data runs"); + headerNew->Set("RunInfo/Sample Name", "virtual"); prop.Set("Sample Temperature", 1.0, "mK"); - header->Set("RunInfo/Sample Temperature", prop); + headerNew->Set("RunInfo/Sample Temperature", prop); prop.Set("Sample Magnetic Field", 40.0, "T"); - header->Set("RunInfo/Sample Magnetic Field", prop); + headerNew->Set("RunInfo/Sample Magnetic Field", prop); prop.Set("Sample Temperature", 1.0, "mK"); - header->Set("RunInfo/No of Histos", (Int_t)noOfHistos); + headerNew->Set("RunInfo/No of Histos", (Int_t)noOfHistos); prop.Set("Time Resolution", timeResolution, "ns"); - header->Set("RunInfo/Time Resolution", prop); + headerNew->Set("RunInfo/Time Resolution", prop); vector ivec; ivec.push_back(0); - header->Set("RunInfo/RedGreen Offsets", ivec); + headerNew->Set("RunInfo/RedGreen Offsets", ivec); offset = 1; // 2nd write all the required DetectorInfo entries - for (UInt_t i=0; i<4; i++) { + for (UInt_t i=0; iSet(label, tstr1); + headerNew->Set(label, tstr1); label = tstr + TString("Histo No"); - header->Set(label, (Int_t)(i+offset)); + headerNew->Set(label, (Int_t)(i+offset)); label = tstr + TString("Histo Length"); - header->Set(label, (Int_t)noOfChannels); + headerNew->Set(label, (Int_t)noOfChannels); label = tstr + TString("Time Zero Bin"); - header->Set(label, t0[i]); + headerNew->Set(label, t0[i]); label = tstr + TString("First Good Bin"); - header->Set(label, (Int_t)t0[i]); + headerNew->Set(label, (Int_t)t0[i]); label = tstr + TString("Last Good Bin"); - header->Set(label, (Int_t)noOfChannels); + headerNew->Set(label, (Int_t)noOfChannels); } // 3rd write required SampleEnvironmentInfo entries - header->Set("SampleEnvironmentInfo/Cryo", "virtual"); + headerNew->Set("SampleEnvironmentInfo/Cryo", "virtual"); // 4th write required MagneticFieldEnvironmentInfo entries - header->Set("MagneticFieldEnvironmentInfo/Magnet Name", "virtual"); + headerNew->Set("MagneticFieldEnvironmentInfo/Magnet Name", "virtual"); // 5th write required BeamlineInfo entries - header->Set("BeamlineInfo/Name", "piE3"); + headerNew->Set("BeamlineInfo/Name", "piE3"); } // create histos @@ -176,52 +188,56 @@ void analyticFakeData(const TString type, UInt_t runNo) cout << ">> define phase" << endl; vector phase; for (UInt_t i=0; i> write fake header for TMusrRoot" << endl; if (type.CompareTo("TLemRunHeader")) { TDoubleVector dvec; - header->Set("FakeFct/Def", "N0 exp(-t/tau_mu) [1 + sum_{k=0}^2 frac_k A_0 exp(-1/2 (t sigma_k)^2) cos(gamma_mu B_k t + phi)] + bkg"); +// headerNew->Set("FakeFct/Def", "N0 exp(-t/tau_mu) [1 + sum_{k=0}^2 frac_k A_0 exp(-1/2 (t sigma_k)^2) cos(gamma_mu B_k t + phi)] + bkg"); + headerNew->Set("FakeFct/Def", "N0 exp(-t/tau_mu) [1 + A_0 exp(-1/2 (t sigma0)^2) cos(gamma_mu B0 t + phi)] + bkg"); for (UInt_t i=0; iSet("FakeFct/N0", dvec); + headerNew->Set("FakeFct/N0", dvec); dvec.clear(); for (UInt_t i=0; iSet("FakeFct/bkg", dvec); + headerNew->Set("FakeFct/bkg", dvec); dvec.clear(); for (UInt_t i=0; iSet("FakeFct/A", dvec); + headerNew->Set("FakeFct/A", dvec); dvec.clear(); for (UInt_t i=0; iSet("FakeFct/phase", dvec); + headerNew->Set("FakeFct/phase", dvec); prop.Set("B0", bb0, "G"); - header->Set("FakeFct/B0", prop); + headerNew->Set("FakeFct/B0", prop); prop.Set("rate0", 1.0e3*rate0, "1/usec"); - header->Set("FakeFct/rate0", prop); - header->Set("FakeFct/frac0", frac0); + headerNew->Set("FakeFct/rate0", prop); +/* + headerNew->Set("FakeFct/frac0", frac0); prop.Set("B1", bb1, "G"); - header->Set("FakeFct/B1", prop); + headerNew->Set("FakeFct/B1", prop); prop.Set("rate1", 1.0e3*rate1, "1/usec"); - header->Set("FakeFct/rate1", prop); - header->Set("FakeFct/frac1", frac1); + headerNew->Set("FakeFct/rate1", prop); + headerNew->Set("FakeFct/frac1", frac1); prop.Set("B2", bb2, "G"); - header->Set("FakeFct/B2", prop); + headerNew->Set("FakeFct/B2", prop); prop.Set("rate2", 1.0e3*rate2, "1/usec"); - header->Set("FakeFct/rate2", prop); + headerNew->Set("FakeFct/rate2", prop); +*/ } cout << ">> create histo objects" << endl; @@ -244,10 +260,14 @@ void analyticFakeData(const TString type, UInt_t runNo) histo[i]->SetBinContent(j+1, bkg[i]); } else { time = (Double_t)(j-t0[i])*timeResolution; +/* dval = (Double_t)n0[i]*TMath::Exp(-time/tau)*(1.0+ frac0*a0[i]*TMath::Exp(-0.5*TMath::Power(time*rate0,2))*TMath::Cos(TMath::TwoPi()*gamma*bb0*time+phase[i]) + frac1*a0[i]*TMath::Exp(-0.5*TMath::Power(time*rate1,2))*TMath::Cos(TMath::TwoPi()*gamma*bb1*time+phase[i]) + (1.0-frac0-frac1)*a0[i]*TMath::Exp(-0.5*TMath::Power(time*rate2,2))*TMath::Cos(TMath::TwoPi()*gamma*bb2*time+phase[i]))+(Double_t)bkg[i]; +*/ + dval = (Double_t)n0[i]*TMath::Exp(-time/tau)*(1.0+ + TMath::Exp(-0.5*TMath::Power(time*rate0,2))*TMath::Cos(TMath::TwoPi()*gamma*bb0*time+phase[i]))+(Double_t)bkg[i]; histo[i]->SetBinContent(j+1, dval); } } @@ -298,7 +318,7 @@ void analyticFakeData(const TString type, UInt_t runNo) if (!type.CompareTo("TLemRunHeader")) { runInfo->Write(); } else { - if (header->FillFolder(runHeader)) + if (headerNew->FillFolder(runHeader)) runHeader->Write(); } diff --git a/src/write_musrRoot_runHeader.cpp b/src/write_musrRoot_runHeader.cpp index b5c5380d..363cddf0 100644 --- a/src/write_musrRoot_runHeader.cpp +++ b/src/write_musrRoot_runHeader.cpp @@ -62,9 +62,9 @@ int main(int argc, char *argv[]) if (!strcmp(argv[1], "--version")) { #ifdef HAVE_CONFIG_H - cout << endl << "write_musrRoot_runHeader version: " << PACKAGE_VERSION << ", git-rev: " << GIT_REVISION << endl << endl; + cout << endl << "write_musrRoot_runHeader version: " << PACKAGE_VERSION << ", git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl; #else - cout << endl << "write_musrRoot_runHeader git-rev: " << GIT_REVISION << endl << endl; + cout << endl << "write_musrRoot_runHeader git-branch: " << GIT_BRANCH << ", git-rev: " << GIT_CURRENT_SHA1 << endl << endl; #endif return 0; }