2027 Commits

Author SHA1 Message Date
904471b664 Resolve conflicts manually. 2019-04-25 17:27:03 +02:00
9b2a01db2d modernized code to C++11 and newer -- cleanup. 2019-04-24 17:53:18 +02:00
c64c74dbf8 modernized code to C++11 and newer.
This allows to analyze the code by external code analyzers. Since a lot is adopted,
the version is changed to 1.4.3

Conflicts:
	src/classes/PFitter.cpp
	src/classes/PFourier.cpp
	src/classes/PMsrHandler.cpp
	src/classes/PMusrCanvas.cpp
	src/classes/PRunAsymmetry.cpp
	src/classes/PRunAsymmetryRRF.cpp
	src/classes/PRunListCollection.cpp
	src/classes/PRunSingleHisto.cpp
	src/classes/PRunSingleHistoRRF.cpp
	src/classes/PStartupHandler.cpp
	src/include/PFourier.h
	src/include/PRunListCollection.h
	src/musrFT.cpp
2019-04-24 17:44:58 +02:00
795cd75b1e modernized code to C++11 and newer.
This allows to analyze the code by external code analyzers. Since a lot is adopted,
the version is changed to 1.4.3
2019-04-16 15:34:49 +02:00
1c5069bc48 fix of wrong offset in time domain data before Fourier. 2019-04-11 16:46:13 +02:00
Zaher Salman
cf2e127aae Merged master into beta-NMR 2019-04-05 08:15:03 +00:00
6c88bce19c Removed automake file to resolve conflict 2019-04-05 10:14:16 +02:00
Zaher Salman
8247b19b84 Merged muonspin/musrfit:root6 into master 2019-04-05 09:00:38 +02:00
ac1d52a054 removed outdated 'register' from code. 2019-04-04 16:06:59 +02:00
e6d424e900 removed outdated 'register' from code. 2019-04-04 15:52:21 +02:00
Zaher Salman
aa6579af41 Merged muonspin/musrfit:root6 into master 2019-04-03 08:46:24 +02:00
5ab041a4f2 improve msr2data handling
It is now checked if a msr-file is already open so that the corresponding
tab is reloaded after msr2data is carried out with a file open request.
2019-04-01 10:42:27 +02:00
36cc3444a2 improve msr2data handling
It is now checked if a msr-file is already open so that the corresponding
tab is reloaded after msr2data is carried out with a file open request.
2019-04-01 10:32:24 +02:00
5bb47dc9fb Fix crash when trying to close empty tab 2019-04-01 09:09:45 +02:00
15692b89e7 Fix crash when trying to close empty tab 2019-04-01 09:03:29 +02:00
Zaher Salman
fa446460af Merged muonspin/musrfit:root6 into master 2019-03-13 10:55:52 +01:00
0ff385de11 added missing include directory. 2019-03-08 16:29:39 +01:00
9cd35d1373 added missing include directory. 2019-03-08 16:24:45 +01:00
8dd8d29adc Remove automake support
Since the cmake tool chain is now stable, the automake tool chain is removed from musrfit.
This makes documentation and code less cluttered.

Conflicts:
	configure.ac
	src/Makefile.am
	src/classes/Makefile.am
	src/external/MuSR_software/Makefile.am
