52 Commits

Author SHA1 Message Date
e8982410b0 adopted to the enforced changes by root 6.18.00. 2019-07-01 21:56:50 +02:00
795cd75b1e modernized code to C++11 and newer.
This allows to analyze the code by external code analyzers. Since a lot is adopted,
the version is changed to 1.4.3
2019-04-16 15:34:49 +02:00
dbfeeddf3f Remove automake support
Since the cmake tool chain is now stable, the automake tool chain is removed from musrfit.
This makes documentation and code less cluttered.
2019-03-08 12:50:41 +01:00
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
55b5788506 added MODULE to root_generate_dictionary in order to get the proper name scheme. 2018-06-28 13:17:43 +02:00
89b7eb8faa cmake: add the forgotten OpenMP flags and libs. 2018-06-09 21:13:58 +02:00
342da696db cmake: got rid of target_compile_options which are better controlled by the build type. 2018-06-06 13:09:39 +02:00
e4d56519b2 cmake: added optimization and at the same time added the beta-NMR lib. 2018-06-05 19:12:35 +02:00
99e8eb9769 cmake: added library version information to the targets. 2018-06-02 12:41:13 +02:00
9fd077cf6d corrections for the needed linked libraries. 2018-05-14 14:54:19 +02:00
c640e8719f cmake: added missing paths for rootcling for the BMW libs. 2018-05-08 17:58:57 +02:00
e578072469 added cmake support for BMW lib libLFRelaxation. 2018-05-08 16:30:16 +02:00
5908d8791a back from __CLING__ to __CINT__ since the ROOT guys kept __CINT__ even though they are using cling?\! 2017-02-08 10:45:17 +01:00
ceb7aa6818 changed from legacy rootcint to the new rootcling ROOT dictionary generator. 2017-02-08 09:47:35 +01:00
5e28f465a4 replace all __CINT__ by __CLING__. 2017-02-07 16:08:52 +01:00
4fd610442d improved the CLEANFILES for ROOT6. 2015-10-28 13:56:16 +01:00
fec752182b added all ROOT6 .pcm files for installation 2015-01-17 17:53:17 +01:00
bbb8550f96 since we moved to git, I cleaned up the svn prop's from the sources and added a GIT_REVISION through git-revision.h 2014-02-12 12:43:32 +01:00
1e6f1c45be fixed missing replacement of INCLUDES 2013-12-19 11:53:30 +00:00
290816f996 upgrading Makefile.am's for more recent automake versions 2013-12-16 14:08:39 +00:00
f51152c4a3 config level fix for Mac OS X 10.9 (Mavericks). Optimize Noakes-Kalvius formulae. Update of docu. 2013-12-16 07:54:46 +00:00
59eed0d84f added a workaround for gcc 4.6 higher, fftw 3.3 or higher and root 5.30.03 or lower. The problem is rootcint which doesn't know __float128 2011-10-26 13:15:42 +00:00
Bastian M. Wojek
9398badf66 Added the '-f' option also to the creation of symbolic links to the user-function libraries under Cygwin 2011-08-09 09:27:14 +00:00
a05a6c86a8 added '-f' when linking under MacOSX 2011-08-08 21:31:58 +00:00
Bastian M. Wojek
caa3fdfc12 * Define a function for the XML-reading workaround in order to clean up a bit.
For the moment we keep to copies of it -- one for the use within the various
  musrfit programs, one that can be used in user functions.

* musrt0 is now again activated in musrgui/musredit by default.
2011-06-23 11:00:09 +00:00
Bastian M. Wojek
dc48ea9712 * Suggestion how to "solve" the XML-reading problems in certain environments:
A workaround has been implemented where it is not tried any more to "directly
  parse the file" but rather the file is read into a memory buffer which then
  is parsed.
  For further information, see MUSR-122.

* Fixed a linking problem when only shared libraries are built on Cygwin
  (introduced with the split-off of libPUserFcnBase).
2011-06-16 22:00:33 +00:00
Bastian M. Wojek
8dc31cad54 Fixed crash of musrview in case the XML startup file is present but cannot be parsed correctly 2011-06-14 17:53:33 +00:00
Bastian M. Wojek
02d5784b68 Commit of some improvements when running under Cygwin
* musredit can now be built using Qt 4.5.3 of Cygwin 1.7---however, without online help
* FFTW3 threading in some user functions has been disabled

