From 0caabc62df6e789d7caaf12e2f59de993362e905 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Thu, 14 Feb 2013 10:01:03 +0000 Subject: [PATCH] minor bug fix --- ChangeLog | 2 + src/musredit/PAdmin.cpp | 6 +- src/musredit/musredit_startup.xml | 242 --------------------------- src/musredit/musredit_startup.xml.in | 12 +- 4 files changed, 17 insertions(+), 245 deletions(-) delete mode 100644 src/musredit/musredit_startup.xml diff --git a/ChangeLog b/ChangeLog index 83ae22e2..e599b4ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,8 @@ NEW 2013-02-14 (i) adding t0 estimate for single histogram fits. The estimate (ii) adding a more flexible preference handling in musredit. Likely it will not ported anymore to musrgui. (iii) adding 'recent files' to musredit. + In order that this changes are working properly, the configure + script needs to be executed once more, sorry. NEW 2013-01-15 adding an external spin valve related library, currently only containing a skewed Lorentzian. NEW 2013-01-07 print out the estimated time needed for the Minimize,Minos, etc. diff --git a/src/musredit/PAdmin.cpp b/src/musredit/PAdmin.cpp index 4c0b4198..e5fe53a0 100644 --- a/src/musredit/PAdmin.cpp +++ b/src/musredit/PAdmin.cpp @@ -914,9 +914,12 @@ void PAdmin::saveRecentFiles() // remove from data for (QVector::iterator it = data.begin(); it != data.end(); ++it) { - if (it->contains("")) + if (it->contains("")) { it = data.erase(it); + --it; + } } +for (int i=0; i fRecentFile.size()=" << fRecentFile.size() << endl; for (int j=0; j"; data.insert(i++, str); diff --git a/src/musredit/musredit_startup.xml b/src/musredit/musredit_startup.xml deleted file mode 100644 index 7cc94042..00000000 --- a/src/musredit/musredit_startup.xml +++ /dev/null @@ -1,242 +0,0 @@ - - - - $Id$ - This is handling default setting parameters for the musredit. - - - /opt/cern/root/bin - ./ - /opt/cern/root/doc/musrfit/templates - 3600 - n - n - n - y - n - y - y - - - /home/nemu/analysis/musrfit/doc/examples/test-histo-NeXus2.msr - /home/nemu/analysis/musrfit/doc/examples/test-histo-NeXus.msr - /home/nemu/analysis/musrfit/doc/examples/test-histo-MusrRoot.msr - /home/nemu/analysis/musrfit/doc/examples/test-asy-PSI-BIN.msr - /home/nemu/analysis/musrfit/doc/examples/test-asy-NeXus2.msr - /home/nemu/analysis/musrfit/doc/examples/test-asy-PSI-BIN.msr - - - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#TheTitle - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#TheFitparameterBlock - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#TheTheoryBlock - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#TheFunctionsBlock - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#TheRunBlock - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#TheCommandsBlock - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#TheFourierBlock - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#ThePlotBlock - file:///opt/cern/root/doc/musrfit/html/user/MUSR/MusrFit.html#TheStatisticBlock - file:///opt/cern/root/doc/musrfit/html/user/MUSR/Msr2Data.html - - - Courier New - 12 - - - mue4 - psi - root-npp - y - - - y - y - n - n - n - n - y - n - n - n - n - - /opt/cern/root/doc/musrfit/latex_images - - - asymmetry - - - asymmetry.png - 1 - - - simplExpo - (rate) - - simpleExp.png - 1 - - - generExpo - (rate exponent) - - generalExp.png - 2 - - - simpleGss - (rate) - - simpleGauss.png - 1 - - - statGssKT - (rate) - - statGssKT.png - 1 - - - statGssKTLF - (frequency damping) - - - 2 - - - dynGssKTLF - (frequency damping hopping-rate) - - - 3 - - - statExpKT - (rate) - - statExpKT.png - 1 - - - statExpKTLF - (frequency damping) - - - 2 - - - dynExpKTLF - (frequency damping hopping-rate) - - - 3 - - - combiLGKT - (LorentzRate GaussRate) - - combiLGKT.png - 2 - - - spinGlass - (rate hopping-rate order) - - - 3 - - - rdAnisoHf - (frequency rate) - - - 2 - - - abragam - (rate hopping-rate) - - abragam.png - 2 - - - internFld - (fraction phase frequency Trate Lrate) - - internalField.png - 5 - - - TFieldCos - (phase frequency) - - tfCos.png - 2 - - - bessel - (phase frequency) - - bessel.png - 2 - - - internBsl - (fraction phase frequency Trate Lrate) - - internalBessel.png - 5 - - - skewedGss - (phase frequency rate_m rate_p) - - - 4 - - - staticNKZF - (damping_D0 R_b) - - - 2 - - - staticNKTF - (phase frequency damping_D0 R_b) - - - 4 - - - dynamicNKZF - (damping_D0 R_b nu_c) - - - 3 - - - dynamicNKTF - (phase frequency damping_D0 R_b nu_c) - - - 5 - - - polynom - (tshift p0 p1 ... pn) - - polynom.png - 4 - - - userFcn - - - - 0 - - - diff --git a/src/musredit/musredit_startup.xml.in b/src/musredit/musredit_startup.xml.in index af97fd71..f610695d 100644 --- a/src/musredit/musredit_startup.xml.in +++ b/src/musredit/musredit_startup.xml.in @@ -8,9 +8,18 @@ @prefix@/bin ./ @DOCDIR@/templates + 3600 + n + n + n y + n + y y + + /home/nemu/analysis/musrfit/doc/examples/test-histo-PSI-BIN.msr + file://@DOCDIR@/html/user/MUSR/MusrFit.html file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheTitle @@ -25,10 +34,9 @@ file://@DOCDIR@/html/user/MUSR/Msr2Data.html - Courier + Courier New 12 - 3600 mue4 psi