9a955de4d6
Merge branch 'root6' into dks6
2019-09-12 11:21:27 +02:00
a37dc401d9
added missing include file when installing.
2019-09-12 10:50:33 +02:00
8b416b45e0
merged root6
2019-09-11 12:12:13 +02:00
75958d0bce
Fix a bug to allow passing lifetimecorrection flag into global fit files generated by msr2data.
2019-08-30 11:27:41 +02:00
73db4a7c0e
fix of a typo
2019-07-01 23:10:01 +02:00
e8982410b0
adopted to the enforced changes by root 6.18.00.
2019-07-01 21:56:50 +02:00
34b432b185
Non-muSR data export from musrview
...
Add the theory export part again which was lost after restructuring.
2019-06-03 14:14:20 +02:00
cc1c914d93
Merge branch 'beta-NMR' into root6
2019-05-15 09:00:47 +02:00
5e67b3c962
Remove unused code.
2019-05-14 09:52:13 +02:00
5953786611
properly check the number of t0 parameters in the msr-file.
2019-05-11 13:19:19 +02:00
50314c56e3
properly check the number of t0 parameters in the msr-file.
2019-05-11 13:15:43 +02:00
5d558833b0
Correct time resolution for betaNMR runs.
2019-05-06 14:33:22 +02:00
924c297906
Debugging core dump issues
2019-05-03 17:10:07 +02:00
6498e0b0bc
Preparing for merge with master
2019-05-01 12:56:33 +02:00
be8c809c6a
Follow Andreas' code modernization for BNMR code and cleanup
2019-04-26 10:58:17 +02:00
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
