2074 Commits

Author SHA1 Message Date
Zaher Salman
6ee9d829ff Merged in zaher-salman/musrfit/master (pull request #10)
Moved beta-NMR msr example files to doc/examples/

Approved-by: Zaher Salman <zaher.salman@gmail.com>
2019-05-21 13:18:27 +00:00
e89c9b5b2a Moved beta-NMR msr example files to doc/examples/ 2019-05-15 16:31:02 +02:00
Zaher Salman
ebabc43383 Merged muonspin/musrfit:root6 into master 2019-05-15 11:44:52 +02:00
25bfa1f66b update of the docu. v1.5 2019-05-15 10:14:39 +02:00
cc1c914d93 Merge branch 'beta-NMR' into root6 2019-05-15 09:00:47 +02:00
3ae47bf5cb Correct typo 2019-05-14 11:35:02 +02:00
5e67b3c962 Remove unused code. 2019-05-14 09:52:13 +02:00
Zaher Salman
0aa31470c3 Merged muonspin/musrfit:root6 into master 2019-05-13 10:11:39 +02:00
50314c56e3 properly check the number of t0 parameters in the msr-file. 2019-05-11 13:15:43 +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
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
553b1de240 Merge remote-tracking branch 'origin/master' into beta-NMR 2019-05-02 17:08:22 +02:00
Zaher Salman
acc251ffbe Merged muonspin/musrfit:root6 into master 2019-05-02 17:05:39 +02:00
2065904bec some minor ubuntu tweak concerning themes. 2019-05-02 15:04:55 +02:00
f320230b30 make sure that the icon theme is properly loaded when the prefs are reloaded. 2019-05-02 11:02:06 +02:00
3256dde54e More flexible dark scheme handling
It works now as follows:
1) try to get theme information from the system, and if present us it.
2) if no theme information of the system is present, take the one from
   the musredit_startup.xml.

Now it is possible to switch the icon theme for the menu and toolbar
separately.
2019-05-02 10:44:04 +02:00
6498e0b0bc Preparing for merge with master 2019-05-01 12:56:33 +02:00
1ef1e6f42e updated default musredit_startup.xml file info. 2019-05-01 10:57:50 +02:00
375031b46b Merge remote-tracking branch 'origin/master' into beta-NMR 2019-05-01 10:40:32 +02:00
20153c6ffc more work for dark theme under macOS. 2019-05-01 09:01:27 +02:00
bd3ade3136 improved icon scaling. 2019-04-30 14:20:38 +02:00
f51f3e2038 make toolbar icons switchable plain/dark. 2019-04-30 09:40:36 +02:00
Zaher Salman
08ee7991a5 Merged muonspin/musrfit:root6 into master 2019-04-29 09:29:15 +02:00
a5526d7f76 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2019-04-26 20:35:32 +02:00
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
34872e043d added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo. 2019-04-26 11:46:15 +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
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
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
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
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
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
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