872 Commits

Author SHA1 Message Date
3ae49b6c23 Resolve merge conflicts manually 2019-04-26 09:25:48 +02:00
a4b5c82a8e Removed automake file to resolve conflict 2019-04-26 09:18:24 +02:00
Zaher Salman
781c56fef5 Cleanup 2019-04-26 09:18:24 +02:00
Zaher Salman
e28b907fb7 Estimate alpha for beta-NMR asymmetry calculation from the ratio of B/F counts if no alpha line is given in the run block. 2019-04-26 09:18:24 +02:00
22141ae98d Deal with missing alpha line for beta-NMR. 2019-04-26 09:18:24 +02:00
c66849e133 Added estimation for the value of alpha from integrated counts. 2019-04-26 09:18:24 +02:00
3d773d8537 Possible fix for alpha problem for beta-NMR asymmetry calculation. To be tested. 2019-04-26 09:18:24 +02:00
e3d5d03fca Fix x-axis label bug (reported by Gerland Morris). 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
9d76afdef9 Start substract asymmetry implementation. 2019-04-26 09:11:00 +02:00
Zaher Salman
2b00c92139 Fixed chisqr calculation bug in BNMR 2019-04-26 09:11:00 +02:00
a2d47a09f8 First working duplicate asymmetry class for beta-NMR. 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
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
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
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
fa446460af Merged muonspin/musrfit:root6 into master 2019-03-13 10:55:52 +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
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
94950cb755 ifgk and ifll CUDA/OpenCL-GPU accessible. 2019-01-22 14:05:09 +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
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
Zaher Salman
42bb8a49b7 Merged muonspin/musrfit:root6 into master 2018-11-15 10:08:36 +01:00
1e8b79ec1d set reference phase index in the case of a phase vector 2018-11-13 09:20:14 +01:00
0d917564c5 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-13 09:19:48 +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
acdfa60870 Merged muonspin/musrfit:root6 into master 2018-10-29 09:21:29 +01:00