From d16aef5ef03abafe63082631a720f27a093bd882 Mon Sep 17 00:00:00 2001 From: "Bastian M. Wojek" Date: Sat, 6 Aug 2011 19:55:16 +0000 Subject: [PATCH] Install the musrfit documentation locally and adjust the paths in musredit_startup.xml at configure time --- Makefile.am | 40 +++++++++++++ configure.ac | 30 +++++++++- .../templates}/asymDefault.msr | 0 .../templates}/singleHistoDefault.msr | 0 ...it_startup.xml => musredit_startup.xml.in} | 30 +++++----- src/musrgui/asymDefault.msr | 59 ------------------ ...gui_startup.xml => musrgui_startup.xml.in} | 10 ++-- src/musrgui/singleHistoDefault.msr | 60 ------------------- 8 files changed, 88 insertions(+), 141 deletions(-) rename {src/musredit => doc/templates}/asymDefault.msr (100%) rename {src/musredit => doc/templates}/singleHistoDefault.msr (100%) rename src/musredit/{musredit_startup.xml => musredit_startup.xml.in} (76%) delete mode 100644 src/musrgui/asymDefault.msr rename src/musrgui/{musrgui_startup.xml => musrgui_startup.xml.in} (94%) delete mode 100644 src/musrgui/singleHistoDefault.msr diff --git a/Makefile.am b/Makefile.am index 1c2930f1..a0467d7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,3 +3,43 @@ SUBDIRS = src EXTRA_DIST = autogen.sh acinclude.m4 + +# The following is to install the documentation +# It is a bit lengthy because one cannot simply install whole directories (except copying them recursively -- which also takes the .svn directories...) +DOCDIRS = templates \ + examples \ + examples/data \ + examples/ASlibs \ + examples/ASlibs/data \ + examples/ASlibs/profiles \ + examples/BMWlibs \ + examples/BMWlibs/data \ + examples/BMWlibs/profiles \ + html/user \ + html/user/MUSR \ + html/user/pub/Main/SmiliesPluginPSI \ + html/user/pub/Main/WebPreferences \ + html/user/pub/MUSR/LibFitPofB \ + html/user/pub/MUSR/LibZFRelaxation \ + html/user/pub/MUSR/Msr2Data \ + html/user/pub/MUSR/MusrFit \ + html/user/pub/MUSR/MusrGui \ + html/user/pub/MUSR/QuickStart \ + html/user/pub/MUSR/TutorialSingleHisto \ + html/user/pub/System/DocumentGraphics \ + html/user/pub/System/HeadlinesPlugin \ + html/user/pub/System/PatternSkin \ + html/user/pub/System/PatternSkinTheme2009 \ + html/user/pub/System/PsiSkin \ + html/user/pub/System/SkinTemplates + #html/technical + +install-data-hook: + @$(NORMAL_INSTALL) + for DIR in $(DOCDIRS); do $(MKDIR_P) $(DOCDIR)/$$DIR; $(INSTALL_DATA) doc/$$DIR/*.* $(DOCDIR)/$$DIR; done + $(MKDIR_P) $(DOCDIR)/latex_images + $(INSTALL_DATA) src/musredit/latex_images/*.png $(DOCDIR)/latex_images + +uninstall-hook: + @$(NORMAL_UNINSTALL) + rm -rf $(DOCDIR) diff --git a/configure.ac b/configure.ac index 0af70d0f..b189a41f 100644 --- a/configure.ac +++ b/configure.ac @@ -189,6 +189,11 @@ AC_LANG([C++]) AC_PROG_LN_S AC_PROG_INSTALL +m4_ifdef([AC_PROG_MKDIR_P], + [AC_PROG_MKDIR_P], + [MKDIR_P="mkdir -p" + AC_SUBST(MKDIR_P)]) + m4_ifdef([LT_INIT], [LT_INIT([disable-static]) LT_LANG([C++]) @@ -721,7 +726,7 @@ dnl ----------------------------------------------- AC_ARG_ENABLE([omp], [AC_HELP_STRING([--enable-omp],[build musrfit with OpenMP support [default=yes]])]) -if test x"$enable_omp" != xno; then +if test "x$enable_omp" != "xno"; then SAVED_CXXFLAGS="$CXXFLAGS" CXXFLAGS="$CXXFLAGS -fopenmp" SAVED_LIBSS="$LIBS" @@ -807,6 +812,25 @@ dnl ----------------------------------------------- #AC_FUNC_STAT #AC_CHECK_FUNCS([floor gettimeofday memset pow sqrt strstr]) +dnl ----------------------------------------------- +dnl Determine the installation directory for the documentation +dnl ----------------------------------------------- + +if test "x${prefix}" = "xNONE" +then + INSTALLDIR="/usr/local" +else + INSTALLDIR="${prefix}" +fi + +if test -d "${INSTALLDIR}/doc" +then + DOCDIR="${INSTALLDIR}/doc/musrfit" +else + DOCDIR="${INSTALLDIR}/share/doc/musrfit" +fi + +AC_SUBST(DOCDIR) dnl ----------------------------------------------- dnl Specify the files that are going to be created by configure @@ -847,6 +871,8 @@ AC_CONFIG_FILES([Makefile \ src/external/libGapIntegrals/Makefile \ src/external/libCalcMeanFieldsLEM/Makefile \ src/external/Nonlocal/Makefile \ - src/external/MagProximity/Makefile]) + src/external/MagProximity/Makefile \ + src/musredit/musredit_startup.xml \ + src/musrgui/musrgui_startup.xml]) AC_OUTPUT diff --git a/src/musredit/asymDefault.msr b/doc/templates/asymDefault.msr similarity index 100% rename from src/musredit/asymDefault.msr rename to doc/templates/asymDefault.msr diff --git a/src/musredit/singleHistoDefault.msr b/doc/templates/singleHistoDefault.msr similarity index 100% rename from src/musredit/singleHistoDefault.msr rename to doc/templates/singleHistoDefault.msr diff --git a/src/musredit/musredit_startup.xml b/src/musredit/musredit_startup.xml.in similarity index 76% rename from src/musredit/musredit_startup.xml rename to src/musredit/musredit_startup.xml.in index 576ebc57..b981bdb4 100644 --- a/src/musredit/musredit_startup.xml +++ b/src/musredit/musredit_startup.xml.in @@ -1,28 +1,28 @@ - $Id$ + $Id: musredit_startup.xml 4949 2011-07-15 05:43:41Z nemu $ This is handling default setting parameters for the musredit. - $ROOTSYS/bin + @prefix@/bin ./ - $HOME/analysis/musrfit/src/musredit + @DOCDIR@/templates y y - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheTitle - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheFitparameterBlock - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheTheoryBlock - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheFunctionsBlock - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheRunBlock - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheCommandsBlock - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheFourierBlock - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#ThePlotBlock - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheStatisticBlock - http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/Msr2Data.html + file://@DOCDIR@/html/user/MUSR/MusrFit.html + file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTitle + file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFitparameterBlock + file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTheoryBlock + file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFunctionsBlock + file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheRunBlock + file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheCommandsBlock + file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFourierBlock + file://@DOCDIR@/html/user/MUSR/MusrFit.html#ThePlotBlock + file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheStatisticBlock + file://@DOCDIR@/html/user/MUSR/Msr2Data.html Courier @@ -47,7 +47,7 @@ n n - $HOME/analysis/musrfit/src/musredit/latex_images + @DOCDIR@/latex_images asymmetry diff --git a/src/musrgui/asymDefault.msr b/src/musrgui/asymDefault.msr deleted file mode 100644 index b486c1ba..00000000 --- a/src/musrgui/asymDefault.msr +++ /dev/null @@ -1,59 +0,0 @@ -TITLE -############################################################### -FITPARAMETER -# Nr. Name Value Step Pos_Error Boundaries - 1 alpha 0.989765 1.0 none 0 none - 2 asy 0.26 0.1 none 0 0.33 - 3 phase 8.5 1.0 none - 4 field 100.0 0.1 none 0 none - 5 rate 0.36 0.02 none 0 100 - -############################################################### -THEORY -asymmetry 2 -TFieldCos 3 fun1 (phase frequency) -simplExpo 5 - -############################################################### -FUNCTIONS -fun1 = par4 * gamma_mu - -############################################################### -RUN lem07_his_0147 MUE4 PSI ROOT-NPP (name beamline institute data-file-format) -fittype 2 (asymmetry fit) -alpha 1 -map 0 0 0 0 0 0 0 0 0 0 -forward 1 -backward 3 -background 65000 66500 65000 66500 -data 3413 63000 3413 63000 -t0 3413 3413 -fit 0.00 8.00 (fw bw) -packing 75 - -############################################################### -COMMANDS -SET BATCH -MINIMIZE -MINOS -SAVE -END RETURN - -############################################################### -FOURIER -units Gauss # fourier in field units -fourier_power 12 -apodization NONE # NONE, WEAK, MEDIUM, STRONG -plot power -phase 8.5 -#range_for_phase_correction 50.0 70.0 -range 0.0 200.0 - -############################################################### -PLOT 2 (asymmetry plot) -runs 1 -range 0.00 8.00 -0.30 0.30 - -############################################################### -STATISTIC --- 2008-04-04 07:44:31 - chisq = 569.50931, NDF = 542, chisq/NDF = 1.05075518 diff --git a/src/musrgui/musrgui_startup.xml b/src/musrgui/musrgui_startup.xml.in similarity index 94% rename from src/musrgui/musrgui_startup.xml rename to src/musrgui/musrgui_startup.xml.in index f2a3e17a..7f0ea54d 100644 --- a/src/musrgui/musrgui_startup.xml +++ b/src/musrgui/musrgui_startup.xml.in @@ -1,13 +1,13 @@ - $Id$ + $Id: musrgui_startup.xml 4949 2011-07-15 05:43:41Z nemu $ This is handling default setting parameters for the musrgui. - $ROOTSYS/bin + @prefix@/bin ./ - $HOME/analysis/musrfit/src/musrgui + @DOCDIR@/templates n y @@ -23,7 +23,7 @@ - For a detailed description of the aim and structure of a msr file see <b>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html</b> + For a detailed description of the aim and structure of a msr file see <b>@DOCDIR@/html/user/MUSR/MusrFit.html</b> Starting with ≥ Qt 4.6 this will be linked automatically but until then ...; sorry ;-) @@ -40,7 +40,7 @@ n n - $HOME/analysis/musrfit/src/musrgui/latex_images + @DOCDIR@/latex_images asymmetry diff --git a/src/musrgui/singleHistoDefault.msr b/src/musrgui/singleHistoDefault.msr deleted file mode 100644 index 0f0632c1..00000000 --- a/src/musrgui/singleHistoDefault.msr +++ /dev/null @@ -1,60 +0,0 @@ -TITLE -############################################################### -FITPARAMETER -# Nr. Name Value Step Pos_Error Boundaries - 1 Asy 0.26 0.01 none 0 0.33 - 2 Rate 0.36 0.01 none - 3 Field 100.0 1.0 none 0 200 - 4 N0_L 150.0 0.01 none - 5 Bkg_L 4.9 0.01 none - 6 Phase_L 7.0 1.5 none -50 50 - -############################################################### -THEORY -asymmetry 1 -simplExpo 2 (rate) -TFieldCos map1 fun1 (phase frequency) - -############################################################### -FUNCTIONS -fun1 = par3 * gamma_mu - -############################################################### -RUN lem07_his_0111 MUE4 PSI ROOT-NPP (name beamline institute data-file-format) -fittype 0 (single histogram fit) -norm 4 -backgr.fit 5 -lifetimecorrection -map 6 0 0 0 0 0 0 0 0 0 -forward 1 -data 3413 65000 -t0 3413 -fit 0.20 8.2 -packing 50 - -############################################################### -COMMANDS -SET BATCH -MINIMIZE -MINOS -SAVE -END RETURN - -############################################################### -PLOT 0 (single histo plot) -runs 1 -range 0.00 7.00 -0.30 0.30 - -############################################################### -FOURIER -units Gauss # fourier in field units -fourier_power 12 -apodization NONE # NONE, WEAK, MEDIUM, STRONG -plot power -phase 8.5 -#range_for_phase_correction 50.0 70.0 -range 0.0 200.0 - -############################################################### -STATISTIC --- 2008-06-09 14:09:39 - chisq = 1446.93547, NDF = 1377, chisq/NDF = 1.05078829