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
IPNL_GAMMA
gammaware
Commits
73480ac0
Commit
73480ac0
authored
Nov 10, 2020
by
Jérémie Dudouet
Browse files
correct a bug in the BgFit
parent
430f6be7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
src/root/gui/cubix/src/CXBgdFit.cpp
src/root/gui/cubix/src/CXBgdFit.cpp
+11
-4
src/root/gui/cubix/src/CXHist1DPlayer.cpp
src/root/gui/cubix/src/CXHist1DPlayer.cpp
+0
-1
src/root/gui/cubix/src/CXMainWindow.cpp
src/root/gui/cubix/src/CXMainWindow.cpp
+0
-1
No files found.
src/root/gui/cubix/src/CXBgdFit.cpp
View file @
73480ac0
...
...
@@ -106,7 +106,6 @@ void CXBgdFit::Update()
arr
->
SetLineColor
(
kBlue
);
arr
->
SetFillColor
(
kBlue
);
fBackgd
.
push_back
(
E
);
cout
<<
E
<<
endl
;
}
fPlayer
->
GetMainWindow
()
->
RefreshPads
();
...
...
@@ -175,7 +174,10 @@ void CXBgdFit::Fit()
Int_t
binmin
=
fHistogram
->
GetXaxis
()
->
FindBin
(
fBackgd
.
at
(
i
));
Int_t
binmax
=
fHistogram
->
GetXaxis
()
->
FindBin
(
fBackgd
.
at
(
i
+
1
));
for
(
int
ibin
=
binmin
;
ibin
<=
binmax
;
ibin
++
)
HistoToFit
->
SetBinContent
(
ibin
,
fHistogram
->
GetBinContent
(
ibin
));
for
(
int
ibin
=
binmin
;
ibin
<=
binmax
;
ibin
++
)
{
HistoToFit
->
SetBinContent
(
ibin
,
fHistogram
->
GetBinContent
(
ibin
));
HistoToFit
->
SetBinError
(
ibin
,
fHistogram
->
GetBinError
(
ibin
));
}
}
HistoToFit
->
GetXaxis
()
->
SetRangeUser
(
fBackgd
.
front
(),
fBackgd
.
back
());
...
...
@@ -196,10 +198,15 @@ void CXBgdFit::Fit()
TString
FitOpt
=
"R0S"
;
if
(
fPlayer
->
GetPrintLevel
()
>
0
)
FitOpt
+=
"V"
;
TFitResultPtr
r
=
HistoToFit
->
Fit
(
fBackFunction
,
FitOpt
.
Data
());
TFitResultPtr
r
=
HistoToFit
->
Fit
(
fBackFunction
,
FitOpt
.
Data
(),
FitOpt
.
Data
());
ostringstream
text
;
cout
<<
r
<<
endl
;
if
(
r
==-
1
)
{
WARN_MESS
<<
"Oups... Error in fitting histogram"
<<
ENDL
;
return
;
}
text
<<
"Fit results :"
;
cout
<<
text
.
str
()
<<
endl
;
fPlayer
->
PrintInListBox
(
text
.
str
(),
kPrint
);
text
.
str
(
""
);
text
<<
"Status: "
;
...
...
src/root/gui/cubix/src/CXHist1DPlayer.cpp
View file @
73480ac0
...
...
@@ -516,7 +516,6 @@ void CXHist1DPlayer::DoBgdFit()
{
fFitResultsBox
->
RemoveAll
();
fListOfBgdFitObjects
->
ls
();
for
(
int
i
=
0
;
i
<
fListOfBgdFitObjects
->
GetEntries
()
;
i
++
)
{
CXBgdFit
*
fit
=
(
CXBgdFit
*
)
fListOfBgdFitObjects
->
At
(
i
);
fit
->
Fit
();
...
...
src/root/gui/cubix/src/CXMainWindow.cpp
View file @
73480ac0
...
...
@@ -893,7 +893,6 @@ TH1 *CXMainWindow::GetHisto(TVirtualPad *pad, bool GetFirst)
obj
=
lnk
->
GetObject
();
if
(
obj
->
InheritsFrom
(
TH1
::
Class
())
&&
strcmp
(
obj
->
GetName
()
,
"hframe"
)
!=
0
)
{
hist
=
dynamic_cast
<
TH1
*>
(
obj
);
hist
->
Print
();
if
(
GetFirst
)
return
hist
;
}
lnk
=
(
TObjOptLink
*
)
lnk
->
Next
();
...
...
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