Commit Graph

958 Commits

Author SHA1 Message Date
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
nemu 928e067f36 some more work on PSI-ROOT 2011-08-31 13:19:07 +00:00
nemu 956fd23a10 some more work on PSI-ROOT 2011-08-31 12:36:26 +00:00
salman b4728250d7 Option to use msr2data to create global fit msr file. Still not complete. 2011-08-30 14:31:05 +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 a3bfa4e70b Minor documentation update 2011-08-28 10:00:40 +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
nemu cac1b33085 some more stuff towards PSI-ROOT 2011-08-26 14:44:07 +00:00
suter_a db5d877e11 fixed memory leak 2011-08-23 18:27:11 +00:00
nemu 03b9fe1e71 added minimal NeXus IDF 2 support. 2011-08-23 17:22:29 +00:00
nemu b67a19d406 changed label 'Power Fourier' to 'Ampl. Fourier' 2011-08-11 06:51:28 +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
suter_a a05a6c86a8 added '-f' when linking under MacOSX 2011-08-08 21:31:58 +00:00
Bastian M. Wojek 68183eea63 Updated the musrfit documentation concerning the changes in the doc/ directory 2011-08-07 15:11:06 +00:00
Bastian M. Wojek 6536835197 Make the configuration of musrfit a prerequisite for installing musredit/musrgui 2011-08-06 20:23:30 +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 254d849079 First step in reorganizing the installation of the musrfit documentation (further commits will follow) 2011-08-06 09:51:21 +00:00
Bastian M. Wojek 4490f103f3 Finally (hopefully) fixed the run-list-file interface of musrgui/musredit to msr2data (MUSR-202) 2011-08-03 09:16:47 +00:00
Bastian M. Wojek 09c810b461 Added the online documentation of musrfit to the repository. 2011-08-01 13:30:41 +00:00
Bastian M. Wojek c78c9cc3dd FIXED broken run-list interface to msr2data in musredit/musrgui (MUSR-202) 2011-07-31 09:43:05 +00:00
Bastian M. Wojek 0e14ec3e42 Fixed another small bug in msr2data (non-existing run-list files led to segmentation faults) 2011-07-31 09:22:08 +00:00
Bastian M. Wojek 61fd5fa948 Adjusted msr2data that it works together with the NeXus reading routine which explicitly writes the ring-anode vector 2011-07-31 07:39:52 +00:00
Bastian M. Wojek bff5b6c043 Fixed some severe problems in the run-number-digit determination of msr2data introduced in late 2010 2011-07-30 22:05:57 +00:00
Bastian M. Wojek 13410aa97c Small fix for msr-file paths with spaces and strange characters 2011-07-30 15:03:39 +00:00
Bastian M. Wojek a6d10e11e3 Switch from the PSI icon to the musrfit icon on the web page 2011-07-27 15:02:17 +00:00
nemu 58a79084b1 added per run block chisq output 2011-07-25 07:35:29 +00:00
nemu 2a4f5bf78a changed musredit/musrgui msr2data interface such that it is hopefully closer to the command line (MUSR-162, MUSR-173) 2011-07-15 05:43:41 +00:00
nemu 5672c43d2e improved token handling 2011-07-13 14:32:14 +00:00
Bastian M. Wojek 1e115c7bd3 Slightly changed the behavior of msr2data (see ChangeLog for details) 2011-07-13 13:37:28 +00:00
Bastian M. Wojek fa02394364 Set the initial data and t0 bins in the tutorial test file to 1. 2011-07-12 12:41:46 +00:00
nemu 9c3ec29d85 implemented the dummy ExtractHeaderInformation method 2011-07-12 12:39:24 +00:00
nemu d0f520a1f4 a musrview exception error when starting with t0's very much off to the positive side in the msr-file (MUSR-199) 2011-07-12 07:17:38 +00:00
nemu 822a0bf0b7 in case first good bin (fgb) is not given, it is now fgb=t0+(10ns/time resolution) (MUSR-190) 2011-07-11 18:42:47 +00:00
nemu d9f1f1235e added expected chisq calculation for single histogram fits (MUSR-194) 2011-07-09 16:26:42 +00:00
nemu 0ab456e5f5 added a dummy header extraction routine 2011-07-09 16:24:09 +00:00
Bastian M. Wojek b27f697279 Added another test file for the interested user 2011-07-09 15:05:56 +00:00
nemu 2951d2fad2 a mockup PSI Run Header without custom class objects in the root file 2011-07-05 15:58:45 +00:00
nemu a9ceae63a0 improved handling of 'old' ROOT LEM data files (2006 and earlier) for any2many (MUSR-178) 2011-06-29 06:33:03 +00:00
nemu 3243d26ef1 improved handling of WKM/ASCII in PRunDataHandler for any2many (MUSR-172) 2011-06-28 18:06:29 +00:00
nemu 79a856483b slightly improved handling of the musredit_startup.xml on MacOS X platforms 2011-06-25 19:49:26 +00:00
Bastian M. Wojek b55f18289e Fixed the order in which libPMusr and libPUserFcnBase are built 2011-06-24 08:59:31 +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 e244d2093a Tried to improve the determination of the musredit/musrgui installation path (in case ROOTSYS is not set). If no path is specified using PREFIX and neither MUSRFITPATH nor ROOTSYS is set, the default path at the moment is /usr/local/bin even though I am not sure that this is the best choice... 2011-06-15 11:23:09 +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 f75194750c Prevent crash when a non-existing userFcn is called from an existing library (MUSR-159) 2011-06-14 13:15:09 +00:00