diff --git a/doc/html/user/MUSR/MusrFitSetup.html b/doc/html/user/MUSR/MusrFitSetup.html index 94d6e277b..0fe0c9e8f 100644 --- a/doc/html/user/MUSR/MusrFitSetup.html +++ b/doc/html/user/MUSR/MusrFitSetup.html @@ -1,7 +1,7 @@ - +
@@ -21,7 +21,7 @@ - +musrfit should s
If optionally the editor and graphical user interface musrgui / musredit is going to be installed there is one further requirement: musrgui) OR ≥ 4.6 (musredit)
+musrgui) OR ≥ 4.6 (musredit)
musrfit on the different operating systems will also give a brief introduction on the installation of the requirements before the actual musrfit installation is described.
@@ -234,7 +234,7 @@ Even though there might exist binary packages for the NeXus library
The ROOT system may or may not be part of the GNU/Linux distribution. If it is, it should be checked that the provided binaries are of a recent version and then these in principle can be installed using a package manager as described above. ROOT web page and download the packed precompiled binary version matching best the GNU/Linux distribution. Then unpack the bundle to its final destination.
-ROOT available for your system or e.g. ROOT should be compiled with another version of GCC visit the web page and download the 'complete source tree for all systems'. Then unpack this source tree to its destination (e.g. /opt/root-system)(1), configure(2) it (here using the minimal set of options) and compile it as follows right below: +
ROOT available for your system or e.g. ROOT should be compiled with another version of GCC visit the web page and download the 'complete source tree for all systems'. Then unpack this source tree to its destination (e.g. /opt/root-system)(1), configure(2) it (here using the minimal set of options) and compile it as follows right below:
cd /opt/root-system
./configure linux --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
(or in case of a 64 bit installation: ./configure linuxx8664gcc --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml)
@@ -283,6 +283,10 @@ After the source-code extraction the autogen.sh script is calle
HDF4 installation, e.g. /usr/local (only useful in conjunction with the NeXus support)
HDF5 installation, e.g. /usr (only useful in conjunction with the NeXus support)
NeXus installation, e.g. /usr/local (only useful in conjunction with the NeXus support)
+Qt3 installation, e.g. /usr/lib/qt-3.3 (only useful in conjunction with building musrgui)
+Qt4 installation, e.g. /usr/lib/qt47 (only useful in conjunction with building musredit)
+NeXus data files (requires the HDF4, HDF5 and NeXus libraries to be installed).
+musredit/musrgui.
musrfit (parallelization of the χ2 calculation when compiled with GCC ≥ 4.2)
musredit Qt4.6 or higher is set up on the machine the installation of the musrfit editor is also straight forward:
+In the latest version of musrfit the configure script tries to determine automatically if Qt4.6 or higher is set up on the machine. In case this is found, the editor musredit is built already together with musrfit. If not, one can either try to call the configure script with the "--with-qt4" option or install this editor separately:
cd src/musredit qmake musredit.pro @@ -454,6 +458,10 @@ After the source-code extraction the autogen.sh script is calle
HDF4 installation, e.g. /usr/local (only useful in conjunction with the NeXus support)
HDF5 installation, e.g. /usr (only useful in conjunction with the NeXus support)
NeXus installation, e.g. /usr/local (only useful in conjunction with the NeXus support)
+Qt3 installation, e.g. /usr/lib/qt-3.3 (only useful in conjunction with building musrgui)
+Qt4 installation, e.g. /usr/lib/qt47 (only useful in conjunction with building musredit)
+NeXus data files (requires the HDF4, HDF5 and NeXus libraries to be installed).
+musredit/musrgui.
musrfit (parallelization of the χ2 calculation when compiled with GCC ≥ 4.2)
musrfit the paths where musredit Qt4.5 is set up on the machine the installation of the musrfit editor is also straight forward:
+In the latest version of musrfit the configure script tries to determine automatically if Qt4.5 or higher is set up on the machine. In case this is found, the editor musredit is built already together with musrfit. If not, one can either try to call the configure script with the "--with-qt4" option or install this editor separately:
cd src/musredit qmake-qt4 musredit.pro @@ -725,6 +733,10 @@ After the source-code extraction the autogen.sh script is calle
HDF4 installation, e.g. /sw (only useful in conjunction with the NeXus support)
HDF5 installation, e.g. /sw (only useful in conjunction with the NeXus support)
NeXus installation, e.g. /usr/local (only useful in conjunction with the NeXus support)
+Qt3 installation, e.g. /opt/local/lib/qt-3.3 (only useful in conjunction with building musrgui)
+Qt4 installation, e.g. /opt/local/lib/qt-4.7 (only useful in conjunction with building musredit)
+NeXus data files (requires the HDF4, HDF5 and NeXus libraries to be installed).
+musredit/musrgui.
musrfit (parallelization of the χ2 calculation when compiled with GCC ≥ 4.2)
musrfit the paths where musredit Qt4.6 or higher is set up on the machine the installation of the musrfit editor is also straight forward:
+In the latest version of musrfit the configure script tries to determine automatically if Qt4.5 or higher is set up on the machine. In case this is found, the editor musredit is built already together with musrfit. If not, one can either try to call the configure script with the "--with-qt4" option or install this editor separately:
cd src/musredit qmake musredit.pro @@ -794,7 +806,7 @@ musrview test-histo-ROOT-NPP.msr
This topic: MUSR > WebHome > MusrFit > MusrFitSetup
-Topic revision: r47 - 07 Aug 2011 - 16:10:00 - BastianWojek +Topic revision: r50 - 28 Aug 2011 - 11:56:04 - BastianWojek @@ -810,6 +822,6 @@ Topic revision: r47 - 07 Aug 2011 - 16:10:00 - \ No newline at end of file diff --git a/src/external/nexus/PNeXus.cpp b/src/external/nexus/PNeXus.cpp index 62aaf6885..86ab990f6 100644 --- a/src/external/nexus/PNeXus.cpp +++ b/src/external/nexus/PNeXus.cpp @@ -1648,7 +1648,7 @@ vector* PNeXus::GetGroupedHisto(unsigned int idx) * Read the NeXus file 'fileName'. * * return: - * - NX_OK on successfull reading + * - NX_OK on successful reading * - NX_ERROR on error. The error code/message will give the details. * * \param fileName file name of the nexus file to be read @@ -2555,7 +2555,7 @@ int PNeXus::ReadFileIdf1() attlen = VGNAMELENMAX - 1; atttype = NX_CHAR; - status = NXgetattr(fFileHandle, "units", data_value, &attlen, &atttype); + status = NXgetattr(fFileHandle, const_cast
("units"), data_value, &attlen, &atttype); if (status == NX_OK) { for (i = 0; i < attlen; i++) cstr[i] = *(data_value + i);