690 Commits

Author SHA1 Message Date
Zaher Salman
d05a858e7e Merged muonspin/musrfit:root6 into master 2018-10-16 10:04:36 +02:00
5909d59f32 allow multiple Fourier phase parameters for phase shifted real Fourier. Autophasing still missing. 2018-10-15 16:09:17 +02:00
92d1f0145c Resolve conflict with Andreas' musrfit 2018-10-15 10:25:15 +02:00
nemu
2a848ed5f3 make sure that BOOST is found even if installed in any non-standard path. 2018-08-27 15:46:48 +02:00
Zaher Salman
b56e5adce6 Merged muonspin/musrfit:root6 into master 2018-07-05 13:30:32 +02:00
55b5788506 added MODULE to root_generate_dictionary in order to get the proper name scheme. 2018-06-28 13:17:43 +02:00
Zaher Salman
0593f7c150 Merged muonspin/musrfit:root6 into master 2018-06-09 10:18:16 +02:00
4a881fad56 cleaned up signed/unsigned int issues. 2018-06-06 16:04:27 +02:00
a756a2def4 cmake: got rid of target_compile_options which are better controlled by the build type. 2018-06-06 12:59:18 +02:00
25b59ab473 slight performance increase. 2018-06-06 12:54:54 +02:00
57b7c52865 cmake: added -O2 which gives the performance improvement needed. 2018-06-05 07:59:24 +02:00
cd82c613aa added missing header files. 2018-06-04 09:34:10 +02:00
99e8eb9769 cmake: added library version information to the targets. 2018-06-02 12:41:13 +02:00
9bdb8ec2ec make sure that older cmake versions (<= 3.8) inject the right linker flags for OpenMP. 2018-05-07 13:02:22 +02:00
aa34efb0a8 add nonlocal sc support via cmake. 2018-05-05 21:02:48 +02:00
9bf47a2690 some first cmake tuning for macOS. 2018-05-05 16:47:11 +02:00
42086350e7 add FFTW3 path if not present in the standard search paths. This is needed for macOS with macport. 2018-05-05 12:37:52 +02:00
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