LMU/musrfit
5
1
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 4 Activity
1,852 Commits 5 Branches 39 Tags
6498e0b0bca19a4eda4e241e08519edeaacab0ea
Commit Graph

1852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
salman 6498e0b0bc Preparing for merge with master 2019-05-01 12:56:33 +02:00
salman 375031b46b Merge remote-tracking branch 'origin/master' into beta-NMR 2019-05-01 10:40:32 +02:00
Zaher Salman 08ee7991a5 Merged muonspin/musrfit:root6 into master 2019-04-29 09:29:15 +02:00
suter_a a5526d7f76 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2019-04-26 20:35:32 +02:00
suter_a 67421b2114 Allow switching icon theme in musredit 
Added the needed facility in the preferences which allows to switch
the icon scheme between plain and dark. This is needed for some OS
where qt doesn't provide the necessary information.
 2019-04-26 19:29:24 +02:00
Zaher Salman a2d8acb16d Merged muonspin/musrfit:root6 into master 2019-04-26 16:03:36 +02:00
suter_a 34872e043d added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo. 2019-04-26 11:46:15 +02:00
salman be8c809c6a Follow Andreas' code modernization for BNMR code and cleanup 2019-04-26 10:58:17 +02:00
salman 3ae49b6c23 Resolve merge conflicts manually 2019-04-26 09:25:48 +02:00
salman a4b5c82a8e Removed automake file to resolve conflict 2019-04-26 09:18:24 +02:00
salman 26dd28d2f1 Changes to template files 2019-04-26 09:18:24 +02:00
salman bd6a63421b More recent working version 2019-04-26 09:18:24 +02:00
Zaher Salman d38f670504 Added documentation relevant to beta-NMR asymmetry fits, fittype 5. 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
salman 22141ae98d Deal with missing alpha line for beta-NMR. 2019-04-26 09:18:24 +02:00
salman c66849e133 Added estimation for the value of alpha from integrated counts. 2019-04-26 09:18:24 +02:00
salman 3d773d8537 Possible fix for alpha problem for beta-NMR asymmetry calculation. To be tested. 2019-04-26 09:18:24 +02:00
salman e3d5d03fca Fix x-axis label bug (reported by Gerland Morris). 2019-04-26 09:15: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
salman 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 e3408ca5f5 Start substract asymmetry implementation. 2019-04-26 09:11:00 +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
salman 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 a1bc47c39e Merged muonspin/musrfit:root6 into master 2019-04-26 08:54:54 +02:00
suter_a 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
suter_a 074d8c77e4 some minor cleanup and update of the copyright info. 2019-04-25 20:30:44 +02:00
suter_a 96d9ba5f88 added some more specifc error codes. 2019-04-25 20:23:40 +02:00
suter_a 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
salman 35612c25ca Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2019-04-25 17:27:26 +02:00
salman 904471b664 Resolve conflicts manually. 2019-04-25 17:27:03 +02:00
suter_a 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 cf2e127aae Merged master into beta-NMR 2019-04-05 08:15:03 +00:00
salman 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
suter_a 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
suter_a 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
suter_a 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
salman 05a62506d8 Resolving conflict. 2019-03-13 10:55:36 +01:00
salman ffae09354e Resolving conflict. 2019-03-13 10:54:33 +01:00
salman a00b93f6cd Resolving conflict. 2019-03-13 10:53:13 +01:00
salman 95ea5b6f68 Resolving conflict. 2019-03-13 10:52:05 +01:00