diff --git a/Doxyfile b/Doxyfile index 1d300c5fc..d7693eec1 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1,6 +1,7 @@ #PROJECT_NAME = "Hydra_examples_and_documentation" PROJECT_NUMBER = 3.0.0 + STRIP_FROM_PATH = /home/augalves/Development/Release/Hydra INPUT = /home/augalves/Development/Release/Hydra/hydra /home/augalves/Development/Release/Hydra/doxydefs /home/augalves/Development/Release/Hydra/examples /home/augalves/Development/Release/Hydra/README.md diff --git a/THANKS.md b/THANKS.md index 9cb0bc13a..3229ed970 100644 --- a/THANKS.md +++ b/THANKS.md @@ -1,19 +1,20 @@ -## Hydra 2.1.0 - -* Chistoph Hasse and Henry Fredrick Schreiner for the very first feedback. -* Serena Macolini for testing the links of the reference documentation. -* Andrea Contu for patiently and kindly to test and debug the issues of Hydra on Pascal cuda archs and correct my very poor english in the readme. -* Henry Fredrick Schreiner for the tips for Apple users (https://github.com/MultithreadCorner/Hydra/wiki/Tips-for-MacOS-users) - -## Hydra 2.2.1 - -* Davide Brundu for a number of contributions, from new functors to bug reports and corrections. -* Andrea Contu for moral support, extensive testing and bug report whn using hydra in his own projetcs. -* Marcos Romero for a number of contributions, from new functors to bug reports and corrections., -* Scott Stevenson for nicely reviewing the spelling of Readme.md. - -## Hydra 3.0.0 - -* Davide Brundu for a number of contributions, from new functionality to bug reports and corrections. -* Andrea Contu always for the moral support, extensive testing and bug report whn using hydra in his own projetcs. -* Angelo di Canto, for the support, testing and skype based bug report. +## Hydra 2.1.0 + +* Chistoph Hasse and Henry Fredrick Schreiner for the very first feedback. +* Serena Macolini for testing the links of the reference documentation. +* Andrea Contu for patiently and kindly to test and debug the issues of Hydra on Pascal cuda archs and correct my very poor english in the readme. +* Henry Fredrick Schreiner for the tips for Apple users (https://github.com/MultithreadCorner/Hydra/wiki/Tips-for-MacOS-users) + +## Hydra 2.2.1 + +* Davide Brundu for a number of contributions, from new functors to bug reports and corrections. +* Andrea Contu for moral support, extensive testing and bug report whn using hydra in his own projetcs. +* Marcos Romero for a number of contributions, from new functors to bug reports and corrections., +* Scott Stevenson for nicely reviewing the spelling of Readme.md. + +## Hydra 3.0.0 + +* Davide Brundu for a number of contributions, from new functionality to bug reports and corrections. +* Andrea Contu always for the moral support, extensive testing and bug report whn using hydra in his own projetcs. +* Angelo di Canto, for the support, testing and skype based bug report. + diff --git a/hydra/Hydra.h b/hydra/Hydra.h index 8f6cb780d..c7ca371a3 100644 --- a/hydra/Hydra.h +++ b/hydra/Hydra.h @@ -50,6 +50,7 @@ */ #define HYDRA_VERSION 300000 + /*! \def HYDRA_MAJOR_VERSION * \brief The preprocessor macro \p HYDRA_MAJOR_VERSION encodes the * major version number of Hydra. diff --git a/hydra/SPlot.h b/hydra/SPlot.h index afc76ab26..0851f644e 100644 --- a/hydra/SPlot.h +++ b/hydra/SPlot.h @@ -107,6 +107,7 @@ class SPlot: public detail::AddPdfBase SPlot( PDFSumExtendable const& pdf, Iterator first, Iterator last): fPDFs( pdf.GetPDFs() ), fFunctors( pdf.GetFunctors()), + fCovMatrix( Eigen::Matrix{} ), fBegin( iterator( first, transformer( pdf.GetFunctors(), Eigen::Matrix{} ))), fEnd (iterator( last , transformer( pdf.GetFunctors(), Eigen::Matrix{} ))) @@ -114,11 +115,11 @@ class SPlot: public detail::AddPdfBase for(size_t i=0;i init; - init << 0.0, 0.0, 0.0, 0.0; + Eigen::Matrix init = Eigen::Matrix::Zero(); + //init << 0.0, 0.0, 0.0, 0.0; fCovMatrix = hydra_thrust::transform_reduce(system_type(), first, last, detail::CovMatrixUnary< diff --git a/hydra/detail/functors/DecayMother.h b/hydra/detail/functors/DecayMother.h index 942782679..66537c92e 100644 --- a/hydra/detail/functors/DecayMother.h +++ b/hydra/detail/functors/DecayMother.h @@ -163,7 +163,7 @@ struct DecayMother GReal_t process(size_t evt, Vector4R (&daugters)[N]) { - GRND randEng;//( ); + GRND randEng(fSeed); randEng.discard(evt+3*N); hydra_thrust::uniform_real_distribution uniDist(0.0, 1.0); diff --git a/hydra/detail/functors/ProcessSPlot.h b/hydra/detail/functors/ProcessSPlot.h index fef673cd4..ffee46b1b 100644 --- a/hydra/detail/functors/ProcessSPlot.h +++ b/hydra/detail/functors/ProcessSPlot.h @@ -203,7 +203,7 @@ struct SWeights Eigen::Matrix values_vector(Eigen::Map >(values).eval()); Eigen::Matrix sweights(fICovMatrix*values_vector.eval()); auto wfvalues = detail::multiply_array_tuple(fCoeficients, fvalues); - GReal_t denominator = 1; + GReal_t denominator = 0.0; detail::add_tuple_values(denominator, wfvalues); sweights /=denominator;