526 Commits

Author SHA1 Message Date
8b416b45e0 merged root6 2019-09-11 12:12:13 +02:00
2d2f7ae2ba Update MSR.pm to use the GLOBAL block. 2019-08-30 11:19:00 +02:00
e8982410b0 adopted to the enforced changes by root 6.18.00. 2019-07-01 21:56:50 +02:00
e89c9b5b2a Moved beta-NMR msr example files to doc/examples/ 2019-05-15 16:31:02 +02:00
ce9c095f1f Fixed crash in example msr files for fitting two betaNMR helecities together. 2019-05-10 17:16:48 +02:00
b42abb2056 Minor changes to example beta-NMR msr files 2019-05-07 13:48:47 +02:00
924c297906 Debugging core dump issues 2019-05-03 17:10:07 +02:00
375031b46b Merge remote-tracking branch 'origin/master' into beta-NMR 2019-05-01 10:40:32 +02:00
Zaher Salman
a2d8acb16d Merged muonspin/musrfit:root6 into master 2019-04-26 16:03:36 +02:00
8f5c296e72 added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo. 2019-04-26 13:01:32 +02:00
34872e043d added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo. 2019-04-26 11:46:15 +02:00
26dd28d2f1 Changes to template files 2019-04-26 09:18:24 +02:00
bd6a63421b More recent working version 2019-04-26 09:18:24 +02:00
Zaher Salman
a837b1c420 Template files for two helicities and subtracted helicities updated. 2019-04-26 09:15:24 +02:00
Zaher Salman
e04cddfac8 Remove beta-NMR ascci based templates to avoid confusion. 2019-04-26 09:15:24 +02:00
970b7aafda Beta-NMR helicity subtraction seems to work in the new class. Still needs debugging and tests. Some of the changes from Jonas were reverted since SExp does not work otherwise. 2019-04-26 09:15:24 +02:00
Zaher Salman
2b00c92139 Fixed chisqr calculation bug in BNMR 2019-04-26 09:11:00 +02:00
Zaher Salman
bcd1c98ad2 More work towards implementation of beta-NMR asymmetry calculation 2019-04-26 09:11:00 +02:00
Zaher Salman
02d233b412 Merged muonspin/musrfit:root6 into master 2019-04-25 17:27:56 +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
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
414165bc90 Merged muonspin/musrfit:root6 into master 2019-02-19 08:42:19 +01:00
29d35579a7 added the current source code path to root_generate_dictionary. 2019-02-04 19:43:31 +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
813bad88ab Merged muonspin/musrfit:root6 into master 2018-11-27 14:32:03 +01:00
d874bcfeab 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:41:39 +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
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
35fd671166 fixed wrong include path in the cmake infrastructure. 2018-11-05 10:11:40 +01:00
92d1f0145c Resolve conflict with Andreas' musrfit 2018-10-15 10:25:15 +02:00
09111b659d Update to last working version. 2018-09-11 10:19:01 +02:00
ae60581d5d Updated to the last working version. 2018-08-23 17:35:57 +02:00
Zaher Salman
4bbc7b4388 Merged muonspin/musrfit:root6 into master 2018-08-18 14:18:06 +02:00
ef653c11b2 Resolve conflict from Jonas' commits 2018-08-18 14:17:41 +02:00
db70d474dc added some more necessary paths. 2018-08-17 21:00:00 +02:00
8ab2687e17 added some more necessary paths. 2018-08-17 20:55:04 +02:00
dc437c9f25 fix of an accidentally carried out wrong cleanup. 2018-08-17 16:16:08 +02:00
JAK
927eb75a90 cmake should now also work on MacOS. 2018-08-17 16:04:11 +02:00
JAK
7dd79560d1 Removed class MLRes from libBNMR. It wasn`t implemented. 2018-08-17 16:04:07 +02:00
JAK
a159f573b6 Updated docu in LineProfile.pdf. 2018-08-17 16:01:02 +02:00
JAK
8a7a9b7380 Updated docu in LineProfile.pdf. 2018-08-17 16:01:02 +02:00
JAK
d9c4505e8e The line shape width is now the correct FWHM. 2018-08-17 16:01:02 +02:00
5aa7bec5d6 Added CMake files for libLineProfile. 2018-08-17 16:01:02 +02:00
JAK
266b18ae33 Added libLineProfile and integrated it into automake. 2018-08-17 16:01:02 +02:00