Skip to content

Commit

Permalink
merging with master...
Browse files Browse the repository at this point in the history
  • Loading branch information
AAAlvesJr committed Jun 26, 2020
2 parents 4dd3969 + 57b77d0 commit f7f13ac
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 24 deletions.
1 change: 1 addition & 0 deletions Doxyfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
39 changes: 20 additions & 19 deletions THANKS.md
Original file line number Diff line number Diff line change
@@ -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.

1 change: 1 addition & 0 deletions hydra/Hydra.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
7 changes: 4 additions & 3 deletions hydra/SPlot.h
Original file line number Diff line number Diff line change
Expand Up @@ -107,18 +107,19 @@ class SPlot: public detail::AddPdfBase<PDF1,PDF2,PDFs...>
SPlot( PDFSumExtendable<PDF1, PDF2, PDFs...> const& pdf, Iterator first, Iterator last):
fPDFs( pdf.GetPDFs() ),
fFunctors( pdf.GetFunctors()),
fCovMatrix( Eigen::Matrix<double, npdfs, npdfs>{} ),
fBegin( iterator( first, transformer( pdf.GetFunctors(), Eigen::Matrix<double, npdfs, npdfs>{} ))),
fEnd (iterator( last , transformer( pdf.GetFunctors(), Eigen::Matrix<double, npdfs, npdfs>{} )))

{
for(size_t i=0;i<npdfs; i++)
fCoeficients[i] = pdf.GetCoeficient(i);

fCovMatrix << 0.0, 0.0, 0.0, 0.0;
//fCovMatrix << 0.0, 0.0, 0.0, 0.0;


Eigen::Matrix<double, npdfs, npdfs> init;
init << 0.0, 0.0, 0.0, 0.0;
Eigen::Matrix<double, npdfs, npdfs> init = Eigen::Matrix<double, npdfs, npdfs>::Zero();
//init << 0.0, 0.0, 0.0, 0.0;

fCovMatrix = hydra_thrust::transform_reduce(system_type(), first, last,
detail::CovMatrixUnary<
Expand Down
2 changes: 1 addition & 1 deletion hydra/detail/functors/DecayMother.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<GReal_t> uniDist(0.0, 1.0);

Expand Down
2 changes: 1 addition & 1 deletion hydra/detail/functors/ProcessSPlot.h
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ struct SWeights
Eigen::Matrix<double, nfunctors,1> values_vector(Eigen::Map<Eigen::Matrix<double, nfunctors,1> >(values).eval());
Eigen::Matrix<double, nfunctors,1> 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;

Expand Down

0 comments on commit f7f13ac

Please sign in to comment.