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
a6a3ac64
Commit
a6a3ac64
authored
Jul 04, 2019
by
Jérémie Dudouet
Browse files
correct a bug in cleaning peak search
parent
8d7510fa
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
24 deletions
+22
-24
src/root/gui/cubix/src/CXArrow.cpp
src/root/gui/cubix/src/CXArrow.cpp
+5
-3
src/root/gui/cubix/src/CXArrow.h
src/root/gui/cubix/src/CXArrow.h
+1
-1
src/root/gui/cubix/src/CXHist1DPlayer.cpp
src/root/gui/cubix/src/CXHist1DPlayer.cpp
+2
-1
src/root/gui/cubix/src/CXLevelSchemePlayer.cpp
src/root/gui/cubix/src/CXLevelSchemePlayer.cpp
+6
-19
src/root/gui/cubix/src/CXLevelSchemePlayer.h
src/root/gui/cubix/src/CXLevelSchemePlayer.h
+1
-0
src/root/gui/cubix/src/CXNucleus.h
src/root/gui/cubix/src/CXNucleus.h
+7
-0
No files found.
src/root/gui/cubix/src/CXArrow.cpp
View file @
a6a3ac64
...
...
@@ -90,7 +90,7 @@ void CXArrow::SetText(TH1 *hist, TString text, TString tooltip)
hist
->
GetYaxis
()
->
SetRangeUser
(
gPad
->
GetUymin
(),
Y
+
MaxGlob
/
50.
);
}
void
CXArrow
::
ClearPad
(
TVirtualPad
*
pad
)
void
CXArrow
::
ClearPad
(
TVirtualPad
*
pad
,
bool
refresh
)
{
if
(
pad
==
nullptr
)
pad
=
gPad
;
...
...
@@ -98,8 +98,10 @@ void CXArrow::ClearPad(TVirtualPad *pad)
pad
->
GetListOfPrimitives
()
->
Remove
(
fBox
);
pad
->
GetListOfPrimitives
()
->
Remove
(
this
);
pad
->
Modified
();
pad
->
Update
();
if
(
refresh
)
{
pad
->
Modified
();
pad
->
Update
();
}
}
...
...
src/root/gui/cubix/src/CXArrow.h
View file @
a6a3ac64
...
...
@@ -43,7 +43,7 @@ public:
void
SetText
(
TH1
*
hist
,
TString
text
,
TString
tooltip
);
void
ClearPad
(
TVirtualPad
*
pad
=
nullptr
);
void
ClearPad
(
TVirtualPad
*
pad
=
nullptr
,
bool
refresh
=
true
);
virtual
void
Paint
(
Option_t
*
option
=
""
);
...
...
src/root/gui/cubix/src/CXHist1DPlayer.cpp
View file @
a6a3ac64
...
...
@@ -212,6 +212,7 @@ void CXHist1DPlayer::SetMainWindow(CXMainWindow *w)
void
CXHist1DPlayer
::
PeakSearchClear
()
{
TVirtualPad
*
pad
=
fMainWindow
->
GetSelectedPad
();
gPad
=
pad
;
if
(
pad
==
nullptr
)
{
cout
<<
"No selected pad, ignored"
<<
endl
;
...
...
@@ -221,7 +222,7 @@ void CXHist1DPlayer::PeakSearchClear()
for
(
int
i
=
0
;
i
<
pad
->
GetListOfPrimitives
()
->
GetEntries
()
;
i
++
)
{
TObject
*
o
=
pad
->
GetListOfPrimitives
()
->
At
(
i
);
if
(
o
->
InheritsFrom
(
CXArrow
::
Class
()))
{
((
CXArrow
*
)
o
)
->
ClearPad
();
((
CXArrow
*
)
o
)
->
ClearPad
(
pad
,
false
);
i
--
;
}
}
...
...
src/root/gui/cubix/src/CXLevelSchemePlayer.cpp
View file @
a6a3ac64
...
...
@@ -71,6 +71,9 @@ CXLevelSchemePlayer::CXLevelSchemePlayer(const char* name, const char *title) :
fListOfBoxes
=
new
TList
;
fListOfBoxes
->
SetOwner
();
fListOfCXArrows
=
new
TList
;
fListOfCXArrows
->
SetOwner
();
}
CXLevelSchemePlayer
::~
CXLevelSchemePlayer
()
...
...
@@ -80,9 +83,9 @@ CXLevelSchemePlayer::~CXLevelSchemePlayer()
void
CXLevelSchemePlayer
::
ConnectCanvas
()
{
TList
*
l
=
fMainWindow
->
GetCanvas
()
->
GetListOfSignals
();
if
(
l
==
nullptr
||
l
->
FindObject
(
"ProcessedEventLevelScheme(int,int,int,TObject*)"
)
==
nullptr
)
fMainWindow
->
GetCanvas
()
->
Connect
(
"ProcessedEvent(Int_t, Int_t, Int_t, TObject*)"
,
"CXLevelSchemePlayer"
,
this
,
"ProcessedEventLevelScheme(Int_t, Int_t, Int_t, TObject*)"
);
//
TList *l = fMainWindow->GetCanvas()->GetListOfSignals();
//
if(l==nullptr || l->FindObject("ProcessedEventLevelScheme(int,int,int,TObject*)") == nullptr)
fMainWindow
->
GetCanvas
()
->
Connect
(
"ProcessedEvent(Int_t, Int_t, Int_t, TObject*)"
,
"CXLevelSchemePlayer"
,
this
,
"ProcessedEventLevelScheme(Int_t, Int_t, Int_t, TObject*)"
);
}
void
CXLevelSchemePlayer
::
DrawArrows
(
TString
ListOfNuclei
,
TH1
*
h
)
...
...
@@ -116,22 +119,6 @@ void CXLevelSchemePlayer::DrawArrows(TString ListOfNuclei,TH1 *h)
}
}
// if(fListOfArrows != nullptr)
// delete fListOfArrows;
// if(fListOfLatex != nullptr)
// delete fListOfLatex;
// if(fListOfBoxes != nullptr)
// delete fListOfBoxes;
// fListOfArrows = new TList;
// fListOfArrows->SetOwner();
// fListOfLatex = new TList;
// fListOfLatex->SetOwner();
// fListOfBoxes = new TList;
// fListOfBoxes->SetOwner();
fCurrentHist
=
h
;
fCurrentHist
->
GetYaxis
()
->
UnZoom
();
...
...
src/root/gui/cubix/src/CXLevelSchemePlayer.h
View file @
a6a3ac64
...
...
@@ -56,6 +56,7 @@ private:
TList
*
fListOfArrows
=
nullptr
;
TList
*
fListOfLatex
=
nullptr
;
TList
*
fListOfBoxes
=
nullptr
;
TList
*
fListOfCXArrows
=
nullptr
;
TList
*
fListOfDatabase
=
nullptr
;
...
...
src/root/gui/cubix/src/CXNucleus.h
View file @
a6a3ac64
...
...
@@ -20,6 +20,13 @@ private:
Float_t
fLifeTime
;
TString
fJPi
;
TString
fJDecay
;
Float_t
MassExc
;
Float_t
Abund
;
Float_t
Branching
;
NucData
*
fdata
;
public:
...
...
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