Skip to content

Commit 1e46376

Browse files
committed
...
2 parents 751f683 + 9d93d89 commit 1e46376

18 files changed

+334
-100
lines changed

docs/fit_and_splot.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ to build a extended model, which can be used to predict the yields:
131131
132132
The user can get a reference to one of the component PDFs using the method ``PDF( hydra::placeholder )``.
133133
This is useful, for example, to change the state of a component PDF "in place". Same operation can
134-
be performed for coeficients using the method ``Coeficient( unsigned int )`` :
134+
be performed for coeficients using the method ``Coefficient( unsigned int )`` :
135135

136136
.. code-block:: cpp
137137
@@ -145,7 +145,7 @@ be performed for coeficients using the method ``Coeficient( unsigned int )`` :
145145
model.PDF( _0 ).SetParameter(0, 2.0);
146146
147147
//set Gaussian coeficient to 1.5e4
148-
model.Coeficient(0).SetValue(1.5e4);
148+
model.Coefficient(0).SetValue(1.5e4);
149149
150150
151151

examples/convolution/fit_convoluted_pdfs.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,10 +264,10 @@ int main(int argv, char** argc)
264264

265265
}
266266

267-
double signal_fraction = fcn.GetPDF().Coeficient(0)/fcn.GetPDF().GetCoefSum();
267+
double signal_fraction = fcn.GetPDF().Coefficient(0)/fcn.GetPDF().GetCoefSum();
268268
hist_signal.Scale(hist_data.Integral()*signal_fraction/hist_signal.Integral() );
269269

270-
double background_fraction = fcn.GetPDF().Coeficient(1)/fcn.GetPDF().GetCoefSum();
270+
double background_fraction = fcn.GetPDF().Coefficient(1)/fcn.GetPDF().GetCoefSum();
271271
hist_background.Scale(hist_data.Integral()*background_fraction/hist_background.Integral() );
272272

273273
hist_total.Scale(hist_data.Integral()/hist_total.Integral() );

examples/phys/Ipatia_plus_argus.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ int main(int argv, char** argc)
233233

