100 Commits

Author SHA1 Message Date
a17abc952b changed default behavior. Now musredit will create a musredit_startup.xml default file at run-time if none is found. 2017-02-15 09:32:58 +01:00
421fe729f8 resolved merge conflict. 2016-12-19 12:13:35 +01:00
dce31426a7 increased the version number form 0.17.0 to 0.18.0 2016-12-18 10:43:53 +01:00
41c21cb446 some further improved fine tuning needed to make sure that the NeXus library is indeed found. 2016-08-17 09:00:36 +02:00
aae5762f7c yet another improvement for the new git-based NeXus versions >= 4.4 2016-08-17 08:27:13 +02:00
68a788c3c7 some fine tuning needed to make sure that the NeXus library is indeed found. 2016-08-16 07:44:54 +02:00
2f0b65f816 some fine tuning needed to make sure that the NeXus library is indeed found. 2016-08-15 16:53:12 +02:00
e95bee2c41 Merge branch 'master' into root6 2016-08-10 12:49:24 +02:00
08848e68a8 drop NeXus support for Version < 4.4 2016-08-10 10:28:31 +02:00
b1ba14ec76 Merge branch 'master' into root6 2016-03-15 09:52:07 +01:00
e0e4a1e17e added user function for GbG LF 2016-03-14 11:30:06 +01:00
fe4c0ddede Merge branch 'master' into root6 2016-02-17 13:10:13 +01:00
352ac5db21 install default XML startup files under /home/nemu/.musrfit rather than /bin. Since this is a substantial indentation, the version number has been incremented. 2016-02-17 12:59:03 +01:00
e8b0b002d8 Merge branch 'master' into root6 2016-01-23 09:49:33 +01:00
a35884b86c merge the devel-rrf branch into the master branch 2016-01-22 15:39:32 +01:00
53a18397c9 merge master into root6 2015-10-27 14:34:33 +01:00
6433585d3b incorporate musredit_qt5 into the automake framework 2015-10-27 14:24:44 +01:00
suter_a
e10c0281a0 Merge branch 'master' into root6 2015-06-25 12:14:59 +02:00
e78619c33b another path check for HDF5 with ubuntu 15.04 2015-05-15 14:29:14 +02:00
8a371e1b6e merging master with root6 branch 2015-02-20 13:51:26 +01:00
a310c36a70 Merge branch 'master' of https://bitbucket.org/zaher-salman/musrfit 2015-02-20 12:32:49 +01:00
7be8b4c2ea add a switch to musrview that it plots initially the Fouier data rather than the time domain data. 2015-02-20 12:22:24 +01:00
68b071ec2e Fixed compilation problem with fftw3 and added fake automake files to musredit and musrgui. 2015-02-19 17:08:16 +01:00
1f44fe33c1 libBNMR is now fully integrated into automake 2015-02-04 09:34:05 +01:00
b7bd3c286e Include libBNMR in standard configuration and automake (still not fully working). 2015-01-29 13:46:26 +01:00
46864e7942 added the additional CXXFLAGS for ROOT6 2015-01-19 08:33:43 +01:00
a467553bd1 adding a branch for ROOT 6.x. This needs some minor adaptations due to the new rootcint/rootclang and the stricter c++11. 2015-01-17 15:31:52 +01:00
11ea9f5457 'final' changes towards a to-be-tested GLOBAL block implementation 2014-12-18 15:42:16 +01:00
5b72d622b5 added average view option and 'Tesla' unit in FOURIER. Updated docu 2014-12-04 10:40:16 +01:00
76f39229f4 added new internal field functions. 2014-02-07 17:03:06 +01:00
2818739ec6 upgrade of cuba to version 3.2. Merge in from BMW. 2013-12-20 09:58:23 +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
b737649b50 newly added: a library related to spin valve physics 2013-01-15 06:41:12 +00:00
1d6f8082f0 newly added dump_header, which dumps the header information of a muSR data file. Furthermore some minor cleanup took place. 2012-05-12 14:08:27 +00:00
99c24a146d added negative muon fitting support. Fixed at the same time bugs related to logx/logy plotting. Allow now comments after functions in the FUNCTION block. 2012-04-24 10:52:20 +00:00
3a0715b3ed fix of a wrong variable 2012-04-02 05:03:04 +00:00
6d374b89e3 improved libxml2 check 2012-03-30 13:52:29 +00:00
5db90af1dc added a validator program (musrRootValidation) for MusrRoot files. 2012-03-28 07:48:36 +00:00
138e7ba369 first implementation of MusrRoot. Cleaner handling of Red/Green mode data. General cleanup 2012-03-22 07:00:34 +00:00
7f65a27d1e changed Qt parts of configure.ac in order to be compatible with BSD MacOS X 2011-12-23 06:19:43 +00:00
Bastian M. Wojek
83578df2ce Tell the user that QtWebKit or QtXml have not been found (even though parts of Qt4 might be present) 2011-08-31 15:07:10 +00:00
Bastian M. Wojek
e5c673dda2 Ask the user if an installed musrfit_startup.xml should be overwritten if it has changed compared to the distribution's version 2011-08-31 14:43:14 +00:00
Bastian M. Wojek
84467eae96 Pass the compiler information from the configure script to the musredit/musrgui configuration 2011-08-29 10:32:47 +00:00
Bastian M. Wojek
b74a98c71c Fix a small bug in the musrfit configure script 2011-08-28 13:28:05 +00:00
Bastian M. Wojek
d201408728 Fixed a small dash incompatibility; there might be more bashisms out there---more testing is needed. 2011-08-27 12:47:37 +00:00
Bastian M. Wojek
ac421a6f2c Small fix to get the editor installation directory correctly 2011-08-27 11:27:56 +00:00
Bastian M. Wojek
34cf836455 Tried to improve the qmake detection 2011-08-27 10:49:42 +00:00
Bastian M. Wojek
da9c6cda70 Integrated building and installing the Qt editor into the musrfit installation.
At the moment this is done in the simple way that qmake is called from the configure script.

Since there is not really a straightforward way to look for Qt installations at certain paths,
the automatic determination of the available Qt version is only done through pkg-config.
In case Qt is found at non-standard installation paths, one can either use the configure options
"--with-qt3" or "--with-qt4" to specify the Qt directory or alternatively set the variable
PKG_CONFIG_PATH to some value like
/usr/lib/pkgconfig:/usr/local/lib/pkgconfig:$ROOTSYS/lib/pkgconfig:/opt/qtsdk-2010.02/qt/lib/pkgconfig

During the installation only one editor---either musredit or musrgui---is built and installed.
musredit/Qt4 is generally preferred over musrgui/Qt3.
The only way to install musrgui when also a sufficent Qt4 installation is present is to specify solely
the "--with-qt3" option on the configure level. If additionally the "--with-qt4" option is given, only
musredit will be installed.

Both editors still can be installed as previously---this step is merely to make the installation more
convenient for less-experienced users (hopefully).
2011-08-26 18:11:22 +00:00
Bastian M. Wojek
d16aef5ef0 Install the musrfit documentation locally and adjust the paths in musredit_startup.xml at configure time 2011-08-06 19:55:16 +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