773 Commits

Author SHA1 Message Date
e05aee0ce9 make sure that OpenMP is used if present. 2018-05-04 21:37:46 +02:00
13242bd5d0 added missing OpenMP header. 2018-05-04 21:36:35 +02:00
3ddb736f88 more NeXus related adaptation for cmake. 2018-05-04 20:57:22 +02:00
194bd31c8f handle preprocessor flag for nexus. 2018-05-04 20:25:19 +02:00
89fbdff40a make sure that the proper header files are used for the build in case musrfit is already installed. 2018-05-04 19:41:16 +02:00
a5669569d8 removed unneeded header file. 2018-05-04 19:33:10 +02:00
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
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
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
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
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
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
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
27a744c8f5 removed some default directories since it potentially leads to problems. 2017-09-06 15:13:22 +02:00
66324638ea Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2017-08-15 15:40:42 +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
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
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
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
ceb7aa6818 changed from legacy rootcint to the new rootcling ROOT dictionary generator. 2017-02-08 09:47:35 +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
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