Commit Graph
480 Commits
Author SHA1 Message Date
Zaher Salman dcfa461537 Merged master into beta-NMR 2019-02-19 08:43:38 +01:00
Zaher Salman 414165bc90 Merged muonspin/musrfit:root6 into master 2019-02-19 08:42:19 +01:00
suter_a 29d35579a7 added the current source code path to root_generate_dictionary. 2019-02-04 19:43:31 +01:00
suter_a 3cb950277f cmake/cpack root dictionary issue fixed.
In order that package assembly works, the code needs to be relocatble
and any hints linking it to the original source need to be absent.
The changes here do exactely this. For rootcling the '-inlineInputHeader'
option is needed, otherwise the dictionary wants to load the header
file from the source destination which of course will fail when installing
the package on a machine without the source.
2019-02-01 16:05:24 +01:00
Zaher Salman d1cf374354 Merged master into beta-NMR 2018-12-18 10:01:28 +01:00
Zaher Salman 813bad88ab Merged muonspin/musrfit:root6 into master 2018-11-27 14:32:03 +01:00
suter_a c5c5b16c46 BNMR lib installation problems
Adopted the build system for the BNMR libs such that the generated files are found and can be installed. The BNMR lib mantainers (ZS, JK) are responsible for the functionality though.
2018-11-27 12:25:18 +01:00
Zaher Salman dc668131e1 Merged muonspin/musrfit:root6 into master 2018-11-05 16:36:56 +01:00
suter_a f3c58afa51 fixed wrong include path in the cmake infrastructure. 2018-11-05 10:16:51 +01:00
salman 92d1f0145c Resolve conflict with Andreas' musrfit 2018-10-15 10:25:15 +02:00
salman 8207aea183 Changes to template files 2018-10-15 10:19:02 +02:00
salman 2cd81cf235 More recent working version 2018-10-15 10:16:41 +02:00
salman 09111b659d Update to last working version. 2018-09-11 10:19:01 +02:00
salman ae60581d5d Updated to the last working version. 2018-08-23 17:35:57 +02:00
Zaher Salman af4040228b Template files for two helicities and subtracted helicities updated. 2018-08-20 22:04:50 +02:00
Zaher Salman fa7e74e560 Remove beta-NMR ascci based templates to avoid confusion. 2018-08-20 20:04:43 +02:00
salman e9ec126d9e Beta-NMR helicity subtraction seems to work in the new class. Still needs debugging and tests. Some of the changes from Jonas were reverted since SExp does not work otherwise. 2018-08-20 17:51:39 +02:00
Zaher Salman e5c1450fc8 Fixed chisqr calculation bug in BNMR 2018-08-18 23:45:28 +02:00
salman 6c657e2c6b Merge branch 'master' into beta-NMR
The new beta-NMR class is ready and independent from the original
Asymmetry class.
2018-08-18 16:39:32 +02:00
Zaher Salman 4bbc7b4388 Merged muonspin/musrfit:root6 into master 2018-08-18 14:18:06 +02:00
salman ef653c11b2 Resolve conflict from Jonas' commits 2018-08-18 14:17:41 +02:00
suter_a 8ab2687e17 added some more necessary paths. 2018-08-17 20:55:04 +02:00
JAK 97d6a495a1 cmake should now also work on MacOS. 2018-08-17 14:57:36 +02:00
JAK 7d5429b5e3 Removed class MLRes from libBNMR. It wasn`t implemented. 2018-08-17 12:56:01 +02:00
JAK 9c73880b8b Updated docu in LineProfile.pdf. 2018-08-17 11:08:22 +02:00
JAK 12d36cc91b Updated docu in LineProfile.pdf. 2018-08-17 10:56:28 +02:00
JAK c19d1f473a The line shape width is now the correct FWHM. 2018-08-17 10:49:06 +02:00
Zaher Salman b044d97a55 More work towards implementation of beta-NMR asymmetry calculation 2018-08-16 23:17:39 +02:00
suter_a 4b2133bbca Added CMake files for libLineProfile. 2018-08-16 13:09:02 +02:00
Zaher Salman 3cdf3d356e Optimization and clean up 2018-08-15 20:17:13 +02:00
JAK 5ec5c0be40 Added libLineProfile and integrated it into automake. 2018-08-15 16:35:02 +02:00
Jonas A. Krieger 32f8535926 Speed up of SExpRlx by a factor of ~5 by using static TF1s. Might not be thread save. 2018-08-15 14:51:51 +02:00
Jonas A. Krieger e73ded0078 Cleaned up libBNMR a bit. 2018-08-15 10:38:21 +02:00
Zaher Salman 379b7c5206 Merged muonspin/musrfit:root6 into master 2018-07-11 15:20:46 +02:00
suter_a 8494ca71db allow the exponent for the temperature evolution for lambda to be set. If not given, the two fluid exponent 4 will be chosen. 2018-07-11 13:39:58 +02:00
Zaher Salman b56e5adce6 Merged muonspin/musrfit:root6 into master 2018-07-05 13:30:32 +02:00
suter_a 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 7f8e58b28c Merged muonspin/musrfit:root6 into master 2018-06-12 15:48:41 +02:00
suter_a 89b7eb8faa cmake: add the forgotten OpenMP flags and libs. 2018-06-09 21:13:58 +02:00
Zaher Salman 0593f7c150 Merged muonspin/musrfit:root6 into master 2018-06-09 10:18:16 +02:00
suter_a 41a5e493eb cmake: added missing include path when generating the dictionary. 2018-06-06 17:39:00 +02:00
suter_a f987776d41 cmake: cuba needs a -fPIC flag explicitly, otherwise it doesn't link with all compilers. 2018-06-06 17:06:42 +02:00
suter_a 4a881fad56 cleaned up signed/unsigned int issues. 2018-06-06 16:04:27 +02:00
suter_a 342da696db cmake: got rid of target_compile_options which are better controlled by the build type. 2018-06-06 13:09:39 +02:00
suter_a 5c03c229dc Merge branch 'root6' of https://git.psi.ch/nemu/musrfit into root6 2018-06-06 13:00:19 +02:00
suter_a a756a2def4 cmake: got rid of target_compile_options which are better controlled by the build type. 2018-06-06 12:59:18 +02:00
suter_a 92f230e220 fixed a bug when compiling with -DNDEBUG 2018-06-06 12:56:27 +02:00
suter_a e4d56519b2 cmake: added optimization and at the same time added the beta-NMR lib. 2018-06-05 19:12:35 +02:00
suter_a 99e8eb9769 cmake: added library version information to the targets. 2018-06-02 12:41:13 +02:00
suter_a b71455da66 cmake: added -fPIC to the compiler options when building libCuba. 2018-05-25 07:26:48 +02:00