086050f4e3
fix for the case that a global section is present.
2019-09-23 16:22:16 +02:00
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
9a955de4d6
Merge branch 'root6' into dks6
2019-09-12 11:21:27 +02:00
a37dc401d9
added missing include file when installing.
2019-09-12 10:50:33 +02:00
8b416b45e0
merged root6
2019-09-11 12:12:13 +02:00
75958d0bce
Fix a bug to allow passing lifetimecorrection flag into global fit files generated by msr2data.
2019-08-30 11:27:41 +02:00
2d2f7ae2ba
Update MSR.pm to use the GLOBAL block.
2019-08-30 11:19:00 +02:00
708b6a6f9e
if mupp is starting without db/dat file list, open the file dialog automatically.
2019-07-26 11:29:15 +02:00
73db4a7c0e
fix of a typo
2019-07-01 23:10:01 +02:00
e8982410b0
adopted to the enforced changes by root 6.18.00.
2019-07-01 21:56:50 +02:00
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
2e2c249e33
Fixed bug in runMuSimulation.C
2019-05-23 11:13:36 +02:00
e89c9b5b2a
Moved beta-NMR msr example files to doc/examples/
2019-05-15 16:31:02 +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
5953786611
properly check the number of t0 parameters in the msr-file.
2019-05-11 13:19:19 +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
12a3c6c411
some minor ubuntu tweak concerning themes.
2019-05-02 15:09:38 +02:00
2065904bec
some minor ubuntu tweak concerning themes.
2019-05-02 15:04:55 +02:00
b890dda7ac
make sure that the icon theme is properly loaded when the prefs are reloaded.
2019-05-02 14:15:30 +02:00
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
297522d6b1
updated default musredit_startup.xml file info.
2019-05-02 14:15:09 +02:00
492bb4b20e
more work for dark theme under macOS.
2019-05-02 14:14:57 +02:00
d9b5e8d737
improved icon scaling.
2019-05-02 14:14:44 +02:00
ff03f46952
make toolbar icons switchable plain/dark.
2019-05-02 14:14:32 +02:00
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
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
8f5c296e72
added MusrRoot docu. Added 'Proposal Number' and 'Main Proposer' to the RunInfo.
2019-04-26 13:01:32 +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