2056 Commits

Author SHA1 Message Date
05a62506d8 Resolving conflict. 2019-03-13 10:55:36 +01:00
ffae09354e Resolving conflict. 2019-03-13 10:54:33 +01:00
a00b93f6cd Resolving conflict. 2019-03-13 10:53:13 +01:00
95ea5b6f68 Resolving conflict. 2019-03-13 10:52:05 +01:00
d66b132a0b Resolving conflict. 2019-03-13 10:50:28 +01:00
33d0e51a05 Resolving conflict. 2019-03-13 10:46:53 +01:00
fec5017fc2 added log info for the cpack part. 2019-03-11 13:33:42 +01:00
9cd35d1373 added missing include directory. 2019-03-08 16:24:45 +01:00
86d03d7132 Docu updated
Removed the automake tool chain description (hopefully) everywhere.
2019-03-08 13:07:47 +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
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
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
d48615650e adopted for yum update which calls at the end the uninstall script. 2019-02-04 10:53:35 +01:00
a7806f7e02 added necessary CPack tag for redhat flavor. 2019-02-04 10:52:37 +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
faffd5bcd6 CPack post (un)install
add post (un)install scripts to musrfit cpack. Currently for rpm only. Furthermore a minimal required root version is added. Will need to see if this is sufficient or if more detailed work needs to be added.
2019-01-31 10:45:05 +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
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
Zaher Salman
592b0cfc42 Merged muonspin/musrfit:root6 into master 2019-01-22 09:26:02 +01:00
32220f754d Docu update
Added information about the not yet documented functions for internal fields with Gaussian/Lorentzian broadening.
2019-01-21 13:36:15 +01:00
75a2a9b3f3 update version information. 2019-01-21 13:35:13 +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
d634fd2ce6 CPack/CMake for musrfit
more tweaks towards musrfit rpm
2019-01-14 11:19:19 +01:00
87f706dfaa CPack stub to generate RPM, DEB, etc
Added the first necessary files allowing to generate all kind of packages for the future.
Currently not much testing is present.
2019-01-10 10:17:24 +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
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
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
7361dc6f70 Fourier relative phase: bug fix
The reference phase for real Fourier was accidentely counted twice.
2018-11-29 10:56:37 +01:00
2d3ec33aa1 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-28 20:14:16 +01:00
Zaher Salman
813bad88ab Merged muonspin/musrfit:root6 into master 2018-11-27 14:32:03 +01:00
c5c5b16c46 BNMR lib installation problems
Adopted the build system for the BNMR libs such that the generated files are found and can be installed. The BNMR lib mantainers (ZS, JK) are responsible for the functionality though.
2018-11-27 12:25:18 +01:00
Zaher Salman
42bb8a49b7 Merged muonspin/musrfit:root6 into master 2018-11-15 10:08:36 +01:00
a4cd0b065f updated docu 2018-11-13 08:59:54 +01:00
ee079fd8ff changed example to reference phase in the Fourier block. 2018-11-13 08:40:38 +01:00
71f8f78b63 set reference phase index in the case of a phase vector 2018-11-13 08:39:26 +01:00
3c55a72475 allow to define the phase parameter lists in the Fourier block with a reference phase parameter. This means all the other phase parameters are then relative to this reference phase parameter. This is often used when analysing LEM data. 2018-11-12 20:35:10 +01:00
Zaher Salman
dc668131e1 Merged muonspin/musrfit:root6 into master 2018-11-05 16:36:56 +01:00
f3c58afa51 fixed wrong include path in the cmake infrastructure. 2018-11-05 10:16:51 +01:00
Zaher Salman
acdfa60870 Merged muonspin/musrfit:root6 into master 2018-10-29 09:21:29 +01:00
476e2b49d6 make sure that enough relevant digits of the parameters are exported to the db/dat-file. 2018-10-26 14:26:04 +02:00
Zaher Salman
e702049b50 Merged muonspin/musrfit:root6 into master 2018-10-24 16:27:04 +02:00