843 Commits

Author SHA1 Message Date
27a744c8f5 removed some default directories since it potentially leads to problems. 2017-09-06 15:13:22 +02:00
08d67afb78 prevent double free. 2017-08-21 14:31:16 +02:00
49db148c37 added proper destructor. 2017-08-18 07:58:25 +02:00
2d4697c750 fixes a bug in the GPU memory allocation. 2017-08-17 13:29:25 +02:00
66324638ea Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2017-08-15 15:40:42 +02:00
d397bf0064 fixed an issue with the month (0/1-problem). 2017-06-09 07:52:24 +02:00
Zaher Salman
dfa33303d1 Merged muonspin/musrfit/root6 into master 2017-06-08 11:01:27 +02:00
80a7398350 found another date issue which is fixed now. 2017-06-06 12:15:17 +02:00
60b804c3a1 Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2017-06-06 10:51:07 +02:00
c6cee9f6d8 fixed wrong month in the data conversion. 2017-06-06 10:49:43 +02:00
a1c4c4cc02 Minor error corrections in messages 2017-06-01 13:04:19 +02:00
26d78cf482 proper handling for DKS/GPU Fourier transform. 2017-05-31 16:21:53 +02:00
4a1b985506 added the missing DKS Fourier support flag. 2017-05-31 08:51:19 +02:00
bce9326f06 fix logy problem. 2017-05-29 18:02:31 +02:00
2b7a391bbb back-integrate DKS Fourier after DKS upgrade and modularization. Not yet tested other than compilation. 2017-05-29 17:54:57 +02:00
Zaher Salman
2e30a58af4 Merged muonspin/musrfit/root6 into master 2017-05-23 14:42:44 +02:00
07a1dc1d59 fix logy scaling problem. 2017-05-19 20:17:07 +02:00
1729055385 merged from root6. Compiles but has issues with DKS linking yet. 2017-05-15 21:30:42 +02:00
ceaf7d0c6a added missing export tags for RRF. 2017-05-08 09:48:14 +02:00
b4aaa2bc15 add some additional output when minos is called. 2017-05-04 15:25:42 +02:00
261691c040 fixed a typo 2017-02-21 14:55:04 +01:00
13106a51c7 added root6 features to dks6 2017-02-21 14:47:33 +01:00
6cae76f1c1 fixed a little annoying bug in the LF none-analytic integral estimate. 2017-02-21 11:39:22 +01:00
07aa67a1a2 fixed a little annoying bug in the LF none-analytic integral estimate. 2017-02-21 11:28:53 +01:00
Zaher Salman
c63f9e0ce1 Merged muonspin/musrfit/root6 into master 2017-02-15 11:01:44 +01:00
bcbed139f9 instead of copying musrfit_startup.xml to the appropriate directory, create it at run-time if needed. This has the advantage that each user will automatically create its own file. 2017-02-14 15:06:10 +01:00
Zaher Salman
effc6095a5 Merged muonspin/musrfit/root6 into master 2017-02-08 15:17:56 +01:00
e8f692b42c more changes towards musrfit/DKS/root6. 2017-02-08 11:16:27 +01:00
ceb7aa6818 changed from legacy rootcint to the new rootcling ROOT dictionary generator. 2017-02-08 09:47:35 +01:00
18d037fdf2 adopted dks to root6 (branch dks6). Not yet tested. 2017-02-07 16:12:49 +01:00
Zaher Salman
3141548262 Merged muonspin/musrfit/root6 into master 2017-01-19 09:22:28 +01:00
Zaher Salman
149f9184f7 Merged muonspin/musrfit into master 2017-01-03 13:48:55 +01:00
38c4293d58 resolved merge conflicts with master 2016-12-23 14:16:22 +01:00
8a6b24cc9d Merge branch 'master' into root6 2016-12-22 17:05:36 +01:00
c3c01e5de0 cleaning up left-overs and improved the comments. 2016-12-22 17:04:48 +01:00
Zaher Salman
65e73041fa Merged muonspin/musrfit into master 2016-12-19 17:15:13 +01:00
c8e1a294aa Manual conflicting commits from Andreas 2016-12-19 17:15:01 +01:00
02cdef0fa7 small change to make the compiler happy 2016-12-19 12:14:36 +01:00
421fe729f8 resolved merge conflict. 2016-12-19 12:13:35 +01:00
5d80c342e0 cleaned up some inconsistencies in the musrfit_startup.xml options 2016-12-18 10:39:43 +01:00
63516fc499 added a first version of a optimized phase correction for the real Fourier transform 2016-12-18 10:37:50 +01:00
c768c27898 for maxLH it is now possible to get the per-run-block maxLH, and the expected maxLH 2016-12-18 10:36:02 +01:00
b106ac61a1 added phase optimized Re FT for musrview. Still not perfect. 2016-12-07 17:02:18 +01:00
f7834aaead added class PFTPhaseCorrection which allows to calculate the phase optimzied real part of the Fourier transform. musrFT is already using it, for musrview it is still missing. 2016-11-29 11:16:45 +01:00
1e5bfb8216 when activating the cross hair cursor in the musrview canvas, enable the event status bar as well. This allows the user to see exactly where the cursor is. This is for instance helpful for Fourier spectra. 2016-11-28 11:02:03 +01:00
4c24a1e481 prepare the FOURIER block command 'range_for_phase_correction' for the new FT Re-part automatic phase correction algorithm. 2016-11-28 10:13:38 +01:00
Zaher Salman
709f482120 Merged muonspin/musrfit into master 2016-08-29 13:27:41 +02:00
333eaea7f1 Merge branch 'master' into root6 2016-08-25 13:38:57 +02:00
6aea6473ab merge dks to master 2016-08-25 08:40:40 +02:00
6585032df0 in musrview it is now possible to enable/disable a crosshair cursor by pressing 'c'. 2016-08-24 15:37:14 +02:00