Skip to content

Commit a82ae0b

Browse files
authored
Synch the fork
2 parents f368f35 + 78fec1d commit a82ae0b

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

Doxyfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#PROJECT_NAME = "Hydra_examples_and_documentation"
2-
PROJECT_NUMBER = 2.4.0
2+
PROJECT_NUMBER = 2.5.0
33

44
STRIP_FROM_PATH = /home/augalves/Development/Release/Hydra
55

hydra/FCN.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ class FCN<Estimator<PDF,Iterator>>: public ROOT::Minuit2::FCNBase
395395

396396
FCN(FCN<Estimator<PDF,Iterator>> const& other):
397397
ROOT::Minuit2::FCNBase(other),
398+
fDataSize(other.GetDataSize()),
398399
fPDF(other.GetPDF()),
399400
fBegin(other.GetBegin()),
400401
fEnd(other.GetEnd()),
@@ -412,6 +413,7 @@ class FCN<Estimator<PDF,Iterator>>: public ROOT::Minuit2::FCNBase
412413
if( this==&other ) return this;
413414

414415
ROOT::Minuit2::FCNBase::operator=(other);
416+
fDataSize = other.GetDataSize();
415417
fPDF = other.GetPDF();
416418
fBegin = other.GetBegin();
417419
fEnd = other.GetEnd();

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{};
122+
//init << 0.0, 0.0, 0.0, 0.0;
122123

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

0 commit comments

Comments
 (0)