Commit Graph
2089 Commits
Author SHA1 Message Date
suter_a 086050f4e3 fix for the case that a global section is present. 2019-09-23 16:22:16 +02:00
suter_a afef9600b4 fixed time range issue in single histo fit which was caused by a musrfit <-> DKS confusion. Asymmetry fit still has an issue which needs further investigations. 2019-09-21 19:29:51 +02:00
suter_a 9a955de4d6 Merge branch 'root6' into dks6 2019-09-12 11:21:27 +02:00
suter_a a37dc401d9 added missing include file when installing. 2019-09-12 10:50:33 +02:00
suter_a 8b416b45e0 merged root6 2019-09-11 12:12:13 +02:00
Zaher Salmanandsuter_a a1924c2756 Merged in master (pull request #11)
Master
2019-08-31 08:31:26 +00: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
Zaher Salman d80db45ffe Merged muonspin/musrfit:root6 into master 2019-07-26 15:27:23 +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 b68286761a updated docu 2019-07-24 10:15:15 +02:00
suter_a cf03c49cf8 NeXus mxml support for now dropped since the upstream NeXus library is incompatible with the new mini-xml v3. 2019-07-24 08:31:08 +02:00
Zaher Salman 25a378d611 Merged muonspin/musrfit:root6 into master 2019-07-10 09:11:46 +02:00
suter_a a33248d3e8 switched the Fourier option of the NeXus2 example from POWER to REAL 2019-07-09 20:03:53 +02:00
Zaher Salman f42ace3cdb Merged muonspin/musrfit:root6 into master 2019-07-02 11:52:37 +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
Zaher Salman 61aab019be Merged muonspin/musrfit:root6 into master 2019-06-03 16:15:23 +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
Zaher Salman 7cfa5cbf31 Merged muonspin/musrfit:root6 into master 2019-05-22 10:13:14 +02:00
Zaher Salmanandsuter_a 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
salman 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
suter_a 25bfa1f66b update of the docu. v1.5 2019-05-15 10:14:39 +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
Zaher Salman 0aa31470c3 Merged muonspin/musrfit:root6 into master 2019-05-13 10:11:39 +02:00
suter_a 5953786611 properly check the number of t0 parameters in the msr-file. 2019-05-11 13:19:19 +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 12a3c6c411 some minor ubuntu tweak concerning themes. 2019-05-02 15:09:38 +02:00
suter_a 2065904bec some minor ubuntu tweak concerning themes. 2019-05-02 15:04:55 +02:00
suter_a b890dda7ac make sure that the icon theme is properly loaded when the prefs are reloaded. 2019-05-02 14:15:30 +02:00
suter_a 1d9be24be1 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 14:15:19 +02:00
suter_a 297522d6b1 updated default musredit_startup.xml file info. 2019-05-02 14:15:09 +02:00
suter_a 492bb4b20e more work for dark theme under macOS. 2019-05-02 14:14:57 +02:00
suter_a d9b5e8d737 improved icon scaling. 2019-05-02 14:14:44 +02:00
suter_a ff03f46952 make toolbar icons switchable plain/dark. 2019-05-02 14:14:32 +02:00
suter_a eb0cf12766 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-05-02 14:14:11 +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