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
ec03e511
Commit
ec03e511
authored
Sep 15, 2020
by
Jérémie Dudouet
Browse files
Merge branch 'Cubix' into 'preprod'
update headersfor root 6-22-02 See merge request
!60
parents
581266d2
bcc38511
Pipeline
#83372
passed with stages
in 5 minutes and 10 seconds
Changes
22
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
29 additions
and
14 deletions
+29
-14
src/root/gui/cubix/src/CXBgdUtility.h
src/root/gui/cubix/src/CXBgdUtility.h
+1
-0
src/root/gui/cubix/src/CXCanvas.cpp
src/root/gui/cubix/src/CXCanvas.cpp
+1
-0
src/root/gui/cubix/src/CXFileList.cpp
src/root/gui/cubix/src/CXFileList.cpp
+1
-0
src/root/gui/cubix/src/CXGFileBrowser.cpp
src/root/gui/cubix/src/CXGFileBrowser.cpp
+2
-0
src/root/gui/cubix/src/CXGammaSearch.cpp
src/root/gui/cubix/src/CXGammaSearch.cpp
+3
-3
src/root/gui/cubix/src/CXGateBox.cpp
src/root/gui/cubix/src/CXGateBox.cpp
+1
-0
src/root/gui/cubix/src/CXGuiLSPlayer.cpp
src/root/gui/cubix/src/CXGuiLSPlayer.cpp
+1
-1
src/root/gui/cubix/src/CXHist1DCalib.cpp
src/root/gui/cubix/src/CXHist1DCalib.cpp
+1
-1
src/root/gui/cubix/src/CXHist1DCalib.h
src/root/gui/cubix/src/CXHist1DCalib.h
+1
-0
src/root/gui/cubix/src/CXHistoManipulator.cpp
src/root/gui/cubix/src/CXHistoManipulator.cpp
+1
-0
src/root/gui/cubix/src/CXLevelSchemePlayer.cpp
src/root/gui/cubix/src/CXLevelSchemePlayer.cpp
+2
-2
src/root/gui/cubix/src/CXMainWindow.cpp
src/root/gui/cubix/src/CXMainWindow.cpp
+1
-0
src/root/gui/cubix/src/CXNDManager.cpp
src/root/gui/cubix/src/CXNDManager.cpp
+2
-2
src/root/gui/cubix/src/CXNDManager.h
src/root/gui/cubix/src/CXNDManager.h
+2
-2
src/root/gui/cubix/src/CXNucChart.cpp
src/root/gui/cubix/src/CXNucChart.cpp
+1
-0
src/root/gui/cubix/src/CXNucleusBox.cpp
src/root/gui/cubix/src/CXNucleusBox.cpp
+2
-2
src/root/gui/cubix/src/CXRadCubeTH1Proj.cpp
src/root/gui/cubix/src/CXRadCubeTH1Proj.cpp
+1
-0
src/root/gui/cubix/src/CXRadReader.cpp
src/root/gui/cubix/src/CXRadReader.cpp
+2
-1
src/root/gui/cubix/src/CXTH1Proj.cpp
src/root/gui/cubix/src/CXTH1Proj.cpp
+2
-0
src/root/gui/fipps_spy/src/FSTab.cpp
src/root/gui/fipps_spy/src/FSTab.cpp
+1
-0
No files found.
src/root/gui/cubix/src/CXBgdUtility.h
View file @
ec03e511
...
...
@@ -6,6 +6,7 @@
#include "RQ_OBJECT.h"
#include "CXMainWindow.h"
#include <array>
class
TH2
;
class
TGLabel
;
...
...
src/root/gui/cubix/src/CXCanvas.cpp
View file @
ec03e511
...
...
@@ -25,6 +25,7 @@
#include "CXMainWindow.h"
#include "CXRadCubeTH1Proj.h"
#include "CXTH1Proj.h"
#include "TVirtualX.h"
using
namespace
std
;
...
...
src/root/gui/cubix/src/CXFileList.cpp
View file @
ec03e511
...
...
@@ -20,6 +20,7 @@
#include "TCanvas.h"
#include "TCutG.h"
#include "TROOT.h"
#include "TVirtualX.h"
#include "TH1.h"
#include "TF1.h"
...
...
src/root/gui/cubix/src/CXGFileBrowser.cpp
View file @
ec03e511
...
...
@@ -51,6 +51,8 @@
#include "TBaseClass.h"
#include "RConfigure.h"
#include "TVirtualX.h"
#include "TObjString.h"
#ifdef WIN32
const
char
rootdir
[]
=
"
\\
"
;
...
...
src/root/gui/cubix/src/CXGammaSearch.cpp
View file @
ec03e511
...
...
@@ -273,7 +273,7 @@ void CXGammaSearch::FindGammaRays(Bool_t Bash)
std
::
vector
<
GammaTransition
>
avect
;
for
(
in
t
ig
=
0
;
ig
<
GoodGammas
.
size
()
;
ig
++
)
for
(
size_
t
ig
=
0
;
ig
<
GoodGammas
.
size
()
;
ig
++
)
{
GammaTransition
agammatrans
;
...
...
@@ -387,7 +387,7 @@ void CXGammaSearch::FindInDoubleCoincidence(Bool_t Bash)
//get the coordinates of the gammas
for
(
Int_t
ig
=
0
;
ig
<
Dim_LS
;
ig
++
)
{
for
(
in
t
j
=
0
;
j
<
avec
.
size
()
;
j
++
)
for
(
size_
t
j
=
0
;
j
<
avec
.
size
()
;
j
++
)
{
GammaTransition
GT
=
avec
[
j
];
...
...
@@ -533,7 +533,7 @@ void CXGammaSearch::FindInTripleCoincidence()
//get the coordinates of the gammas
for
(
Int_t
ig
=
0
;
ig
<
Dim_LS
;
ig
++
)
{
for
(
in
t
j
=
0
;
j
<
avec
.
size
()
;
j
++
)
for
(
size_
t
j
=
0
;
j
<
avec
.
size
()
;
j
++
)
{
GammaTransition
GT
=
avec
[
j
];
...
...
src/root/gui/cubix/src/CXGateBox.cpp
View file @
ec03e511
...
...
@@ -8,6 +8,7 @@
#include "TMath.h"
#include "TROOT.h"
#include "TH1.h"
#include "TVirtualX.h"
using
namespace
std
;
...
...
src/root/gui/cubix/src/CXGuiLSPlayer.cpp
View file @
ec03e511
...
...
@@ -261,7 +261,7 @@ void CXGuiLSPlayer::UpdateGammaRays()
if
(
fSelectedLevelScheme
)
{
if
(
fNumberOfNuclei
==
1
)
{
for
(
in
t
i
=
0
;
i
<
fSelectedLevelScheme
->
GetDataSets
().
size
()
;
i
++
)
{
for
(
size_
t
i
=
0
;
i
<
fSelectedLevelScheme
->
GetDataSets
().
size
()
;
i
++
)
{
fDataSetMode
->
AddEntry
(
fSelectedLevelScheme
->
GetDataSets
().
at
(
i
).
Dsid
.
data
(),
i
);
}
}
...
...
src/root/gui/cubix/src/CXHist1DCalib.cpp
View file @
ec03e511
...
...
@@ -111,7 +111,7 @@ void CXHist1DCalib::SetMainWindow(CXMainWindow *w)
fMainWindow
=
w
;
}
void
CXHist1DCalib
::
HandleMouse
(
Int_t
EventType
,
Int_t
EventX
,
Int_t
EventY
,
TObject
*
selected
)
void
CXHist1DCalib
::
HandleMouse
(
Int_t
/*
EventType
*/
,
Int_t
/*
EventX
*/
,
Int_t
/*
EventY
*/
,
TObject
*
/*
selected
*/
)
{
TPad
*
pad
=
dynamic_cast
<
TPad
*>
(
gROOT
->
GetSelectedPad
());
...
...
src/root/gui/cubix/src/CXHist1DCalib.h
View file @
ec03e511
...
...
@@ -17,6 +17,7 @@ class TF1;
class
TGComboBox
;
class
TGCheckButton
;
class
CXCanvas
;
class
TCanvas
;
class
CXHist1DCalib
:
public
TGVerticalFrame
{
...
...
src/root/gui/cubix/src/CXHistoManipulator.cpp
View file @
ec03e511
...
...
@@ -22,6 +22,7 @@
#include "TStyle.h"
#include "TCanvas.h"
#include "TMultiGraph.h"
#include "TObjString.h"
using
namespace
std
;
...
...
src/root/gui/cubix/src/CXLevelSchemePlayer.cpp
View file @
ec03e511
...
...
@@ -297,7 +297,7 @@ void CXLevelSchemePlayer::DrawArrow(TH1 *hist, const GammaLink *gamma, CXNucleus
return
;
Float_t
spinI
=
((
Gw
::
NuclearLevel
*
)((
GammaLink
*
)
gamma
)
->
GetIL
())
->
GetSpin
().
Get
();
Float_t
spinF
=
((
Gw
::
NuclearLevel
*
)((
GammaLink
*
)
gamma
)
->
GetFL
())
->
GetSpin
().
Get
();
//
Float_t spinF = ((Gw::NuclearLevel*)((GammaLink*)gamma)->GetFL())->GetSpin().Get();
if
(
fGuiLSPlayer
->
UseSpins
()
&&
(
spinI
<
fMinSpin
||
spinI
>
fMaxSpin
))
return
;
...
...
@@ -882,7 +882,7 @@ TString CXLevelSchemePlayer::GetSpinFromLev(NuclearLevel *nuclev)
return
Lev
;
}
void
CXLevelSchemePlayer
::
ProcessedEventLevelScheme
(
Int_t
eventType
,
Int_t
eventX
,
Int_t
eventY
,
TObject
*
obj
)
void
CXLevelSchemePlayer
::
ProcessedEventLevelScheme
(
Int_t
eventType
,
Int_t
/*
eventX
*/
,
Int_t
eventY
,
TObject
*
obj
)
{
if
(
eventType
==
kKeyPress
)
{
...
...
src/root/gui/cubix/src/CXMainWindow.cpp
View file @
ec03e511
...
...
@@ -20,6 +20,7 @@
#include "TBrowser.h"
#include "TClass.h"
#include "TExec.h"
#include "TVirtualX.h"
#include "CXGateBox.h"
#include "CXBgdUtility.h"
...
...
src/root/gui/cubix/src/CXNDManager.cpp
View file @
ec03e511
...
...
@@ -128,8 +128,8 @@ void CXNDManager::InitBE2(TString filename)
NucData
*
data
=
GetData
(
Name
);
if
(
data
==
nullptr
)
continue
;
Int_t
Z
=
data
->
Z
;
Int_t
N
=
data
->
N
;
//
Int_t Z = data->Z;
//
Int_t N = data->N;
// BE2 E2B2
Int_t
ii
=
2
;
...
...
src/root/gui/cubix/src/CXNDManager.h
View file @
ec03e511
...
...
@@ -34,8 +34,8 @@ public:
Decays
.
push_back
(
pair
);
// Sort on branching
for
(
ushor
t
t
=
1
;
t
<
Decays
.
size
()
;
t
++
)
for
(
in
t
i
=
0
;
i
<
Decays
.
size
()
-
1
;
i
++
)
for
(
size_
t
t
=
1
;
t
<
Decays
.
size
()
;
t
++
)
for
(
size_
t
i
=
0
;
i
<
Decays
.
size
()
-
1
;
i
++
)
if
(
Decays
.
at
(
i
).
second
<
Decays
.
at
(
i
+
1
).
second
){
swap
(
Decays
.
at
(
i
),
Decays
.
at
(
i
+
1
));
}
...
...
src/root/gui/cubix/src/CXNucChart.cpp
View file @
ec03e511
...
...
@@ -34,6 +34,7 @@
#include "CXNucleusBox.h"
#include "CXLevelSchemePlayer.h"
#include "CXGuiLSPlayer.h"
#include "TVirtualX.h"
using
namespace
std
;
...
...
src/root/gui/cubix/src/CXNucleusBox.cpp
View file @
ec03e511
...
...
@@ -16,7 +16,7 @@
using
namespace
std
;
CXNucleusBox
::
CXNucleusBox
(
NucData
*
nuc
,
Double_t
size
,
Int_t
colStable
,
Int_t
colRadio
,
Int_t
textsize
,
bool
withlt
,
Int_t
mode
)
:
TBox
(
nuc
->
N
-
size
,
nuc
->
Z
-
size
,
nuc
->
N
+
size
,
nuc
->
Z
+
size
)
CXNucleusBox
::
CXNucleusBox
(
NucData
*
nuc
,
Double_t
size
,
Int_t
/*
colStable
*/
,
Int_t
colRadio
,
Int_t
textsize
,
bool
withlt
,
Int_t
mode
)
:
TBox
(
nuc
->
N
-
size
,
nuc
->
Z
-
size
,
nuc
->
N
+
size
,
nuc
->
Z
+
size
)
{
fZ
=
nuc
->
Z
;
fN
=
nuc
->
N
;
...
...
@@ -36,7 +36,7 @@ CXNucleusBox::CXNucleusBox(NucData *nuc, Double_t size, Int_t colStable, Int_t c
fText
->
SetBit
(
kCannotMove
);
fText
->
SetBit
(
kCannotPick
);
Float_t
width
=
fText
->
GetXsize
();
//
Float_t width = fText->GetXsize();
Float_t
height
=
fText
->
GetYsize
();
// fText->SetX(fText->GetX()-width*0.75);
...
...
src/root/gui/cubix/src/CXRadCubeTH1Proj.cpp
View file @
ec03e511
...
...
@@ -18,6 +18,7 @@
#include "CXRad2DPlayer.h"
#include "CXRadCubePlayer.h"
#include "CXGateBox.h"
#include "TVirtualX.h"
using
namespace
std
;
...
...
src/root/gui/cubix/src/CXRadReader.cpp
View file @
ec03e511
...
...
@@ -6,6 +6,7 @@
#include "TH1D.h"
#include "TH2D.h"
#include "TF1.h"
#include "TObjArray.h"
#include "CXMainWindow.h"
...
...
@@ -2499,7 +2500,7 @@ int CXRadReader::wspec(char *filnam, double *spec, int idim)
/* ======================================================================= */
FILE
*
CXRadReader
::
open_new_file
(
char
*
filename
,
int
force_open
)
FILE
*
CXRadReader
::
open_new_file
(
char
*
filename
,
int
/*
force_open
*/
)
{
/* safely open a new file
filename: name of file to be opened
...
...
src/root/gui/cubix/src/CXTH1Proj.cpp
View file @
ec03e511
...
...
@@ -4,6 +4,7 @@
#include <iomanip>
#include <fstream>
#include <sstream>
#include <array>
#include "TH2.h"
#include "TCanvas.h"
...
...
@@ -17,6 +18,7 @@
#include "CXMainWindow.h"
#include "CXHist2DPlayer.h"
#include "CXGateBox.h"
#include "TVirtualX.h"
using
namespace
std
;
...
...
src/root/gui/fipps_spy/src/FSTab.cpp
View file @
ec03e511
...
...
@@ -19,6 +19,7 @@
#include "FSMainWindow.h"
#include "FSPad.h"
#include "TVirtualX.h"
FSTab
::
FSTab
(
const
TGWindow
*
p
,
TGMainFrame
*
f
)
:
TGTab
(
p
)
{
...
...
Prev
1
2
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