From b4ad61406f64a5ceeea5242b8e2148833ba74e15 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 5 Jun 2018 12:15:37 +0100 Subject: [PATCH 01/13] set SVD tolerance reinitialise var matrix --- lib/FitInterface.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/FitInterface.cpp b/lib/FitInterface.cpp index 5d24550..09c97e1 100644 --- a/lib/FitInterface.cpp +++ b/lib/FitInterface.cpp @@ -200,6 +200,7 @@ double FitInterface::getSvdTolerance(void) const void FitInterface::setSvdTolerance(const double &tol) { svdTol_ = tol; + scheduleLayoutInit(); } VarName & FitInterface::xName(void) From 8b9494029c546192ef1cdd18f30dac4c8c3b785e Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Sun, 26 Aug 2018 02:55:53 +0300 Subject: [PATCH 02/13] latan-config utility and HDF5 is now mandatory --- Makefile.am | 2 ++ configure.ac | 45 +++++++++++++++++++++++++++++++-------------- lib/Io.cpp | 4 ---- lib/Makefile.am | 6 ++---- utils/resample.cpp | 5 ----- 5 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Makefile.am b/Makefile.am index 16742b8..e563215 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ SUBDIRS = lib utils physics examples +bin_SCRIPTS=latan-config + ACLOCAL_AMFLAGS = -I .buildutils/m4 diff --git a/configure.ac b/configure.ac index 134f26f..e610b1d 100644 --- a/configure.ac +++ b/configure.ac @@ -53,9 +53,6 @@ AC_ARG_WITH([latcore], [use this option for a non-standard install prefix of the LatCore library])], [AM_CXXFLAGS="$AM_CXXFLAGS -I$with_latcore/include"] [AM_LDFLAGS="$AM_LDFLAGS -L$with_latcore/lib"]) -CFLAGS="$AM_CFLAGS $CFLAGS" -CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" -LDFLAGS="$AM_LDFLAGS $LDFLAGS" # Get compilers informations AX_COMPILER_VENDOR @@ -78,6 +75,10 @@ AC_DEFINE_UNQUOTED([GXX_VERSION],["$GXX_VERSION"], [version of g++ that will compile the code]) # Checks for libraries. +CXXFLAGS_CPY=$CXXFLAGS +LDFLAGS_CPY=$LDFLAGS +CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" +LDFLAGS="$AM_LDFLAGS $LDFLAGS" AC_CHECK_LIB([m],[cos],[],[AC_MSG_ERROR([libm library not found])]) AC_CHECK_LIB([gslcblas],[cblas_dgemm],[], [AC_MSG_ERROR([GSL CBLAS library not found])]) @@ -90,12 +91,8 @@ AC_CHECK_LIB([nlopt_cxx],[nlopt_create], [LIBS="$LIBS -lnlopt_cxx"],[]) AM_CONDITIONAL([HAVE_NLOPT], [test x$have_nlopt = xtrue]) AC_CHECK_LIB([hdf5_cpp],[H5Fopen], - [AC_DEFINE([HAVE_HDF5], - [1], - [Define to 1 if you have the `HDF5' library (-lhdf5_cpp).])] - [have_hdf5=true] - [LIBS="$LIBS -lhdf5_cpp -lhdf5"],[],[-lhdf5]) -AM_CONDITIONAL([HAVE_HDF5], [test x$have_hdf5 = xtrue]) + [LIBS="$LIBS -lhdf5_cpp -lhdf5"], + [AC_MSG_ERROR([HDF5 library not found])], [-lhdf5]) SAVED_LDFLAGS=$LDFLAGS LDFLAGS="$LDFLAGS -lMinuit2" AC_MSG_CHECKING([for ROOT::Minuit2::BasicMinimumError in -lMinuit2]); @@ -123,24 +120,44 @@ AC_LINK_IFELSE( [AC_MSG_RESULT([no])] [AC_MSG_ERROR([LatCore library not found])]) LDFLAGS=$SAVED_LDFLAGS +CXXFLAGS=$CXXFLAGS_CPY +LDFLAGS=$LDFLAGS_CPY # Checks for header files. AC_HEADER_STDC +cwd=`pwd -P`; cd ${srcdir}; abs_srcdir=`pwd -P`; cd ${cwd} +LATAN_CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" +LATAN_LDFLAGS="$AM_LDFLAGS $LDFLAGS" +LATAN_LIBS=$LIBS +LATAN_SHORT_SHA=`git rev-parse --short HEAD` +LATAN_SHA=`git rev-parse HEAD` +LATAN_BRANCH=`git rev-parse --abbrev-ref HEAD` +AM_CXXFLAGS="-I${abs_srcdir}/lib $AM_CXXFLAGS" +AM_CFLAGS="-I${abs_srcdir}/lib $AM_CFLAGS" +CXXFLAGS="$AM_CXXFLAGS $CXXFLAGS" +LDFLAGS="$AM_LDFLAGS $LDFLAGS" AC_SUBST([LIBS]) -AC_SUBST([AM_CFLAGS]) +AC_SUBST([AM_CXXFLAGS]) AC_SUBST([AM_LDFLAGS]) +AC_SUBST([LATAN_CXXFLAGS]) +AC_SUBST([LATAN_LDFLAGS]) +AC_SUBST([LATAN_LIBS]) +AC_SUBST([LATAN_SHA]) +AC_SUBST([LATAN_BRANCH]) -AC_CONFIG_FILES([Makefile lib/Makefile utils/Makefile physics/Makefile - examples/Makefile]) +AC_CONFIG_FILES([latan-config], [chmod +x latan-config]) +AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([lib/Makefile]) +AC_CONFIG_FILES([utils/Makefile]) +AC_CONFIG_FILES([physics/Makefile]) +AC_CONFIG_FILES([examples/Makefile]) AC_OUTPUT echo "*********************************************" echo "* ${PACKAGE_NAME} v${VERSION}" build options echo "*********************************************" echo "* C++ compiler : $CXX" -echo "* HDF5 support : `test x$HAVE_HDF5_TRUE = 'x' && echo yes \ - || echo no`" echo "* Minuit minimizers: `test x$HAVE_MINUIT_TRUE = 'x' && echo yes \ || echo no`" echo "* NLopt minimizers : `test x$HAVE_NLOPT_TRUE = 'x' && echo yes \ diff --git a/lib/Io.cpp b/lib/Io.cpp index 908cf4b..32812e0 100644 --- a/lib/Io.cpp +++ b/lib/Io.cpp @@ -20,9 +20,7 @@ #include #include #include -#ifdef HAVE_HDF5 #include -#endif using namespace std; using namespace Latan; @@ -42,12 +40,10 @@ unique_ptr Io::open(const std::string &fileName, const unsigned int mode) { return unique_ptr(new AsciiFile(fileName, mode)); } -#ifdef HAVE_HDF5 else if (ext == "h5") { return unique_ptr(new Hdf5File(fileName, mode)); } -#endif else { LATAN_ERROR(Io, "unknown file extension '" + ext + "'"); diff --git a/lib/Makefile.am b/lib/Makefile.am index a4199d3..d284ffc 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -35,6 +35,7 @@ libLatAnalyze_la_SOURCES = \ GslHybridRootFinder.cpp\ GslMinimizer.cpp \ GslQagsIntegrator.cpp \ + Hdf5File.cpp \ Histogram.cpp \ includes.hpp \ Io.cpp \ @@ -69,6 +70,7 @@ libLatAnalyze_la_HEADERS = \ GslHybridRootFinder.hpp\ GslMinimizer.hpp \ GslQagsIntegrator.hpp \ + Hdf5File.hpp \ Histogram.hpp \ Integrator.hpp \ Io.hpp \ @@ -87,10 +89,6 @@ libLatAnalyze_la_HEADERS = \ StatArray.hpp \ XYSampleData.hpp \ XYStatData.hpp -if HAVE_HDF5 - libLatAnalyze_la_SOURCES += Hdf5File.cpp - libLatAnalyze_la_HEADERS += Hdf5File.hpp -endif if HAVE_MINUIT libLatAnalyze_la_SOURCES += MinuitMinimizer.cpp libLatAnalyze_la_HEADERS += MinuitMinimizer.hpp diff --git a/utils/resample.cpp b/utils/resample.cpp index c3f6a66..15c5dda 100644 --- a/utils/resample.cpp +++ b/utils/resample.cpp @@ -25,12 +25,7 @@ #ifndef DEF_NSAMPLE #define DEF_NSAMPLE "100" #endif - -#ifdef HAVE_HDF5 #define DEF_FMT "h5" -#else -#define DEF_FMT "sample" -#endif using namespace std; using namespace Latan; From 005158e2ed5cc39005a5f497494eddcb205e0240 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Mon, 7 Jan 2019 11:55:00 +0000 Subject: [PATCH 03/13] 2-pt fit: linear perturbation model --- physics/2pt-fit.cpp | 59 ++++++++++++++++++++++++++++++++++++--------- 1 file changed, 48 insertions(+), 11 deletions(-) diff --git a/physics/2pt-fit.cpp b/physics/2pt-fit.cpp index 11f4328..18f7be8 100644 --- a/physics/2pt-fit.cpp +++ b/physics/2pt-fit.cpp @@ -30,7 +30,7 @@ int main(int argc, char *argv[]) opt.addOption("s", "shift" , OptParser::OptType::value , true, "time variable shift", "0"); opt.addOption("m", "model" , OptParser::OptType::value , true, - "fit model (exp|exp2|exp3|cosh|cosh2|cosh3|)", "cosh"); + "fit model (exp|exp2|exp3|cosh|cosh2|cosh3|explin|)", "cosh"); opt.addOption("" , "nPar" , OptParser::OptType::value , true, "number of model parameters for custom models " "(-1 if irrelevant)", "-1"); @@ -117,7 +117,7 @@ int main(int argc, char *argv[]) // make model ////////////////////////////////////////////////////////////// DoubleModel mod; - bool coshModel = false; + bool coshModel = false, linearModel = false; if ((model == "exp") or (model == "exp1")) { @@ -174,6 +174,15 @@ int main(int argc, char *argv[]) + p[5]*(exp(-p[2]*x[0])+exp(-p[4]*(nt-x[0]))); }, 1, nPar); } + else if (model == "explin") + { + linearModel = true; + nPar = 2; + mod.setFunction([](const double *x, const double *p) + { + return p[1] - p[0]*x[0]; + }, 1, nPar); + } else { if (nPar > 0) @@ -210,8 +219,16 @@ int main(int argc, char *argv[]) mod.parName().setName(p, "E_" + strFrom(p/2)); mod.parName().setName(p + 1, "Z_" + strFrom(p/2)); } - init(0) = log(data.y(nt/4, 0)[central]/data.y(nt/4 + 1, 0)[central]); - init(1) = data.y(nt/4, 0)[central]/(exp(-init(0)*nt/4)); + if (linearModel) + { + init(0) = data.y(nt/4, 0)[central] - data.y(nt/4 + 1, 0)[central]; + init(1) = data.y(nt/4, 0)[central] + nt/4*init(0); + } + else + { + init(0) = log(data.y(nt/4, 0)[central]/data.y(nt/4 + 1, 0)[central]); + init(1) = data.y(nt/4, 0)[central]/(exp(-init(0)*nt/4)); + } for (Index p = 2; p < nPar; p += 2) { init(p) = 2*init(p - 2); @@ -219,11 +236,19 @@ int main(int argc, char *argv[]) } for (Index p = 0; p < nPar; p += 2) { - globMin.setLowLimit(p, 0.); - globMin.setHighLimit(p, 10.*init(p)); - globMin.setLowLimit(p + 1, -10.*init(p + 1)); - globMin.setHighLimit(p + 1, 10.*init(p + 1)); - locMin.setLowLimit(p, 0.); + if (linearModel) + { + globMin.setLowLimit(p, -10.*fabs(init(p))); + globMin.setHighLimit(p, 10.*fabs(init(p))); + } + else + { + globMin.setLowLimit(p, 0.); + locMin.setLowLimit(p, 0.); + globMin.setHighLimit(p, 10.*init(p)); + } + globMin.setLowLimit(p + 1, -10.*fabs(init(p + 1))); + globMin.setHighLimit(p + 1, 10.*fabs(init(p + 1))); } globMin.setPrecision(0.001); globMin.setMaxIteration(100000); @@ -264,7 +289,10 @@ int main(int argc, char *argv[]) double e0, e0Err; p << PlotRange(Axis::x, 0, nt - 1); - p << LogScale(Axis::y); + if (!linearModel) + { + p << LogScale(Axis::y); + } p << Color("rgb 'blue'") << PlotPredBand(fit.getModel(_), 0, nt - 1); p << Color("rgb 'blue'") << PlotFunction(fit.getModel(), 0, nt - 1); p << Color("rgb 'red'") << PlotData(data.getData()); @@ -285,6 +313,16 @@ int main(int argc, char *argv[]) } } } + else if (linearModel) + { + FOR_STAT_ARRAY(effMass, s) + { + for (Index t = 0; t < nt - 1; ++t) + { + effMass[s](t) = corr[s](t) - corr[s](t+1); + } + } + } else { FOR_STAT_ARRAY(effMass, s) @@ -302,7 +340,6 @@ int main(int argc, char *argv[]) p << Color("rgb 'blue'") << PlotHLine(e0); p << Color("rgb 'red'") << PlotData(effMassT, effMass); p.display(); - p.save("test"); } if (doHeatmap) { From 86f7f89106c72187f0aed89d43a929a24398ef7e Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 6 Feb 2019 11:27:23 +0000 Subject: [PATCH 04/13] Travis update --- .travis.yml | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7dcd36..20db979 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,4 @@ language: cpp - -notifications: - email: false - slack: ukqcd:mQLXCtz8D2cg89xT8j1a4wku cache: directories: @@ -12,56 +8,56 @@ cache: matrix: include: - os: osx - osx_image: xcode7.2 + osx_image: xcode10.1 compiler: clang - os: osx - osx_image: xcode7.2 + osx_image: xcode10.1 compiler: gcc - env: VERSION=-5 + env: VERSION=-7 - compiler: gcc addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-4.9 + - g++-6 - libgsl0-dev - flex - bison - env: VERSION=-4.9 + env: VERSION=-6 - compiler: gcc addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-5 + - g++-7 - libgsl0-dev - flex - bison - env: VERSION=-5 + env: VERSION=-7 - compiler: clang addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-4.8 + - g++-7 - libgsl0-dev - flex - bison - env: CLANG_LINK=http://llvm.org/releases/3.6.0/clang+llvm-3.6.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz + env: CLANG_LINK=http://releases.llvm.org/6.0.1/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz - compiler: clang addons: apt: sources: - ubuntu-toolchain-r-test packages: - - g++-4.8 + - g++-7 - libgsl0-dev - flex - bison - env: CLANG_LINK=http://llvm.org/releases/3.7.0/clang+llvm-3.7.0-x86_64-linux-gnu-ubuntu-14.04.tar.xz + env: CLANG_LINK=http://releases.llvm.org/6.0.1/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz before_install: - export LATDIR=`pwd` From 7993a1a7f750208c30e219212008eac50717c2c9 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 6 Feb 2019 14:38:32 +0000 Subject: [PATCH 05/13] forgotten latan-config.in file --- latan-config.in | 79 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 latan-config.in diff --git a/latan-config.in b/latan-config.in new file mode 100644 index 0000000..5c28190 --- /dev/null +++ b/latan-config.in @@ -0,0 +1,79 @@ +#! /bin/sh + +prefix=@prefix@ +exec_prefix=@exec_prefix@ +includedir=@includedir@ + +usage() +{ + cat < Date: Wed, 6 Feb 2019 14:56:09 +0000 Subject: [PATCH 06/13] Travis fix --- .travis.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20db979..72ff4f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: - os: osx osx_image: xcode10.1 compiler: gcc - env: VERSION=-7 + env: VERSION=7 - compiler: gcc addons: apt: @@ -24,7 +24,7 @@ matrix: - libgsl0-dev - flex - bison - env: VERSION=-6 + env: VERSION=6 - compiler: gcc addons: apt: @@ -35,7 +35,7 @@ matrix: - libgsl0-dev - flex - bison - env: VERSION=-7 + env: VERSION=7 - compiler: clang addons: apt: @@ -57,7 +57,7 @@ matrix: - libgsl0-dev - flex - bison - env: CLANG_LINK=http://releases.llvm.org/6.0.1/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz + env: CLANG_LINK=http://releases.llvm.org/7.0.1/clang+llvm-7.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz before_install: - export LATDIR=`pwd` @@ -68,11 +68,11 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc5; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc$VERSION; fi install: - - export CC=$CC$VERSION - - export CXX=$CXX$VERSION + - export CC=$CC-$VERSION + - export CXX=$CXX-$VERSION - echo $PATH - which $CC - $CC --version From f8ad5c4da052495dc666ac6a376d7bfc4b38c157 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 6 Feb 2019 15:04:40 +0000 Subject: [PATCH 07/13] more Travis fix --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72ff4f3..e7ed47c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: - os: osx osx_image: xcode10.1 compiler: gcc - env: VERSION=7 + env: VERSION=-7 - compiler: gcc addons: apt: @@ -24,7 +24,7 @@ matrix: - libgsl0-dev - flex - bison - env: VERSION=6 + env: VERSION=-6 - compiler: gcc addons: apt: @@ -35,7 +35,7 @@ matrix: - libgsl0-dev - flex - bison - env: VERSION=7 + env: VERSION=-7 - compiler: clang addons: apt: @@ -68,11 +68,11 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc$VERSION; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc${VERSION#-}; fi install: - - export CC=$CC-$VERSION - - export CXX=$CXX-$VERSION + - export CC=$CC$VERSION + - export CXX=$CXX$VERSION - echo $PATH - which $CC - $CC --version From 545a146f49af13c465565fb80fa483baa911349d Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 6 Feb 2019 16:12:33 +0000 Subject: [PATCH 08/13] Travis load reduced --- .travis.yml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/.travis.yml b/.travis.yml index e7ed47c..178ca52 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,17 +14,6 @@ matrix: osx_image: xcode10.1 compiler: gcc env: VERSION=-7 - - compiler: gcc - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-6 - - libgsl0-dev - - flex - - bison - env: VERSION=-6 - compiler: gcc addons: apt: @@ -36,17 +25,6 @@ matrix: - flex - bison env: VERSION=-7 - - compiler: clang - addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-7 - - libgsl0-dev - - flex - - bison - env: CLANG_LINK=http://releases.llvm.org/6.0.1/clang+llvm-6.0.1-x86_64-linux-gnu-ubuntu-14.04.tar.xz - compiler: clang addons: apt: From 281663230d532411008c575cf55bcdff2252e523 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 6 Feb 2019 17:15:49 +0000 Subject: [PATCH 09/13] more Travis fixes --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 178ca52..f3c8c74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,7 +46,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gsl; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install bison flex; export PATH="/usr/local/opt/flex/bin:/usr/local/opt/bison/bin:$PATH"; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc${VERSION#-}; fi + - if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ "$CC" == "gcc" ]]; then brew install gcc@${VERSION#-}; fi install: - export CC=$CC$VERSION @@ -59,6 +59,7 @@ install: - ./install-deps.sh `pwd`/local - cd .. - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LD_LIBRARY_PATH=${LATDIR}/ci-scripts/local/lib:$LD_LIBRARY_PATH; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-7" ]]; then export CXXFLAGS='-Wno-int-in-bool-context' script: - cd ci-scripts From 64d2616e2498cc59979410a0a1b400a07137d17a Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Wed, 6 Feb 2019 17:42:30 +0000 Subject: [PATCH 10/13] More Travis fix --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f3c8c74..1360b9b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ install: - ./install-deps.sh `pwd`/local - cd .. - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LD_LIBRARY_PATH=${LATDIR}/ci-scripts/local/lib:$LD_LIBRARY_PATH; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-7" ]]; then export CXXFLAGS='-Wno-int-in-bool-context' + - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-7" ]]; then export CXXFLAGS='-Wno-int-in-bool-context'; fi script: - cd ci-scripts From 7a087944ff335c896c3fc666c3e2eef80a80aa19 Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 7 Feb 2019 21:09:53 +0000 Subject: [PATCH 11/13] Travis log reduction --- .travis.yml | 2 +- ci-scripts/install-latan.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1360b9b..fd40040 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ install: - ./install-deps.sh `pwd`/local - cd .. - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export LD_LIBRARY_PATH=${LATDIR}/ci-scripts/local/lib:$LD_LIBRARY_PATH; fi - - if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CC" == "gcc-7" ]]; then export CXXFLAGS='-Wno-int-in-bool-context'; fi + - if [[ "$CC" == "gcc-7" ]]; then export CXXFLAGS='-Wno-int-in-bool-context'; fi script: - cd ci-scripts diff --git a/ci-scripts/install-latan.sh b/ci-scripts/install-latan.sh index 7621b51..e43e9a2 100755 --- a/ci-scripts/install-latan.sh +++ b/ci-scripts/install-latan.sh @@ -14,6 +14,6 @@ cd .. mkdir -p build cd build if [[ "$OS" == "osx" ]]; then EXTRA_FLAGS='--with-gsl=/usr/local'; fi -../configure --prefix=$PREFIX --with-minuit=$PREFIX --with-nlopt=$PREFIX --with-latcore=$PREFIX --with-hdf5=$PREFIX $EXTRA_FLAGS CXXFLAGS='-O3 -march=native -mtune=native' +../configure --prefix=$PREFIX --with-minuit=$PREFIX --with-nlopt=$PREFIX --with-latcore=$PREFIX --with-hdf5=$PREFIX $EXTRA_FLAGS CXXFLAGS="${CXXFLAGS} -O3 -march=native -mtune=native" make -j4 make install From b378f2fe6d79f017dfbdb3bf5303ca99d6d4f58c Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 7 Feb 2019 21:57:05 +0000 Subject: [PATCH 12/13] Readme update --- Readme.md | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Readme.md b/Readme.md index 41acdae..040c68f 100644 --- a/Readme.md +++ b/Readme.md @@ -55,6 +55,17 @@ in the `ci-scripts` directory where `` is where you want LatAnalyze (and For a more customised installation, one first needs to generate the build system by running `./bootstrap.sh` in the root directory. Then the library can be built and installed through the usual GNU mantra `./configure && make && make install`. Use `./configure --help` to obtain a list of possible options for `./configure`. Because Eigen expressions rely a lot on inlining and compiler optimisations it is strongly recommended to set the `CXXFLAGS` variable to `-O3 -march=native -mtune=native`. ## History +#### v3.4 +Additions: +* `latan-config` utility to easily compile LatAnalyze-based programs +* Linear and constant models to the 2-point fitter + +Changes: +* HDF5 is now a compulsory dependency + +Fixes: +* Variance matrix computation fix. + #### v3.3 Additions: * Sample plot CL utility. @@ -78,7 +89,7 @@ Fixes: * Variance matrix computation fix. #### v3.2.1 -Fix: +Fixes: * Wrong argument number check in `latan-resample` #### v3.2 (needs LatCore 1.1) From 8f5273151306c284ba390ae52103661bf7b6fe8b Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Thu, 7 Feb 2019 21:58:14 +0000 Subject: [PATCH 13/13] version number update --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index e610b1d..d1fd797 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Initialization AC_PREREQ([2.63]) -AC_INIT([LatAnalyze],[3.3],[antonin.portelli@me.com],[LatAnalyze]) +AC_INIT([LatAnalyze],[3.4],[antonin.portelli@me.com],[LatAnalyze]) AC_CONFIG_AUX_DIR([.buildutils]) AC_CONFIG_SRCDIR([lib/Global.cpp]) AC_CONFIG_SRCDIR([utils/sample_read.cpp])