Commit Graph

1700 Commits

Author SHA1 Message Date
suter_a 921b8bbab4 fixed a bug in the global+ option of msr2data if a global section is present. 2019-11-08 12:23:27 +01:00
suter_a 503336e685 also allow to add an offset. 2019-10-24 13:02:34 +02:00
suter_a 2650c7d12b allow to change the power N for 2^N elements. 2019-10-24 12:39:11 +02:00
suter_a b3d9345def Merge https://gitlab.psi.ch/nemu/musrfit into root6 2019-10-24 07:49:13 +02:00
suter_a 9add9f2561 added a bare fftw3 test in order to make sure fftw3 works on a new platform. 2019-10-23 19:54:54 +02:00
suter_a b29d85dd4c fix for the case that a global section is present. 2019-09-23 13:53:19 +02:00
suter_a a37dc401d9 added missing include file when installing. 2019-09-12 10:50:33 +02:00
salman 75958d0bce Fix a bug to allow passing lifetimecorrection flag into global fit files generated by msr2data. 2019-08-30 11:27:41 +02:00
salman 2d2f7ae2ba Update MSR.pm to use the GLOBAL block. 2019-08-30 11:19:00 +02:00
suter_a 708b6a6f9e if mupp is starting without db/dat file list, open the file dialog automatically. 2019-07-26 11:29:15 +02:00
suter_a 73db4a7c0e fix of a typo 2019-07-01 23:10:01 +02:00
suter_a e8982410b0 adopted to the enforced changes by root 6.18.00. 2019-07-01 21:56:50 +02:00
suter_a 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
prokscha 2e2c249e33 Fixed bug in runMuSimulation.C 2019-05-23 11:13:36 +02:00
salman e89c9b5b2a Moved beta-NMR msr example files to doc/examples/ 2019-05-15 16:31:02 +02:00
suter_a cc1c914d93 Merge branch 'beta-NMR' into root6 2019-05-15 09:00:47 +02:00
salman 3ae47bf5cb Correct typo 2019-05-14 11:35:02 +02:00
salman 5e67b3c962 Remove unused code. 2019-05-14 09:52:13 +02:00
suter_a 50314c56e3 properly check the number of t0 parameters in the msr-file. 2019-05-11 13:15:43 +02:00
salman ce9c095f1f Fixed crash in example msr files for fitting two betaNMR helecities together. 2019-05-10 17:16:48 +02:00
salman b42abb2056 Minor changes to example beta-NMR msr files 2019-05-07 13:48:47 +02:00
salman 5d558833b0 Correct time resolution for betaNMR runs. 2019-05-06 14:33:22 +02:00
salman 924c297906 Debugging core dump issues 2019-05-03 17:10:07 +02:00
salman 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
suter_a 2065904bec some minor ubuntu tweak concerning themes. 2019-05-02 15:04:55 +02:00
suter_a f320230b30 make sure that the icon theme is properly loaded when the prefs are reloaded. 2019-05-02 11:02:06 +02:00
suter_a 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
salman 6498e0b0bc Preparing for merge with master 2019-05-01 12:56:33 +02:00
suter_a 1ef1e6f42e updated default musredit_startup.xml file info. 2019-05-01 10:57:50 +02:00
salman 375031b46b Merge remote-tracking branch 'origin/master' into beta-NMR 2019-05-01 10:40:32 +02:00
suter_a 20153c6ffc more work for dark theme under macOS. 2019-05-01 09:01:27 +02:00
suter_a bd3ade3136 improved icon scaling. 2019-04-30 14:20:38 +02:00
suter_a 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
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 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