From 9dd3340f7865bc0ddeefb1ed93bd8402d915f63c Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 24 Oct 2017 09:00:39 +0200 Subject: [PATCH 1/5] check if DOCDIR has not already injected from the command line. --- configure.ac | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 9e6f5936..f62c25e5 100644 --- a/configure.ac +++ b/configure.ac @@ -1212,11 +1212,16 @@ else INSTALLDIR="${prefix}" fi -if test -d "${INSTALLDIR}/doc" -then - DOCDIR="${INSTALLDIR}/doc/musrfit" -else - DOCDIR="${INSTALLDIR}/share/doc/musrfit" +dnl only define DOCDIR if not already present. This allows +dnl to feed DOCDIR on the configure level which is useful when +dnl for instance building a rpm. +if test "x${DOCDIR}" = "x" + if test -d "${INSTALLDIR}/doc" + then + DOCDIR="${INSTALLDIR}/doc/musrfit" + else + DOCDIR="${INSTALLDIR}/share/doc/musrfit" + fi fi AC_SUBST(DOCDIR) From b1422053abfcd08e78a4c2c44e6df73134314f85 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Tue, 24 Oct 2017 09:08:40 +0200 Subject: [PATCH 2/5] fix of a stupied copy/paste error. --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index f62c25e5..c7dc3572 100644 --- a/configure.ac +++ b/configure.ac @@ -1216,6 +1216,7 @@ dnl only define DOCDIR if not already present. This allows dnl to feed DOCDIR on the configure level which is useful when dnl for instance building a rpm. if test "x${DOCDIR}" = "x" +then if test -d "${INSTALLDIR}/doc" then DOCDIR="${INSTALLDIR}/doc/musrfit" From bb18b01514cde00b42d3d6c00697a28bbec0a4bd Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 25 Oct 2017 13:11:13 +0200 Subject: [PATCH 3/5] configure slightly extended to deal with rpmbuild. --- configure.ac | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index c7dc3572..76f857d5 100644 --- a/configure.ac +++ b/configure.ac @@ -1214,7 +1214,7 @@ fi dnl only define DOCDIR if not already present. This allows dnl to feed DOCDIR on the configure level which is useful when -dnl for instance building a rpm. +dnl for instance building a rpm. DOCDIR2 is needed for rpmbuild only if test "x${DOCDIR}" = "x" then if test -d "${INSTALLDIR}/doc" @@ -1223,6 +1223,13 @@ then else DOCDIR="${INSTALLDIR}/share/doc/musrfit" fi +else + if test -d "${INSTALLDIR}/doc" + then + DOCDIR2="${INSTALLDIR}/doc/musrfit" + else + DOCDIR2="${INSTALLDIR}/share/doc/musrfit" + fi fi AC_SUBST(DOCDIR) @@ -1447,12 +1454,21 @@ echo "" dnl -------------- dnl create header file that musredit knows at runtime where to find the documentation +dnl the DOCDIR2 tag is used for rpmbuild only dnl -------------- if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit_qt5"; then echo \#define MUSRFIT_PREFIX \"${INSTALLDIR}\" > src/musredit_qt5/musrfit-info.h - echo \#define MUSRFIT_DOC_DIR \"${DOCDIR}\" >> src/musredit_qt5/musrfit-info.h + if test "x$DOCDIR2" = "x"; then + echo \#define MUSRFIT_DOC_DIR \"${DOCDIR}\" >> src/musredit_qt5/musrfit-info.h + else + echo \#define MUSRFIT_DOC_DIR \"${DOCDIR2}\" >> src/musredit_qt5/musrfit-info.h + fi fi if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit"; then echo \#define MUSRFIT_PREFIX \"${INSTALLDIR}\" > src/musredit/musrfit-info.h - echo \#define MUSRFIT_DOC_DIR \"${DOCDIR}\" >> src/musredit/musrfit-info.h + if test "x$DOCDIR2" = "x"; then + echo \#define MUSRFIT_DOC_DIR \"${DOCDIR}\" >> src/musredit/musrfit-info.h + else + echo \#define MUSRFIT_DOC_DIR \"${DOCDIR2}\" >> src/musredit/musrfit-info.h + fi fi From c4d52df3bc08b29da9675d75c327b54c8e573385 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Thu, 26 Oct 2017 15:47:35 +0200 Subject: [PATCH 4/5] since my automake structure is now ready for rpmbuild, the version number is increased. --- ChangeLog | 11 +++++++++++ configure.ac | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 465063d8..a9e9a442 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,17 @@ or https://bitbucket.org/muonspin/musrfit/commits/all +Release of V1.2.0, 2017/10/26 +============================= + +Adopted to be ready for rpm builds in a first step. This will be followed by debian style +packages. + +Release of V1.1.0, 2017/10/26 +============================= + +Added full DKS support, i.e. additionally to CUDA also OpenCL for GPU's and CPU's in place. + Release of V1.0.0, 2017/05/18 ============================= diff --git a/configure.ac b/configure.ac index 76f857d5..39ca5ca6 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ AC_REVISION([m4_esyscmd_s([git describe --always])]) AC_PREREQ(2.63) -AC_INIT([musrfit],[1.1.0],[andreas.suter@psi.ch]) +AC_INIT([musrfit],[1.2.0],[andreas.suter@psi.ch]) AC_CONFIG_AUX_DIR(admin) AC_CANONICAL_HOST #AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}]) @@ -35,7 +35,7 @@ dnl ----------------------------------------------- #release versioning MUSR_MAJOR_VERSION=1 -MUSR_MINOR_VERSION=1 +MUSR_MINOR_VERSION=2 MUSR_MICRO_VERSION=0 #release versioning From 60580a920fb11c51b4eda1255c4bec944720cdb4 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Thu, 2 Nov 2017 20:24:09 +0100 Subject: [PATCH 5/5] make sure that a valid covariance matrix is available after Hesse. --- src/classes/PFitter.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/classes/PFitter.cpp b/src/classes/PFitter.cpp index b124490d..09733447 100644 --- a/src/classes/PFitter.cpp +++ b/src/classes/PFitter.cpp @@ -1138,7 +1138,12 @@ Bool_t PFitter::ExecuteHesse() TString str = TString::Format("Hesse: %.3f sec", (end-start)/1.0e3); fElapsedTime.push_back(str); if (!mnState.IsValid()) { - cerr << endl << ">> PFitter::ExecuteHesse(): **WARNING** Hesse encountered some problems!"; + cerr << endl << ">> PFitter::ExecuteHesse(): **WARNING** Hesse encountered a problem! The state found is invalid."; + cerr << endl; + return false; + } + if (!mnState.HasCovariance()) { + cerr << endl << ">> PFitter::ExecuteHesse(): **WARNING** Hesse encountered a problem! No covariance matrix available."; cerr << endl; return false; }