234234
//signal component
235235
auto signal = fcn.GetPDF().PDF(_0);
236-
double signal_fraction = fcn.GetPDF().Coeficient(0)/fcn.GetPDF().GetCoefSum();
236+
double signal_fraction = fcn.GetPDF().Coefficient(0)/fcn.GetPDF().GetCoefSum();
237237
for (size_t i=0 ; i<=100 ; i++) {
238238
double x = hist_signal.GetBinCenter(i);
239239
hist_signal.SetBinContent(i, signal(x) );
@@ -242,7 +242,7 @@ int main(int argv, char** argc)
242242

243243
//signal component
244244
auto background = fcn.GetPDF().PDF(_1);
245-
double background_fraction = fcn.GetPDF().Coeficient(1)/fcn.GetPDF().GetCoefSum();
245+
double background_fraction = fcn.GetPDF().Coefficient(1)/fcn.GetPDF().GetCoefSum();
246246
for (size_t i=0 ; i<=100 ; i++) {
247247
double x = hist_background.GetBinCenter(i);
248248
hist_background.SetBinContent(i, background(x) );

examples/phys/breit_wigner_plus_chebychev.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ int main(int argv, char** argc)
225225

226226
//signal component
227227
auto signal = fcn.GetPDF().PDF(_0);
228-
double signal_fraction = fcn.GetPDF().Coeficient(0)/fcn.GetPDF().GetCoefSum();
228+
double signal_fraction = fcn.GetPDF().Coefficient(0)/fcn.GetPDF().GetCoefSum();
229229
for (size_t i=0 ; i<=100 ; i++) {
230230
double x = hist_signal.GetBinCenter(i);
231231
hist_signal.SetBinContent(i, signal(x) );
@@ -234,7 +234,7 @@ int main(int argv, char** argc)
234234

235235
//signal component
236236
auto background = fcn.GetPDF().PDF(_1);
237-
double background_fraction = fcn.GetPDF().Coeficient(1)/fcn.GetPDF().GetCoefSum();
237+
double background_fraction = fcn.GetPDF().Coefficient(1)/fcn.GetPDF().GetCoefSum();
238238
for (size_t i=0 ; i<=100 ; i++) {
239239
double x = hist_background.GetBinCenter(i);
240240
hist_background.SetBinContent(i, background(x) );

examples/phys/breit_wigner_plus_polynomial.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ int main(int argv, char** argc)
231231

232232
//signal component
233233
auto signal = fcn.GetPDF().PDF(_0);
234-
double signal_fraction = fcn.GetPDF().Coeficient(0)/fcn.GetPDF().GetCoefSum();
234+
double signal_fraction = fcn.GetPDF().Coefficient(0)/fcn.GetPDF().GetCoefSum();
235235
for (size_t i=0 ; i<=100 ; i++) {
236236
double x = hist_signal.GetBinCenter(i);
237237
hist_signal.SetBinContent(i, signal(x) );
@@ -240,7 +240,7 @@ int main(int argv, char** argc)
240240

241241
//signal component
242242
auto background = fcn.GetPDF().PDF(_1);
243-
double background_fraction = fcn.GetPDF().Coeficient(1)/fcn.GetPDF().GetCoefSum();
243+
double background_fraction = fcn.GetPDF().Coefficient(1)/fcn.GetPDF().GetCoefSum();
244244
for (size_t i=0 ; i<=100 ; i++) {
245245
double x = hist_background.GetBinCenter(i);
246246
hist_background.SetBinContent(i, background(x) );

examples/phys/crystal_ball_plus_exponential.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ int main(int argv, char** argc)
233233

234234
//signal component
235235
auto signal = fcn.GetPDF().PDF(_0);
236-
double signal_fraction = fcn.GetPDF().Coeficient(0)/fcn.GetPDF().GetCoefSum();
236+
double signal_fraction = fcn.GetPDF().Coefficient(0)/fcn.GetPDF().GetCoefSum();
237237
for (size_t i=0 ; i<=100 ; i++) {
238238
double x = hist_signal.GetBinCenter(i);
239239
hist_signal.SetBinContent(i, signal(x) );
@@ -242,7 +242,7 @@ int main(int argv, char** argc)
242242

243243
//signal component
244244
auto background = fcn.GetPDF().PDF(_1);
245-
double background_fraction = fcn.GetPDF().Coeficient(1)/fcn.GetPDF().GetCoefSum();
245+
double background_fraction = fcn.GetPDF().Coefficient(1)/fcn.GetPDF().GetCoefSum();
246246
for (size_t i=0 ; i<=100 ; i++) {
247247
double x = hist_background.GetBinCenter(i);
248248
hist_background.SetBinContent(i, background(x) );

examples/phys/dalitz_plot.inl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,13 @@ public:
180180
inline hydra::BreitWignerLineShape<L,L,double> const&
181181
GetLineShape() const { return fLineShape; }
182182

183+
void Update() final {
184+
185+
fLineShape.SetParameter(0, _par[2]);
186+
fLineShape.SetParameter(1, _par[3]);
187+
188+
}
189+
183190
__hydra_dual__
184191
inline void Update() final
185192
{
@@ -199,7 +206,6 @@ public:
199206
hydra::Vector4R Kpi2 = kaon + pion2;
200207

201208

202-
203209
hydra::complex<double> contrib_12 = fLineShape((Kpi1).mass())*fAngularDist(fCosDecayAngle(mother, Kpi1, kaon));
204210
hydra::complex<double> contrib_13 = fLineShape((Kpi2).mass())*fAngularDist(fCosDecayAngle(mother, Kpi2, pion2));
205211

examples/phys/double_gaussian_plus_exponential.inl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,11 +241,11 @@ int main(int argv, char** argc)
241241
hist_signal.Scale(hist_data.Integral()*signal_fraction/hist_signal.Integral());
242242
*/
243243

244-
double signal_fraction = fcn.GetPDF().Coeficient(0)/fcn.GetPDF().GetCoefSum();
244+
double signal_fraction = fcn.GetPDF().Coefficient(0)/fcn.GetPDF().GetCoefSum();
245245

246246
//core component
247247
auto core = fcn.GetPDF().PDF(_0).PDF(_0);
248-
double core_fraction = signal_fraction*fcn.GetPDF().PDF(_0).Coeficient(0);
248+
double core_fraction = signal_fraction*fcn.GetPDF().PDF(_0).Coefficient(0);
249249
for (size_t i=0 ; i<=100 ; i++) {
250250
double x = hist_core.GetBinCenter(i);
251251
hist_core.SetBinContent(i, core(x) );
@@ -254,7 +254,7 @@ int main(int argv, char** argc)
254254

255255
//tail component
256256
auto tail = fcn.GetPDF().PDF(_0).PDF(_1);
257-
double tail_fraction = signal_fraction*fcn.GetPDF().PDF(_0).Coeficient(1);
257+
double tail_fraction = signal_fraction*fcn.GetPDF().PDF(_0).Coefficient(1);
258258
for (size_t i=0 ; i<=100 ; i++) {
259259
double x = hist_tail.GetBinCenter(i);
260260
hist_tail.SetBinContent(i, tail(x) );
@@ -264,7 +264,7 @@ int main(int argv, char** argc)
264264

265265
// background component
266266
auto background = fcn.GetPDF().PDF(_1);
267-
double background_fraction = fcn.GetPDF().Coeficient(1)/fcn.GetPDF().GetCoefSum();
267+
double background_fraction = fcn.GetPDF().Coefficient(1)/fcn.GetPDF().GetCoefSum();
268268
for (size_t i=0 ; i<=100 ; i++) {
269269
double x = hist_background.GetBinCenter(i);
270270
hist_background.SetBinContent(i, background(x) );

examples/phys/gaussian_plus_argus.inl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ int main(int argv, char** argc)
242242

243243
//signal component
244244
auto signal = fcn.GetPDF().PDF(_0);
245-
double signal_fraction = fcn.GetPDF().Coeficient(0)/fcn.GetPDF().GetCoefSum();
245+
double signal_fraction = fcn.GetPDF().Coefficient(0)/fcn.GetPDF().GetCoefSum();
246246
for (size_t i=0 ; i<=100 ; i++) {
247247
double x = hist_signal.GetBinCenter(i);
248248
hist_signal.SetBinContent(i, signal(x) );
@@ -251,7 +251,7 @@ int main(int argv, char** argc)
251251

252252
//signal component
253253
auto background = fcn.GetPDF().PDF(_1);
254-
double background_fraction = fcn.GetPDF().Coeficient(1)/fcn.GetPDF().GetCoefSum();
254+
double background_fraction = fcn.GetPDF().Coefficient(1)/fcn.GetPDF().GetCoefSum();
255255
for (size_t i=0 ; i<=100 ; i++) {
256256
double x = hist_background.GetBinCenter(i);
257257
hist_background.SetBinContent(i, background(x) );

examples/phys/particle_mass.inl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ int main(int argv, char** argc)
252252

253253
//signal component
254254
auto signal = fcn.GetPDF().PDF(_0);
255-
double signal_fraction = fcn.GetPDF().Coeficient(0)/fcn.GetPDF().GetCoefSum();
255+
double signal_fraction = fcn.GetPDF().Coefficient(0)/fcn.GetPDF().GetCoefSum();
256256
for (size_t i=0 ; i<=100 ; i++) {
257257
double x = hist_signal.GetBinCenter(i);
258258
hist_signal.SetBinContent(i, signal(x) );
@@ -261,7 +261,7 @@ int main(int argv, char** argc)
261261

262262
//combinatorial component
263263
auto combinatorial = fcn.GetPDF().PDF(_1);
264-
double combinatorial_fraction = fcn.GetPDF().Coeficient(1)/fcn.GetPDF().GetCoefSum();
264+
double combinatorial_fraction = fcn.GetPDF().Coefficient(1)/fcn.GetPDF().GetCoefSum();
265265
for (size_t i=0 ; i<=100 ; i++) {
266266
double x = hist_combinatorial.GetBinCenter(i);
267267
hist_combinatorial.SetBinContent(i, combinatorial(x) );
@@ -270,7 +270,7 @@ int main(int argv, char** argc)
270270

271271
//partial component
272272
auto partialrec = fcn.GetPDF().PDF(_2);
273-
double partialrec_fraction = fcn.GetPDF().Coeficient(2)/fcn.GetPDF().GetCoefSum();
273+
double partialrec_fraction = fcn.GetPDF().Coefficient(2)/fcn.GetPDF().GetCoefSum();
274274
for (size_t i=0 ; i<=100 ; i++) {
275275
double x = hist_partialrec.GetBinCenter(i);
276276
hist_partialrec.SetBinContent(i, partialrec(x) );

0 commit comments

Comments
 (0)