Skip to content

Commit f7f13ac

Browse files
committed
merging with master...
2 parents 4dd3969 + 57b77d0 commit f7f13ac

File tree

6 files changed

+28
-24
lines changed

6 files changed

+28
-24
lines changed

Doxyfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#PROJECT_NAME = "Hydra_examples_and_documentation"
22
PROJECT_NUMBER = 3.0.0
33

4+
45
STRIP_FROM_PATH = /home/augalves/Development/Release/Hydra
56

67
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

THANKS.md

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
1-
## Hydra 2.1.0
2-
3-
* Chistoph Hasse and Henry Fredrick Schreiner for the very first feedback.
4-
* Serena Macolini for testing the links of the reference documentation.
5-
* 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.
6-
* Henry Fredrick Schreiner for the tips for Apple users (https://github.com/MultithreadCorner/Hydra/wiki/Tips-for-MacOS-users)
7-
8-
## Hydra 2.2.1
9-
10-
* Davide Brundu for a number of contributions, from new functors to bug reports and corrections.
11-
* Andrea Contu for moral support, extensive testing and bug report whn using hydra in his own projetcs.
12-
* Marcos Romero for a number of contributions, from new functors to bug reports and corrections.,
13-
* Scott Stevenson for nicely reviewing the spelling of Readme.md.
14-
15-
## Hydra 3.0.0
16-
17-
* Davide Brundu for a number of contributions, from new functionality to bug reports and corrections.
18-
* Andrea Contu always for the moral support, extensive testing and bug report whn using hydra in his own projetcs.
19-
* Angelo di Canto, for the support, testing and skype based bug report.
1+
## Hydra 2.1.0
2+
3+
* Chistoph Hasse and Henry Fredrick Schreiner for the very first feedback.
4+
* Serena Macolini for testing the links of the reference documentation.
5+
* 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.
6+
* Henry Fredrick Schreiner for the tips for Apple users (https://github.com/MultithreadCorner/Hydra/wiki/Tips-for-MacOS-users)
7+
8+
## Hydra 2.2.1
9+
10+
* Davide Brundu for a number of contributions, from new functors to bug reports and corrections.
11+
* Andrea Contu for moral support, extensive testing and bug report whn using hydra in his own projetcs.
12+
* Marcos Romero for a number of contributions, from new functors to bug reports and corrections.,
13+
* Scott Stevenson for nicely reviewing the spelling of Readme.md.
14+
15+
## Hydra 3.0.0
16+
17+
* Davide Brundu for a number of contributions, from new functionality to bug reports and corrections.
18+
* Andrea Contu always for the moral support, extensive testing and bug report whn using hydra in his own projetcs.
19+
* Angelo di Canto, for the support, testing and skype based bug report.
20+

hydra/Hydra.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
*/
5151
#define HYDRA_VERSION 300000
5252

53+
5354
/*! \def HYDRA_MAJOR_VERSION
5455
* \brief The preprocessor macro \p HYDRA_MAJOR_VERSION encodes the
5556
* major version number of Hydra.

hydra/SPlot.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,18 +107,19 @@ class SPlot: public detail::AddPdfBase<PDF1,PDF2,PDFs...>
107107
SPlot( PDFSumExtendable<PDF1, PDF2, PDFs...> const& pdf, Iterator first, Iterator last):
108108
fPDFs( pdf.GetPDFs() ),
109109
fFunctors( pdf.GetFunctors()),
110+
fCovMatrix( Eigen::Matrix<double, npdfs, npdfs>{} ),
110111
fBegin( iterator( first, transformer( pdf.GetFunctors(), Eigen::Matrix<double, npdfs, npdfs>{} ))),
111112
fEnd (iterator( last , transformer( pdf.GetFunctors(), Eigen::Matrix<double, npdfs, npdfs>{} )))
112113

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

117-
fCovMatrix << 0.0, 0.0, 0.0, 0.0;
118+
//fCovMatrix << 0.0, 0.0, 0.0, 0.0;
118119

119120

120-
Eigen::Matrix<double, npdfs, npdfs> init;
121-
init << 0.0, 0.0, 0.0, 0.0;
121+
Eigen::Matrix<double, npdfs, npdfs> init = Eigen::Matrix<double, npdfs, npdfs>::Zero();
122+
//init << 0.0, 0.0, 0.0, 0.0;
122123

123124
fCovMatrix = hydra_thrust::transform_reduce(system_type(), first, last,
124125
detail::CovMatrixUnary<

hydra/detail/functors/DecayMother.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ struct DecayMother
163163
GReal_t process(size_t evt, Vector4R (&daugters)[N])
164164
{
165165

166-
GRND randEng;//( );
166+
GRND randEng(fSeed);
167167
randEng.discard(evt+3*N);
168168
hydra_thrust::uniform_real_distribution<GReal_t> uniDist(0.0, 1.0);
169169

hydra/detail/functors/ProcessSPlot.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ struct SWeights
203203
Eigen::Matrix<double, nfunctors,1> values_vector(Eigen::Map<Eigen::Matrix<double, nfunctors,1> >(values).eval());
204204
Eigen::Matrix<double, nfunctors,1> sweights(fICovMatrix*values_vector.eval());
205205
auto wfvalues = detail::multiply_array_tuple(fCoeficients, fvalues);
206-
GReal_t denominator = 1;
206+
GReal_t denominator = 0.0;
207207
detail::add_tuple_values(denominator, wfvalues);
208208
sweights /=denominator;
209209

0 commit comments

Comments
 (0)