musrfit

LMU/musrfit

Fork 0

Commit Graph

Select branches

Hide Pull Requests

dks6

root6

v0.13

v0.14

v0.16

v0.17

v0.18

v1.0

v1.1

v1.2

v1.3

v1.4

v1.5

v1.6

v1.6.1

v1.6.2

v1.6.3

v1.6.4

v1.6.5

v1.7

v1.7.1

v1.7.2

v1.7.3

v1.7.4

v1.7.5

v1.7.6

v1.8.0

v1.8.1

v1.8.2

v1.9.0

v1.9.1

v1.9.2

v1.9.3

v1.9.4

v1.9.5

v1.9.6

v1.9.7

v1.9.8

v1.9.9

6ee9d829ff Merged in zaher-salman/musrfit/master (pull request #10) Zaher Salman 2019-05-21 13:18:27 +00:00
e89c9b5b2a Moved beta-NMR msr example files to doc/examples/ Zaher Salman 2019-05-15 16:31:02 +02:00
ebabc43383 Merged muonspin/musrfit:root6 into master Zaher Salman 2019-05-15 11:44:52 +02:00
25bfa1f66b update of the docu. v1.5 Andreas Suter 2019-05-15 10:14:39 +02:00
cc1c914d93 Merge branch 'beta-NMR' into root6 Andreas Suter 2019-05-15 09:00:47 +02:00
3ae47bf5cb Correct typo Zaher Salman 2019-05-14 11:35:02 +02:00
5e67b3c962 Remove unused code. Zaher Salman 2019-05-14 09:52:13 +02:00
0aa31470c3 Merged muonspin/musrfit:root6 into master Zaher Salman 2019-05-13 10:11:39 +02:00
5953786611 properly check the number of t0 parameters in the msr-file. Andreas Suter 2019-05-11 13:15:43 +02:00
50314c56e3 properly check the number of t0 parameters in the msr-file. Andreas Suter 2019-05-11 13:15:43 +02:00
ce9c095f1f Fixed crash in example msr files for fitting two betaNMR helecities together. Zaher Salman 2019-05-10 17:16:48 +02:00
b42abb2056 Minor changes to example beta-NMR msr files Zaher Salman 2019-05-07 13:48:47 +02:00
5d558833b0 Correct time resolution for betaNMR runs. Zaher Salman 2019-05-06 14:33:22 +02:00
924c297906 Debugging core dump issues Zaher Salman 2019-05-03 17:10:07 +02:00
553b1de240 Merge remote-tracking branch 'origin/master' into beta-NMR Zaher Salman 2019-05-02 17:08:22 +02:00
acc251ffbe Merged muonspin/musrfit:root6 into master Zaher Salman 2019-05-02 17:05:39 +02:00
12a3c6c411 some minor ubuntu tweak concerning themes. Andreas Suter 2019-05-02 15:04:55 +02:00
2065904bec some minor ubuntu tweak concerning themes. Andreas Suter 2019-05-02 15:04:55 +02:00
b890dda7ac make sure that the icon theme is properly loaded when the prefs are reloaded. Andreas Suter 2019-05-02 11:02:06 +02:00
1d9be24be1 More flexible dark scheme handling Andreas Suter 2019-05-02 10:44:04 +02:00
297522d6b1 updated default musredit_startup.xml file info. Andreas Suter 2019-05-01 10:57:50 +02:00
492bb4b20e more work for dark theme under macOS. Andreas Suter 2019-05-01 09:01:27 +02:00
d9b5e8d737 improved icon scaling. Andreas Suter 2019-04-30 14:20:38 +02:00
ff03f46952 make toolbar icons switchable plain/dark. Andreas Suter 2019-04-30 09:40:36 +02:00
eb0cf12766 Allow switching icon theme in musredit Andreas Suter 2019-04-26 19:29:24 +02:00
f320230b30 make sure that the icon theme is properly loaded when the prefs are reloaded. Andreas Suter 2019-05-02 11:02:06 +02:00
3256dde54e More flexible dark scheme handling Andreas Suter 2019-05-02 10:44:04 +02:00
6498e0b0bc Preparing for merge with master Zaher Salman 2019-05-01 12:56:33 +02:00
1ef1e6f42e updated default musredit_startup.xml file info. Andreas Suter 2019-05-01 10:57:50 +02:00
375031b46b Merge remote-tracking branch 'origin/master' into beta-NMR Zaher Salman 2019-05-01 10:40:32 +02:00
20153c6ffc more work for dark theme under macOS. Andreas Suter 2019-05-01 09:01:27 +02:00
bd3ade3136 improved icon scaling. Andreas Suter 2019-04-30 14:20:38 +02:00
f51f3e2038 make toolbar icons switchable plain/dark. Andreas Suter 2019-04-30 09:40:36 +02:00
08ee7991a5 Merged muonspin/musrfit:root6 into master Zaher Salman 2019-04-29 09:29:15 +02:00
a5526d7f76 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 Andreas Suter 2019-04-26 20:35:32 +02:00
67421b2114 Allow switching icon theme in musredit Andreas Suter 2019-04-26 19:29:24 +02:00
a2d8acb16d Merged muonspin/musrfit:root6 into master Zaher Salman 2019-04-26 16:03:36 +02:00
8f5c296e72 added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo. Andreas Suter 2019-04-26 11:46:15 +02:00
34872e043d added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo. Andreas Suter 2019-04-26 11:46:15 +02:00
be8c809c6a Follow Andreas' code modernization for BNMR code and cleanup Zaher Salman 2019-04-26 10:58:17 +02:00
3ae49b6c23 Resolve merge conflicts manually Zaher Salman 2019-04-26 09:25:48 +02:00
a4b5c82a8e Removed automake file to resolve conflict Zaher Salman 2019-04-05 10:14:16 +02:00
26dd28d2f1 Changes to template files Zaher Salman 2018-10-15 10:19:02 +02:00
bd6a63421b More recent working version Zaher Salman 2018-10-15 10:16:41 +02:00
d38f670504 Added documentation relevant to beta-NMR asymmetry fits, fittype 5. Zaher Salman 2018-08-26 11:33:13 +02:00
781c56fef5 Cleanup Zaher Salman 2018-08-25 23:51:08 +02:00
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. Zaher Salman 2018-08-25 23:06:57 +02:00
22141ae98d Deal with missing alpha line for beta-NMR. Zaher Salman 2018-08-24 17:42:23 +02:00
c66849e133 Added estimation for the value of alpha from integrated counts. Zaher Salman 2018-08-24 14:08:28 +02:00
3d773d8537 Possible fix for alpha problem for beta-NMR asymmetry calculation. To be tested. Zaher Salman 2018-08-24 13:03:28 +02:00
e3d5d03fca Fix x-axis label bug (reported by Gerland Morris). Zaher Salman 2018-08-21 10:32:57 +02:00
a837b1c420 Template files for two helicities and subtracted helicities updated. Zaher Salman 2018-08-20 22:04:50 +02:00
e04cddfac8 Remove beta-NMR ascci based templates to avoid confusion. Zaher Salman 2018-08-20 20:04:43 +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. Zaher Salman 2018-08-20 17:51:39 +02:00
e3408ca5f5 Start substract asymmetry implementation. Zaher Salman 2018-08-19 23:40:55 +02:00
9d76afdef9 Start substract asymmetry implementation. Zaher Salman 2018-08-19 23:37:48 +02:00
2b00c92139 Fixed chisqr calculation bug in BNMR Zaher Salman 2018-08-18 23:45:28 +02:00
a2d47a09f8 First working duplicate asymmetry class for beta-NMR. Zaher Salman 2018-08-17 16:08:04 +02:00
bcd1c98ad2 More work towards implementation of beta-NMR asymmetry calculation Zaher Salman 2018-08-16 23:17:39 +02:00
8346e8debb First successful compilation of AsymmetryBNMR Zaher Salman 2018-08-15 21:35:56 +02:00
4ad524216f Start branch to develop full featured beta-NMR support Zaher Salman 2018-08-15 20:35:06 +02:00
a1bc47c39e Merged muonspin/musrfit:root6 into master Zaher Salman 2019-04-26 08:54:54 +02:00
ed365c016e some minor improvement concerning the start of musrview for cases where the msr-file is corrupted, the data file cannot be read, etc. Andreas Suter 2019-04-25 20:33:43 +02:00
306e555311 some minor cleanup and update of the copyright info. Andreas Suter 2019-04-25 20:30:44 +02:00
f5344e29f0 added some more specifc error codes. Andreas Suter 2019-04-25 20:23:40 +02:00
63aa171982 added some additional error tags. Andreas Suter 2019-04-25 20:22:43 +02:00
dae9ef0ffb some minor improvement concerning the start of musrview for cases where the msr-file is corrupted, the data file cannot be read, etc. Andreas Suter 2019-04-25 20:33:43 +02:00
074d8c77e4 some minor cleanup and update of the copyright info. Andreas Suter 2019-04-25 20:30:44 +02:00
96d9ba5f88 added some more specifc error codes. Andreas Suter 2019-04-25 20:23:40 +02:00
9d12700f39 added some additional error tags. Andreas Suter 2019-04-25 20:22:43 +02:00
02d233b412 Merged muonspin/musrfit:root6 into master Zaher Salman 2019-04-25 17:27:56 +02:00
35612c25ca Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit Zaher Salman 2019-04-25 17:27:26 +02:00
904471b664 Resolve conflicts manually. Zaher Salman 2019-04-25 17:27:03 +02:00
9b2a01db2d modernized code to C++11 and newer -- cleanup. Andreas Suter 2019-04-24 17:53:18 +02:00
c64c74dbf8 modernized code to C++11 and newer. Andreas Suter 2019-04-16 15:34:49 +02:00
795cd75b1e modernized code to C++11 and newer. Andreas Suter 2019-04-16 15:34:49 +02:00
1c5069bc48 fix of wrong offset in time domain data before Fourier. Andreas Suter 2019-04-11 16:46:13 +02:00
cf2e127aae Merged master into beta-NMR Zaher Salman 2019-04-05 08:15:03 +00:00
6c88bce19c Removed automake file to resolve conflict Zaher Salman 2019-04-05 10:14:16 +02:00
8247b19b84 Merged muonspin/musrfit:root6 into master Zaher Salman 2019-04-05 09:00:38 +02:00
ac1d52a054 removed outdated 'register' from code. Andreas Suter 2019-04-04 15:52:21 +02:00
e6d424e900 removed outdated 'register' from code. Andreas Suter 2019-04-04 15:52:21 +02:00
aa6579af41 Merged muonspin/musrfit:root6 into master Zaher Salman 2019-04-03 08:46:24 +02:00
5ab041a4f2 improve msr2data handling Andreas Suter 2019-04-01 10:32:24 +02:00
36cc3444a2 improve msr2data handling Andreas Suter 2019-04-01 10:32:24 +02:00
5bb47dc9fb Fix crash when trying to close empty tab Andreas Suter 2019-04-01 09:03:29 +02:00
15692b89e7 Fix crash when trying to close empty tab Andreas Suter 2019-04-01 09:03:29 +02:00
fa446460af Merged muonspin/musrfit:root6 into master Zaher Salman 2019-03-13 10:55:52 +01:00
05a62506d8 Resolving conflict. Zaher Salman 2019-03-13 10:55:36 +01:00
ffae09354e Resolving conflict. Zaher Salman 2019-03-13 10:54:33 +01:00
a00b93f6cd Resolving conflict. Zaher Salman 2019-03-13 10:53:13 +01:00
95ea5b6f68 Resolving conflict. Zaher Salman 2019-03-13 10:52:05 +01:00
d66b132a0b Resolving conflict. Zaher Salman 2019-03-13 10:50:28 +01:00
33d0e51a05 Resolving conflict. Zaher Salman 2019-03-13 10:46:53 +01:00
fec5017fc2 added log info for the cpack part. Andreas Suter 2019-03-11 13:33:42 +01:00
0ff385de11 added missing include directory. Andreas Suter 2019-03-08 16:24:45 +01:00
9cd35d1373 added missing include directory. Andreas Suter 2019-03-08 16:24:45 +01:00
9059821e3c Docu updated Andreas Suter 2019-03-08 13:07:47 +01:00
8dd8d29adc Remove automake support Andreas Suter 2019-03-08 12:50:41 +01:00
86d03d7132 Docu updated Andreas Suter 2019-03-08 13:07:47 +01:00