Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
fe13ab42
Commit
fe13ab42
authored
Jan 27, 2017
by
yannick legoc
Browse files
Corrected block_size property for RemoteDPPCoincidence.
parent
65b386b6
Changes
4
Show whitespace changes
Inline
Side-by-side
src/controllers/remotenpp/RemoteDPPCoincidence.cpp
View file @
fe13ab42
...
...
@@ -220,7 +220,7 @@ void RemoteDPPCoincidence::start() {
// Join the test thread
finishFileReading
(
thread
);
cout
<<
"coincidence application terminated with state "
<<
state
<<
endl
;
cout
<<
"coincidence application terminated with state "
<<
application
::
toString
(
state
)
<<
endl
;
}
}
...
...
src/controllers/remotenpp/RemoteDPPCoincidence.h
View file @
fe13ab42
...
...
@@ -71,8 +71,6 @@ private:
DynamicProperty
<
float64
>
channelRate
;
std
::
auto_ptr
<
cameo
::
application
::
Instance
>
m_coincidenceApplication
;
static
const
int32
MAX_ADC
=
128
;
};
}
...
...
src/controllers/remotenpp/RemoteDPPHistogram.h
View file @
fe13ab42
...
...
@@ -69,8 +69,6 @@ private:
DynamicProperty
<
std
::
string
>
yLegend
;
std
::
auto_ptr
<
cameo
::
application
::
Instance
>
m_histoApplication
;
static
const
int32
MAX_ADC
=
128
;
};
}
...
...
src/controllers/remotenpp/gui/remote_dpp_coincidence/remote_dpp_coincidenceView.xml
View file @
fe13ab42
...
...
@@ -9,7 +9,7 @@
<simple_label
prefix=
"dpp_coincidence.refresh_time"
/>
<text
role=
"dpp_coincidence1"
property=
"refresh_time_s"
suffix=
"dpp_coincidence.refresh_time_unit"
/>
<simple_label
prefix=
"dpp_coincidence.block_size"
/>
<text
role=
"dpp_coincidence1"
property=
"
process_
block_size"
/>
<text
role=
"dpp_coincidence1"
property=
"block_size"
/>
</table_composite>
<newLine/>
<group
title=
"dpp_coincidence.coincidences"
>
...
...
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