| 106 |
|
double y = (static_cast<double>(j) + 0.5)*ystep + ylo; |
| 107 |
|
double sig_cut = 1.0e-5; |
| 108 |
|
double nu = XbinSize * YbinSize * fit_fcn(x, y, xval); |
| 109 |
< |
double sigma = fabs(mdef->chisquare_error(nu)) < sig_cut |
| 110 |
< |
? sig_cut : mdef->chisquare_error(nu); |
| 109 |
> |
double sigma = fabs(mdef->chisquare_error(0.0)) < sig_cut |
| 110 |
> |
? sig_cut : mdef->chisquare_error(0.0); |
| 111 |
|
|
| 112 |
< |
fsum += xstep * ystep * mdef->get_formula()->Eval(x, y) |
| 112 |
> |
fsum += pow(xstep * ystep * mdef->get_formula()->Eval(x, y), 2.0) |
| 113 |
|
/ sigma / sigma; |
| 114 |
|
} |
| 115 |
|
} |
| 136 |
|
/ static_cast<double>(energy.bins.at(i).size()) + energy.Ylo; |
| 137 |
|
double nu = fit_fcn(x, y, xval) * XbinSize * YbinSize; |
| 138 |
|
double sig_cut = 1.0e-5; |
| 139 |
< |
if (fabs(mdef->chisquare_error(nu)) > sig_cut || !ignorezero) { |
| 139 |
> |
if (fabs(mdef->chisquare_error(energy.bins.at(i).at(j))) > sig_cut || !ignorezero) { |
| 140 |
|
chisquare += pow(energy.bins.at(i).at(j) - nu, 2.0) |
| 141 |
< |
/ pow(mdef->chisquare_error(nu), 2.0); |
| 141 |
> |
/ pow(mdef->chisquare_error(energy.bins.at(i).at(j)), 2.0); |
| 142 |
|
} |
| 143 |
|
else { |
| 144 |
|
chisquare += pow(energy.bins.at(i).at(j) - nu, 2.0) |
| 146 |
|
} |
| 147 |
|
} |
| 148 |
|
} |
| 149 |
< |
|
| 149 |
> |
|
| 150 |
|
// add errors due to Gaussians outside histogram |
| 151 |
< |
double eps = 0.1; // accuracy set for this function |
| 151 |
> |
double eps = 0.01; // accuracy set for this function |
| 152 |
|
for (int i = 0; i < ngauss; i++) { |
| 153 |
|
double *pval = xval+i*(mdef->get_formula()->GetNpar()); |
| 154 |
|
double par_x = pval[mdef->get_indiv_max_x()]; |
| 155 |
|
double par_y = pval[mdef->get_indiv_max_y()]; |
| 156 |
|
double par_sig = pval[3]; |
| 157 |
< |
double cutoff_rad = -log(eps * 2.0 * PI * par_sig * par_sig |
| 158 |
< |
/ pval[0]); |
| 157 |
> |
double cutoff_rad = sqrt(-log(eps * 2.0 * PI * par_sig * par_sig |
| 158 |
> |
/ pval[0]) * 2.0 * par_sig * par_sig); |
| 159 |
|
|
| 160 |
|
bool left = par_x < energy.Xlo + cutoff_rad; |
| 161 |
|
bool right = par_x > energy.Xhi - cutoff_rad; |
| 167 |
|
double xhi = energy.Xlo; |
| 168 |
|
double ylo = energy.Ylo; |
| 169 |
|
double yhi = energy.Yhi; |
| 170 |
< |
chisquare += formula_int(xlo, xhi, ylo, yhi, pval, |
| 170 |
> |
chisquare += 2.0*formula_int(xlo, xhi, ylo, yhi, pval, |
| 171 |
|
XbinSize, YbinSize, xval); |
| 172 |
|
} |
| 173 |
|
if (right) { |
| 175 |
|
double xhi = par_x + cutoff_rad; |
| 176 |
|
double ylo = energy.Ylo; |
| 177 |
|
double yhi = energy.Yhi; |
| 178 |
< |
chisquare += formula_int(xlo, xhi, ylo, yhi, pval, |
| 178 |
> |
chisquare += 2.0*formula_int(xlo, xhi, ylo, yhi, pval, |
| 179 |
|
XbinSize, YbinSize, xval); |
| 180 |
|
} |
| 181 |
|
if (top) { |
| 183 |
|
double xhi = right ? par_x + cutoff_rad : energy.Xhi; |
| 184 |
|
double ylo = energy.Yhi; |
| 185 |
|
double yhi = par_y + cutoff_rad; |
| 186 |
< |
chisquare += formula_int(xlo, xhi, ylo, yhi, pval, |
| 186 |
> |
chisquare += 2.0*formula_int(xlo, xhi, ylo, yhi, pval, |
| 187 |
|
XbinSize, YbinSize, xval); |
| 188 |
|
} |
| 189 |
|
if (bottom) { |
| 191 |
|
double xhi = right ? par_x + cutoff_rad : energy.Xhi; |
| 192 |
|
double ylo = par_y - cutoff_rad; |
| 193 |
|
double yhi = energy.Ylo; |
| 194 |
< |
chisquare += formula_int(xlo, xhi, ylo, yhi, pval, |
| 194 |
> |
chisquare += 2.0*formula_int(xlo, xhi, ylo, yhi, pval, |
| 195 |
|
XbinSize, YbinSize, xval); |
| 196 |
|
} |
| 197 |
|
} |
| 198 |
< |
|
| 198 |
> |
|
| 199 |
|
fcnval = chisquare; |
| 200 |
|
} |
| 201 |
|
catch (exception ex) { |
| 486 |
|
void fill_histo_with_vec(TH2 *hist, vector< vector<double> > &vec) { |
| 487 |
|
for (int i = 0; i < vec.size(); i++) { |
| 488 |
|
for (int j = 0; j < vec[i].size(); j++) { |
| 489 |
< |
hist->Fill(i+1, j+1, vec[i][j]); |
| 489 |
> |
hist->SetBinContent(i+1, j+1, vec[i][j]); |
| 490 |
|
} |
| 491 |
|
} |
| 492 |
|
} |
| 499 |
|
if (ngauss <= mdef->get_n_special_par_sets()) { |
| 500 |
|
init_spec_pars = true; |
| 501 |
|
for (int k = 0; k < ngauss; k++) { |
| 502 |
< |
int ipar0 = k*mdef->get_formula()->GetNpar(); // index of par 0 |
| 502 |
> |
int ipar0 = k*mdef->get_formula()->GetNpar(); // index of indiv par 0 |
| 503 |
|
for (int l = 0; l < mdef->get_formula()->GetNpar(); l++) { |
| 504 |
|
int ipar = ipar0 + l; |
| 505 |
|
if (ipar < npar) |
| 528 |
|
double y = static_cast<double>(j)*(energy.Yhi - energy.Ylo) |
| 529 |
|
/ static_cast<double>(energy.bins[i].size()) + energy.Ylo; |
| 530 |
|
if (ngauss > 1) { |
| 531 |
< |
// subtract 4*sigma plus integral of fit function |
| 531 |
> |
// subtract integral of fit function |
| 532 |
|
try { |
| 533 |
|
int npval_other = r.pval.at(r.pval.size()-1).size(); |
| 534 |
|
if (npval_other > 256) { |
| 541 |
|
ngauss--; |
| 542 |
|
double nu = fit_fcn(x, y, pval_other) * XbinSize * YbinSize; |
| 543 |
|
ngauss++; |
| 544 |
< |
sub_energy[i][j] = energy.bins[i][j] - nu |
| 545 |
< |
- 2.2*mdef->chisquare_error(nu); |
| 544 |
> |
sub_energy[i][j] = energy.bins[i][j] - nu; |
| 545 |
|
} |
| 546 |
|
catch (exception ex) { |
| 547 |
|
cerr << "Exception in par_init" << endl; |
| 558 |
|
sub_energy[0].size(), energy.Ylo, |
| 559 |
|
energy.Yhi); |
| 560 |
|
fill_histo_with_vec(hist_sub, sub_energy); |
| 561 |
< |
max_sub = hist_sub->GetSumOfWeights(); |
| 561 |
> |
max_sub = 0.0; |
| 562 |
> |
for (int i = 1; i <= hist_sub->GetXaxis()->GetNbins(); i++) { |
| 563 |
> |
for (int j = 1; j <= hist_sub->GetYaxis()->GetNbins(); j++) { |
| 564 |
> |
if (hist_sub->GetBinContent(i, j) > max_sub) { |
| 565 |
> |
max_sub = hist_sub->GetBinContent(i, j); |
| 566 |
> |
} |
| 567 |
> |
} |
| 568 |
> |
} |
| 569 |
|
max_x = hist_sub->GetMean(1); |
| 570 |
|
max_y = hist_sub->GetMean(2); |
| 571 |
|
|
| 572 |
|
for (int i = npar1; i < npar; i++) { |
| 573 |
|
if (mdef->get_indiv_max_E() == i - npar1) { |
| 568 |
– |
double nu = 0.0; |
| 569 |
– |
if (ngauss > 1) { |
| 570 |
– |
ngauss--; |
| 571 |
– |
nu = fit_fcn(max_x, max_y, pval_other) * XbinSize * YbinSize; |
| 572 |
– |
ngauss++; |
| 573 |
– |
} |
| 574 |
|
pval[i] = max_sub; |
| 575 |
|
perr[i] = mdef->chisquare_error(pval[i])*0.5; |
| 576 |
|
plo[i] = 0.0; |
