Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
BAORadio
AnaPAON4
Commits
ab771117
Commit
ab771117
authored
Feb 26, 2019
by
Reza ANSARI
Browse files
Correction bug option fit avec phase(freq) pas passe , et debut debug fit avec minuit, Reza
parent
55aae307
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
tkfit_minuit.h
tkfit_minuit.h
+3
-2
trkacxfit.cc
trkacxfit.cc
+2
-2
No files found.
tkfit_minuit.h
View file @
ab771117
...
...
@@ -51,7 +51,7 @@ public:
upar_
.
Add
(
v_pname
[
i
],
0.
);
}
max_step_
=
1000
;
tolerance_
=
0.0
5
;
tolerance_
=
0.0
01
;
bestxi2red_
=-
1.
;
rcfit_
=-
9999
;
nstepdone_
=
0
;
...
...
@@ -140,7 +140,8 @@ public:
{
MnMigrad
migrad
(
gxi2_
,
upar_
);
// unsigned int nparFree = migrad.VariableParameters();
// cout << "Nbre of free parameters = " << nparFree << endl;
cout
<<
"TkF_Fitter::doFit() - Calling Minuit MnMigard minimisationn, NbFreeParam= "
<<
migrad
.
VariableParameters
()
<<
" max_step="
<<
max_step_
<<
" Tolerance="
<<
tolerance_
<<
endl
;
minxi2_p_
=
new
FunctionMinimum
(
migrad
(
max_step_
,
tolerance_
));
nstepdone_
=
rcfit_
=
minxi2_p_
->
NFcn
();
bestxi2red_
=
minxi2_p_
->
Fval
()
/
(
double
)
gxi2_
.
getNbDataPoints
();
...
...
trkacxfit.cc
View file @
ab771117
...
...
@@ -138,7 +138,7 @@ int main (int narg, char* arg[])
sprintf
(
fnbuff
,
"cx_%d_"
,(
int
)(
i
+
1
));
string
cxofile
=
fnbuff
+
outfilename
;
string
cxckfile
=
fnbuff
+
checkfilename
;
acxfit
.
doCxfit
(
cxofile
,
fguseAac4Cx
);
acxfit
.
doCxfit
(
cxofile
,
fguseAac4Cx
,
fg_phi0only
);
acxfit
.
saveExpectedCx
(
cxckfile
);
}
v_acxd
.
push_back
(
acxd
);
...
...
@@ -159,7 +159,7 @@ int main (int narg, char* arg[])
// cxbfit.doCheck();
}
if
(
do_baselinefit
)
{
cxbfit
.
dofit
(
cxbofile
,
fg_fixbaseline
);
cxbfit
.
dofit
(
cxbofile
,
fg_fixbaseline
,
fg_phi0only
);
cxbckfile
=
"cxb6f_"
+
checkfilename
;
cxbfit
.
saveExpectedCx
(
cxbckfile
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment