LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Install the musrfit documentation locally and adjust the paths in musredit_startup.xml at configure time

Browse Source
This commit is contained in:
Bastian M. Wojek 2011-08-06 19:55:16 +00:00
parent 254d849079
commit d16aef5ef0
8 changed files with 88 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Makefile.am
View File

@ -3,3 +3,43 @@
SUBDIRS = src SUBDIRS = src
EXTRA_DIST = autogen.sh acinclude.m4 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)

30
configure.ac
View File

@ -189,6 +189,11 @@ AC_LANG([C++])
AC_PROG_LN_S AC_PROG_LN_S
AC_PROG_INSTALL 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], m4_ifdef([LT_INIT],
[LT_INIT([disable-static]) [LT_INIT([disable-static])
LT_LANG([C++]) LT_LANG([C++])
@ -721,7 +726,7 @@ dnl -----------------------------------------------
AC_ARG_ENABLE([omp], [AC_HELP_STRING([--enable-omp],[build musrfit with OpenMP support [default=yes]])]) 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" SAVED_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS -fopenmp" CXXFLAGS="$CXXFLAGS -fopenmp"
SAVED_LIBSS="$LIBS" SAVED_LIBSS="$LIBS"
@ -807,6 +812,25 @@ dnl -----------------------------------------------
#AC_FUNC_STAT #AC_FUNC_STAT
#AC_CHECK_FUNCS([floor gettimeofday memset pow sqrt strstr]) #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 -----------------------------------------------
dnl Specify the files that are going to be created by configure 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/libGapIntegrals/Makefile \
src/external/libCalcMeanFieldsLEM/Makefile \ src/external/libCalcMeanFieldsLEM/Makefile \
src/external/Nonlocal/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 AC_OUTPUT

0
src/musredit/asymDefault.msr → doc/templates/asymDefault.msr vendored
View File

0
src/musredit/singleHistoDefault.msr → doc/templates/singleHistoDefault.msr vendored
View File

30
src/musredit/musredit_startup.xml → src/musredit/musredit_startup.xml.in
View File

@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<musredit_startup xmlns="http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrGui.html"> <musredit_startup xmlns="http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrGui.html">
<comment> <comment>
$Id$ $Id: musredit_startup.xml 4949 2011-07-15 05:43:41Z nemu $
This is handling default setting parameters for the musredit. This is handling default setting parameters for the musredit.
</comment> </comment>
<general> <general>
<exec_path>$ROOTSYS/bin</exec_path> <exec_path>@prefix@/bin</exec_path>
<default_save_path>./</default_save_path> <default_save_path>./</default_save_path>
<msr_default_file_path>$HOME/analysis/musrfit/src/musredit</msr_default_file_path> <msr_default_file_path>@DOCDIR@/templates</msr_default_file_path>
<title_from_data_file>y</title_from_data_file> <title_from_data_file>y</title_from_data_file>
<enable_musrt0>y</enable_musrt0> <enable_musrt0>y</enable_musrt0>
</general> </general>
<help_section> <help_section>
<musr_web_main>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html</musr_web_main> <musr_web_main>file://@DOCDIR@/html/user/MUSR/MusrFit.html</musr_web_main>
<musr_web_title>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheTitle</musr_web_title> <musr_web_title>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTitle</musr_web_title>
<musr_web_parameters>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheFitparameterBlock</musr_web_parameters> <musr_web_parameters>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFitparameterBlock</musr_web_parameters>
<musr_web_theory>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheTheoryBlock</musr_web_theory> <musr_web_theory>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTheoryBlock</musr_web_theory>
<musr_web_functions>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheFunctionsBlock</musr_web_functions> <musr_web_functions>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFunctionsBlock</musr_web_functions>
<musr_web_run>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheRunBlock</musr_web_run> <musr_web_run>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheRunBlock</musr_web_run>
<musr_web_command>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheCommandsBlock</musr_web_command> <musr_web_command>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheCommandsBlock</musr_web_command>
<musr_web_fourier>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheFourierBlock</musr_web_fourier> <musr_web_fourier>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheFourierBlock</musr_web_fourier>
<musr_web_plot>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#ThePlotBlock</musr_web_plot> <musr_web_plot>file://@DOCDIR@/html/user/MUSR/MusrFit.html#ThePlotBlock</musr_web_plot>
<musr_web_statistic>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html#TheStatisticBlock</musr_web_statistic> <musr_web_statistic>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheStatisticBlock</musr_web_statistic>
<musr_web_msr2data>http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/Msr2Data.html</musr_web_msr2data> <musr_web_msr2data>file://@DOCDIR@/html/user/MUSR/Msr2Data.html</musr_web_msr2data>
</help_section> </help_section>
<font_settings> <font_settings>
<font_name>Courier</font_name> <font_name>Courier</font_name>
@ -47,7 +47,7 @@
<global>n</global> <global>n</global>
<global_plus>n</global_plus> <global_plus>n</global_plus>
</msr2data_defaults> </msr2data_defaults>
<func_pixmap_path>$HOME/analysis/musrfit/src/musredit/latex_images</func_pixmap_path> <func_pixmap_path>@DOCDIR@/latex_images</func_pixmap_path>
<theory_functions> <theory_functions>
<func> <func>
<name>asymmetry</name> <name>asymmetry</name>

59
src/musrgui/asymDefault.msr
View File

@ -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

10
src/musrgui/musrgui_startup.xml → src/musrgui/musrgui_startup.xml.in
View File

@ -1,13 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<musrgui_startup xmlns="http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrGui.html"> <musrgui_startup xmlns="http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrGui.html">
<comment> <comment>
$Id$ $Id: musrgui_startup.xml 4949 2011-07-15 05:43:41Z nemu $
This is handling default setting parameters for the musrgui. This is handling default setting parameters for the musrgui.
</comment> </comment>
<general> <general>
<exec_path>$ROOTSYS/bin</exec_path> <exec_path>@prefix@/bin</exec_path>
<default_save_path>./</default_save_path> <default_save_path>./</default_save_path>
<msr_default_file_path>$HOME/analysis/musrfit/src/musrgui</msr_default_file_path> <msr_default_file_path>@DOCDIR@/templates</msr_default_file_path>
<title_from_data_file>n</title_from_data_file> <title_from_data_file>n</title_from_data_file>
<enable_musrt0>y</enable_musrt0> <enable_musrt0>y</enable_musrt0>
</general> </general>
@ -23,7 +23,7 @@
</msr_file_defaults> </msr_file_defaults>
<help_section> <help_section>
<help_main> <help_main>
For a detailed description of the aim and structure of a msr file see &lt;b&gt;http://lmu.web.psi.ch/facilities/software/musrfit/user/MUSR/MusrFit.html&lt;/b&gt; For a detailed description of the aim and structure of a msr file see &lt;b&gt;@DOCDIR@/html/user/MUSR/MusrFit.html&lt;/b&gt;
Starting with &ge; Qt 4.6 this will be linked automatically but until then ...; sorry ;-) Starting with &ge; Qt 4.6 this will be linked automatically but until then ...; sorry ;-)
</help_main> </help_main>
</help_section> </help_section>
@ -40,7 +40,7 @@
<global>n</global> <global>n</global>
<global_plus>n</global_plus> <global_plus>n</global_plus>
</msr2data_defaults> </msr2data_defaults>
<func_pixmap_path>$HOME/analysis/musrfit/src/musrgui/latex_images</func_pixmap_path> <func_pixmap_path>@DOCDIR@/latex_images</func_pixmap_path>
<theory_functions> <theory_functions>
<func> <func>
<name>asymmetry</name> <name>asymmetry</name>

60
src/musrgui/singleHistoDefault.msr
View File

@ -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