Obviously, there is a major problem when running musrgui/musredit with Cygwin on Windows7/64bit.
This has not been solved by this commit!
2011-06-07 09:15:24 +00:00
Bastian M. Wojek
a467ca9bcb libLFRelaxation functions usable again 2011-06-03 11:28:26 +00:00
Bastian M. Wojek
a427157180 Added Solt's ZF depolarization function to the libZFRelaxation
While doing that I realized that all LF functions within libLFRelaxation cannot be used at the moment
with a parallelized musrfit installation. Therefore, the built-in functions should be used for now.
One day this should be fixed ...
2011-06-02 15:36:43 +00:00
Bastian M. Wojek
0191375a96 The previous approach did not work...
Needed to split off the userFcn part from libPMusr to be able to provide a shared library of it (under Cygwin).
2011-04-13 09:59:33 +00:00
Bastian M. Wojek
1024f5a28f Removed the user-function dependency on libPMusr
It should now be possible to build a static version of musrfit and shared libraries for the user functions.
This is needed on systems which do not support linking static libraries to shared ones (like Cygwin).
These changes still need to be tested on Cygwin, especially with user functions implementing the "global interface".
2011-04-13 08:18:14 +00:00
Bastian M. Wojek
56799142dc Restructured the interdependencies within the BMWlibs (maybe other commits will follow) 2011-03-21 14:33:34 +00:00
Bastian M. Wojek
aaa0638729 Restructured the interdependencies within the BMWlibs (maybe other commits will follow) 2011-03-20 18:03:49 +00:00
Bastian M. Wojek
2d2cf448db Trying to tie the same startup handler into different plugin libraries did not work quite well.
Therefore, a new library is built and the plugins link to that one.
This new library at the moment only contains the startup handler, however, finally it might serve as well for other routines
that are used by different plugins.
2011-03-19 11:44:56 +00:00
Bastian M. Wojek
032ce4a1e4 - Extended the usage of xml-startup files in some plugin libraries and renamed the file itself.
- Added some documentation to libLFRelaxation which in the present stage is mainly used for testing purposes.
2011-03-16 16:43:13 +00:00
Bastian M. Wojek
233ca10dff - Removed the extensions of the external libraries in the test files.
ROOT is anyway checking multiple extensions for dynamic libraries, therefore leaving them out yields platform-independent msr files.

- Minor changes in libTFitPofB

- Added a user function for Uemura's ZF/LF dynamical spin-glass relaxation function
  see, e.g. Y.J. Uemura et al., Phys. Rev. B 31, 546-563 (1985)
  or Y.J. Uemura, Hyperfine Interact. 8, 739 (1981)

  This yields an overall Lorentzian field distribution with motional narrowing.
  However, the present implementation is at best some design study:
  The Lorentzian distribution of width "a" is modeled by Gaussian distributions of widths "sigma" from 0 to infinity.
  Some "resonable cut-offs" would be: 0.1*a < sigma < 10000*a
  Due to finite memory and computing power, in the present version these cut-offs are: 0.1*a < sigma < 40*a
  This yields depolarization functions overall similar to those in Uemura's articles.
  However, due to the low cut-off the first derivative of the depolarization function is zero in the limit t->0
  (what should not be the case for a true Lorentzan).
  Furthermore, the calculation is rather slow and the resulting functions should only be regarded as crude approximations.
  Therefore, at the moment this is far from being of practical use in analyzing experimental data.
2011-03-12 21:13:51 +00:00
nemu
f4d6e349fe added the option to split a user function into a global and run-block related part (see MUSR-134) 2010-11-10 13:13:00 +00:00
Bastian M. Wojek
7536ca6fc6 Submission of a few minor changes of the last time 2010-07-29 09:25:16 +00:00
Bastian M. Wojek
440d22bc99 * Changed the exit condition for a few external classes in case the xml-file is not found.
Until now the program terminated with a segmentation fault which was not very user friendly...

* Got rid of a strange construction in the TRIM.SP handler (vector<pair> -> map)
2010-06-20 10:34:49 +00:00
Bastian M. Wojek
74fd4d8538 A few changes to the previous commit. Basic features should work now everywhere (MUD only 32bit) 2010-01-10 22:20:10 +00:00
Bastian M. Wojek
ed7a15f025 Further steps to OS independence (at least Linux, Mac OS X, Cygwin) of musrfit 2010-01-10 12:52:14 +00:00
Bastian M. Wojek
199ff918f0 Nicer solution for fftw3_threads 2009-12-27 15:26:11 +00:00
nemu
19dee34c22 Workaround for a problem with FFTW3 threads in some external plugins... needs to be really fixed at some point. 2009-12-23 13:28:49 +00:00
Bastian M. Wojek
a6959ea2fc Integrated a few external musrfit plug-ins into the standard build process.
In order to enable building of the additional libraries supply the following options to the configure script:

--enable-BMWlibs (for libTFitPofB libLFRelaxation libGapIntegrals libCalcMeanFieldsLEM)
--enable-ASlibs (for libPNL_PippardFitter)

By default, both options are disabled.

At the moment I have tested it only in an SL5 32-bit environment.
Further tests are going to follow.

For a clean installation I suggest to remove any musrfit and plug-in installations before newly building musrfit.
2009-12-22 17:00:43 +00:00
Bastian M. Wojek
9af5f415f7 Change compiler and linker in the Makefile 2009-10-21 11:12:28 +00:00
Bastian M. Wojek
68092aad6b As always forgot some files... 2009-10-17 19:19:07 +00:00
Bastian M. Wojek
ccaba04d51 Fixed a Bessel-function-bug in the class calculating LF relaxation functions through Laplace transforms 2009-10-17 19:14:10 +00:00
Bastian M. Wojek
e3ac790371 PSIBIN-changes... 2009-09-20 11:35:01 +00:00
Bastian M. Wojek
f9971d4858 Added semi-analytical approximations to the dynamical Lorentz LF class. 2009-02-04 15:07:45 +00:00