866 Commits

Author SHA1 Message Date
404683b15f more work towards modern cmake. 2018-05-04 17:05:20 +02:00
60893f8df4 push cmake further. 2018-05-04 16:23:45 +02:00
02b05825b2 Fix merge conflic manually 2018-03-27 22:51:09 +02:00
14c83dedad (i) when exporting Fourier, and _F is added. (ii) the average flag is now also properly propageted in the batch mode. 2018-03-26 12:52:30 +02:00
f843d61bbb (i) when exporting Fourier, and _F is added. (ii) the average flag is now also properly propageted in the batch mode. 2018-03-26 12:50:45 +02:00
1586df2704 Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2018-01-18 14:00:05 +01:00
Zaher Salman
c9bceb7527 Merged muonspin/musrfit/root6 into master 2017-12-06 16:08:26 +01:00
e8a12653a6 improved the close canvas mechanism (from the global to the object level) 2017-12-01 08:55:10 +01:00
1f73e808b5 improved the close canvas mechanism (from the global to the object level) 2017-11-30 22:02:25 +01:00
Zaher Salman
8301c88478 Merged muonspin/musrfit/root6 into master 2017-11-14 15:38:40 +01:00
bc7ddcfc6d Changed behaviour for the case where LGB > Histo Size. New: LGB = (Histo Size - 1) together with a warning instead of issuing an error. 2017-11-09 10:37:27 +01:00
6162f683c8 Changed behaviour for the case where LGB > Histo Size. New: LGB = (Histo Size - 1) together with a warning instead of issuing an error. 2017-11-09 09:57:53 +01:00
70d1a24534 make msr-file reader more robust against leading spaces. 2017-11-08 11:43:49 +01:00
523e54c6db make msr-file reader more robust against leading spaces. 2017-11-08 11:43:14 +01:00
Zaher Salman
1821ecfbc0 Merged muonspin/musrfit/root6 into master 2017-11-03 12:49:32 +01:00
324045f396 make sure that a valid covariance matrix is available after Hesse. 2017-11-02 21:17:49 +01:00
60580a920f make sure that a valid covariance matrix is available after Hesse. 2017-11-02 20:24:09 +01:00
Zaher Salman
04e3e8eb37 Merged muonspin/musrfit/root6 into master 2017-10-10 12:28:13 +02:00
bb13025185 fixed an ugly mistake in the opimization of the non-analytic LF integrals. 2017-10-04 17:00:58 +02:00
c2f5d01beb fixed an ugly mistake in the opimization of the non-analytic LF integrals. 2017-10-04 16:48:31 +02:00
96d15f027a Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2017-09-20 14:26:09 +02:00
Zaher Salman
aa4dec86ef Merged muonspin/musrfit/root6 into master 2017-09-06 16:26:41 +02:00
c5b1573da0 removed some default directories since it potentially leads to problems. 2017-09-06 15:15:56 +02:00
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