2459 Commits

Author SHA1 Message Date
Zaher Salman
8346e8debb First successful compilation of AsymmetryBNMR 2019-04-26 09:08:52 +02:00
Zaher Salman
4ad524216f Start branch to develop full featured beta-NMR support 2019-04-26 09:06:28 +02:00
Zaher Salman
a1bc47c39e Merged muonspin/musrfit:root6 into master 2019-04-26 08:54:54 +02:00
ed365c016e some minor improvement concerning the start of musrview for cases where the msr-file is corrupted, the data file cannot be read, etc. 2019-04-25 21:03:38 +02:00
306e555311 some minor cleanup and update of the copyright info. 2019-04-25 21:03:01 +02:00
f5344e29f0 added some more specifc error codes. 2019-04-25 21:02:45 +02:00
63aa171982 added some additional error tags. 2019-04-25 21:02:31 +02:00
dae9ef0ffb some minor improvement concerning the start of musrview for cases where the msr-file is corrupted, the data file cannot be read, etc. 2019-04-25 20:33:43 +02:00
074d8c77e4 some minor cleanup and update of the copyright info. 2019-04-25 20:30:44 +02:00
96d9ba5f88 added some more specifc error codes. 2019-04-25 20:23:40 +02:00
9d12700f39 added some additional error tags. 2019-04-25 20:22:43 +02:00
Zaher Salman
02d233b412 Merged muonspin/musrfit:root6 into master 2019-04-25 17:27:56 +02:00
35612c25ca Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2019-04-25 17:27:26 +02:00
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
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
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
9059821e3c Docu updated
Removed the automake tool chain description (hopefully) everywhere.
2019-03-08 13:54:04 +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
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
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