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
Jérémie Dudouet
gammaware
Commits
4b383706
Commit
4b383706
authored
Apr 02, 2020
by
Jérémie Dudouet
Browse files
Merge branch 'Cubix' of gitlab.in2p3.fr:dudouet/gammaware into Cubix
parents
4bd6053e
429b8113
Pipeline
#64567
passed with stage
in 8 minutes and 50 seconds
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
1 deletion
+2
-1
src/root/gui/cubix/src/CXBgdUtility.h
src/root/gui/cubix/src/CXBgdUtility.h
+1
-0
src/root/gui/cubix/src/CXFit.cpp
src/root/gui/cubix/src/CXFit.cpp
+0
-1
src/root/gui/cubix/src/CXMainWindow.cpp
src/root/gui/cubix/src/CXMainWindow.cpp
+1
-0
No files found.
src/root/gui/cubix/src/CXBgdUtility.h
View file @
4b383706
...
...
@@ -47,6 +47,7 @@ private:
TGNumberEntry
*
fNItersButton2D
[
2
]
=
{};
TGRadioButton
*
fDirectionButton1D
[
2
]
=
{};
array
<
TGRadioButton
*
,
4
>
fFilterOrderButton1D
=
{};
array
<
TGRadioButton
*
,
7
>
fSmoothingButton1D
=
{};
...
...
src/root/gui/cubix/src/CXFit.cpp
View file @
4b383706
...
...
@@ -63,7 +63,6 @@ void CXFit::AddArrow(Double_t Energy)
Energy
=
fHistogram
->
GetBinCenter
(
Bin
);
Double_t
MaxGlob
=
fHistogram
->
GetMaximum
();
auto
*
arrow
=
new
CXArrow
(
this
,
Energy
,(
Value
+
MaxGlob
/
100.
)
,(
Value
+
MaxGlob
/
15.
),
0.01
,
"<|"
);
arrow
->
SetAngle
(
30
);
arrow
->
SetLineWidth
(
2
);
arrow
->
Draw
();
...
...
src/root/gui/cubix/src/CXMainWindow.cpp
View file @
4b383706
...
...
@@ -892,6 +892,7 @@ TH1 *CXMainWindow::GetHisto(TVirtualPad *pad, bool GetFirst)
obj
=
lnk
->
GetObject
();
if
(
obj
->
InheritsFrom
(
TH1
::
Class
())
&&
strncmp
(
obj
->
GetName
()
,
"hframe"
,
strlen
(
obj
->
GetName
()))
!=
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