2019-03-08 13:53:36 +01:00
dbfeeddf3f Remove automake support
Since the cmake tool chain is now stable, the automake tool chain is removed from musrfit.
This makes documentation and code less cluttered.
2019-03-08 12:50:41 +01:00
Zaher Salman
dcfa461537 Merged master into beta-NMR 2019-02-19 08:43:38 +01:00
Zaher Salman
414165bc90 Merged muonspin/musrfit:root6 into master 2019-02-19 08:42:19 +01:00
352ce48899 find theme in case default channel fail. This is ugly and eventually needs a better solution. 2019-02-14 09:41:14 +01:00
64f73ffb11 find theme in case default channel fail. This is ugly and eventually needs a better solution. 2019-02-14 09:35:32 +01:00
f6ee484baf Dynamic Search Path for ROOT Dictionary
Added by default the dynamic search path '/usr/local/lib' to ROOT.
This is needed to find the necessary dictionaries for musrfit,
musrview, musrt0. Furthermore, added an option '--show-dynamic-path'
to these programs which allow the user to dump the currently used
dynamic search paths. This is potentially handy for diagnostics.
2019-02-05 10:08:15 +01:00
97beb80c4b Dynamic Search Path for ROOT Dictionary
Added by default the dynamic search path '/usr/local/lib' to ROOT.
This is needed to find the necessary dictionaries for musrfit,
musrview, musrt0. Furthermore, added an option '--show-dynamic-path'
to these programs which allow the user to dump the currently used
dynamic search paths. This is potentially handy for diagnostics.
2019-02-05 09:51:30 +01:00
29d35579a7 added the current source code path to root_generate_dictionary. 2019-02-04 19:43:31 +01:00
c64a8146b7 added the necessary header-, pcm-, and rootmap-files. This is needed when distrbuted as package. 2019-02-04 10:54:52 +01:00
3cb950277f cmake/cpack root dictionary issue fixed.
In order that package assembly works, the code needs to be relocatble
and any hints linking it to the original source need to be absent.
The changes here do exactely this. For rootcling the '-inlineInputHeader'
option is needed, otherwise the dictionary wants to load the header
file from the source destination which of course will fail when installing
the package on a machine without the source.
2019-02-01 16:05:24 +01:00
Zaher Salman
7307406d05 Merged master into beta-NMR 2019-01-25 13:06:05 +01:00
Zaher Salman
467a799056 Merged muonspin/musrfit:root6 into master 2019-01-22 15:22:59 +01:00
bc09ff5d8d adopted musredit.pro such that the deprecated automake get things compiled. 2019-01-22 15:01:57 +01:00
98057629e6 adopted musredit.pro such that the deprecated automake get things compiled. 2019-01-22 14:51:52 +01:00
8485914b89 make msr-file comment consistent with the docu (for ifll and ifgk). 2019-01-22 14:15:43 +01:00
94950cb755 ifgk and ifll CUDA/OpenCL-GPU accessible. 2019-01-22 14:05:09 +01:00
fc68aed573 make msr-file comment consistent with the docu (for ifll and ifgk). 2019-01-22 14:04:02 +01:00
Zaher Salman
592b0cfc42 Merged muonspin/musrfit:root6 into master 2019-01-22 09:26:02 +01:00
7ace2e7d35 Make so far undocumented functions ifgk and ifll public and at the same time properly normalize them. 2019-01-21 14:48:07 +01:00
c7e35dfdff Make so far undocumented functions ifgk and ifll public and at the same time properly normalize them. 2019-01-18 10:35:26 +01:00
Zaher Salman
d1cf374354 Merged master into beta-NMR 2018-12-18 10:01:28 +01:00
Zaher Salman
91e2eca915 Merged muonspin/musrfit:root6 into master 2018-12-18 10:00:45 +01:00
64fc455831 Add Default Search Paths via musredit preferences if previously no search paths were present
So far it was not possible to add Default Search Paths to musrfit via musredit if somebody delete all the predefined search paths. This bug is now fixed.
2018-12-17 17:38:40 +01:00
1831b8bf3e Add Default Search Paths via musredit preferences if previously no search paths were present
So far it was not possible to add Default Search Paths to musrfit via musredit if somebody delete all the predefined search paths. This bug is now fixed.
2018-12-17 17:30:58 +01:00
Zaher Salman
e0eaa3efb5 Merged muonspin/musrfit:root6 into master 2018-12-12 17:26:44 +01:00
2c65609f84 AddT0 offset bug
Up to now there has been an addT0 offset bug which resulted to the following situation.
Since the offset was wrong by '1', for the first addt0 the t0 of the file was used
instead of the one given in the msr-file. If these t0's are substantially different, the
adding of the runs was quite off, resulting in strong distortions at very early times.
Pant Amba Datt pointed towards this bug which is fixed now.
2018-12-11 14:12:48 +01:00
c6766864d9 AddT0 offset bug
Up to now there has been an addT0 offset bug which resulted to the following situation.
Since the offset was wrong by '1', for the first addt0 the t0 of the file was used
instead of the one given in the msr-file. If these t0's are substantially different, the
adding of the runs was quite off, resulting in strong distortions at very early times.
Pant Amba Datt pointed towards this bug which is fixed now.
2018-12-11 13:59:58 +01:00
Zaher Salman
8a7e96a8f7 Merged muonspin/musrfit:root6 into master 2018-11-30 08:51:19 +01:00
a5748f0359 Fourier relative phase: bug fix
The reference phase for real Fourier was accidentely counted twice.
2018-11-29 11:00:24 +01:00
7361dc6f70 Fourier relative phase: bug fix
The reference phase for real Fourier was accidentely counted twice.
2018-11-29 10:56:37 +01:00
91c33fdbd1 musredit help system if neither QWebEngine nor QWebKit is found.
If neither QWebEngine nor QWebKit is found, do not generate an build
error anymore. Instead just show a default window stating that
the help system is not available due to missing Qt web libs.
2018-11-29 08:50:12 +01:00