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
dcf1d818
Commit
dcf1d818
authored
Jul 04, 2019
by
Jérémie Dudouet
Browse files
Add few options for the real online process on the DDAQ server
parent
5c485931
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
src/root/gui/fipps_spy/src/FIPPSSpy.cpp
src/root/gui/fipps_spy/src/FIPPSSpy.cpp
+3
-0
src/root/gui/fipps_spy/src/FSMainWindow.cpp
src/root/gui/fipps_spy/src/FSMainWindow.cpp
+4
-9
src/root/gui/fipps_spy/src/FSMainWindow.h
src/root/gui/fipps_spy/src/FSMainWindow.h
+0
-2
src/root/gui/fipps_spy/src/FSTab.cpp
src/root/gui/fipps_spy/src/FSTab.cpp
+4
-0
No files found.
src/root/gui/fipps_spy/src/FIPPSSpy.cpp
View file @
dcf1d818
...
...
@@ -37,6 +37,9 @@ int main(int argc, char **argv)
if
(
getenv
(
"FSShiftTrackDir"
)
==
nullptr
)
{
WARN_MESS
<<
"Environment variable FSShiftTrackDir not defined ==> not used"
<<
ENDL
;
}
if
(
getenv
(
"FSModeLastRun"
))
{
INFO_MESS
<<
"FSModeLastRun defined, Spy only on the last run, not online"
<<
ENDL
;
}
gEnv
->
SetValue
(
"Gui.IconPath"
,
Form
(
"%s/icons:%s/icons"
,
getenv
(
"ROOTSYS"
),
getenv
(
"gammaSoftware_DIR"
)));
...
...
src/root/gui/fipps_spy/src/FSMainWindow.cpp
View file @
dcf1d818
...
...
@@ -210,10 +210,6 @@ void FSMainWindow::NewTab(TString name, Int_t npx, Int_t npy)
void
FSMainWindow
::
CloseWindow
()
{
while
(
true
){
if
(
oktoclose
==
false
)
continue
;
UnmapWindow
();
DeleteWindow
();
// launch a delete but after a short time like a thread.
...
...
@@ -221,7 +217,6 @@ void FSMainWindow::CloseWindow()
gApplication
->
SetReturnFromRun
(
false
);
gApplication
->
Terminate
(
false
);
}
}
TPad
*
FSMainWindow
::
GetSelectedPad
()
...
...
@@ -632,7 +627,8 @@ void FSMainWindow::ReadHistograms()
FileName
=
Form
(
"%s/%.06d"
,
getenv
(
"FSRawDataDir"
),
Test
);
ok
=
gSystem
->
IsFileInIncludePath
(
FileName
);
}
Test
=
Test
-
2
;
if
(
getenv
(
"FSModeLastRun"
))
Test
=
Test
-
2
;
else
Test
=
Test
-
1
;
Run
=
Form
(
"%.06d"
,
Test
);
FileName
=
Form
(
"%s/%s"
,
getenv
(
"FSRawDataDir"
),
Run
.
Data
());
}
...
...
@@ -768,12 +764,11 @@ void FSMainWindow::ReadHistograms()
else
{
test
++
;
WARN_MESS
<<
"Unable to read the full file: read "
<<
NHistRead
<<
" histograms, wainting:"
<<
fDetectors
.
size
()
<<
", retry num"
<<
test
<<
ENDL
;
oktoclose
=
false
;
sleep
(
3
);
oktoclose
=
true
;
// sleep(1);
}
file
.
close
();
}
INFO_MESS
<<
fDetectors
.
size
()
<<
"read spectra ==> Done"
<<
ENDL
;
fLastRun
=
Run
;
...
...
src/root/gui/fipps_spy/src/FSMainWindow.h
View file @
dcf1d818
...
...
@@ -65,8 +65,6 @@ private:
map
<
Int_t
,
Double_t
[
10
]
>
fListOfCal
;
map
<
Int_t
,
Double_t
[
2
]
>
fListOfShiftTrack
;
bool
oktoclose
=
true
;
/// FIPPSSpy objects
FSMenuBar
*
fFSMenuBar
=
nullptr
;
...
...
src/root/gui/fipps_spy/src/FSTab.cpp
View file @
dcf1d818
...
...
@@ -312,6 +312,8 @@ void FSTab::RefreshTab()
if
(
canvas
==
nullptr
)
return
;
gErrorIgnoreLevel
=
kFatal
;
TList
*
lop
=
canvas
->
GetListOfPrimitives
();
for
(
int
i
=
0
;
i
<
lop
->
GetEntries
()
;
i
++
)
{
...
...
@@ -338,6 +340,8 @@ void FSTab::RefreshTab()
}
}
canvas
->
Update
();
gErrorIgnoreLevel
=
kPrint
;
}
void
FSTab
::
ApplyPageLog
(
Bool_t
logx
,
Bool_t
logy
,
Bool_t
logz
,
Bool_t
on
)
...
...
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