Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Instrument Control
NomadSpecialModules
Commits
db277fa3
Commit
db277fa3
authored
Apr 29, 2016
by
Jerome Locatelli
Browse files
Add MPDA stuff for D17 (no incidence to other instruments)
parent
25dd6c19
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/controllers/npp/DPPAcquisitionController.cpp
View file @
db277fa3
...
...
@@ -48,7 +48,6 @@ DPPAcquisitionController::DPPAcquisitionController(const string& name) :
totalChannels
.
init
(
this
,
NOSAVE
,
"total_channels"
);
useScopeStr
.
init
(
this
,
NOSAVE
,
"scope_mode_str"
);
usePn1Coincidence
.
init
(
this
,
SAVE
,
"pn1_coincidence"
);
useListMode
.
init
(
this
,
SAVE
,
"list_mode"
);
liveProcessType
.
init
(
this
,
SAVE
,
"live_process_type"
);
boardIndex
.
init
(
this
,
NOSAVE
,
"board_index"
);
...
...
@@ -89,7 +88,6 @@ void DPPAcquisitionController::postConfiguration() {
registerUpdater
(
dppDriver
[
i
]
->
curve4
,
&
DPPAcquisitionController
::
updateCurve4ArrayProperty
,
this
,
i
);
}
registerRefresher
(
useListMode
,
&
DPPAcquisitionController
::
refreshUseListModeProperty
,
this
);
registerRefresher
(
usePn1Coincidence
,
&
DPPAcquisitionController
::
refreshUsePn1CoincidenceModeProperty
,
this
);
registerRefresher
(
nbBits
,
&
DPPAcquisitionController
::
refreshNbBitsProperty
,
this
);
...
...
src/controllers/npp/DPPAcquisitionController.h
View file @
db277fa3
...
...
@@ -92,7 +92,6 @@ public:
Property
<
int32
>
scopeChannel
;
// Scope channel
Property
<
int32
>
totalChannels
;
// Total nb of channels
Property
<
int32
>
usePn1Coincidence
;
Property
<
int32
>
useListMode
;
Property
<
int32
>
useScope
;
Property
<
std
::
string
>
useScopeStr
;
...
...
@@ -120,7 +119,7 @@ private:
void
updateRecordLengthProperty
(
int32
index
);
void
refreshNbAdcControllersProperty
(
int32
aValue
)
throw
(
CannotSetValue
);
void
refreshUseListModeProperty
(
int32
aValue
)
throw
(
CannotSetValue
);
virtual
void
refreshUseListModeProperty
(
int32
aValue
)
throw
(
CannotSetValue
);
void
refreshUsePn1CoincidenceModeProperty
(
int32
aValue
)
throw
(
CannotSetValue
);
void
refreshNbBitsProperty
(
int32
value
)
throw
(
CannotSetValue
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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