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
7aaf3691
Commit
7aaf3691
authored
Jan 12, 2017
by
yannick legoc
Browse files
Corrected cardType with library values.
parent
053c92f8
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/controllers/npp/CAENCfdController.cpp
View file @
7aaf3691
...
...
@@ -20,8 +20,8 @@
#include "drivers/global/DriversCommands.h"
#include "controllers/common/family/Families.h"
#include <boost/thread/thread.hpp>
#include <lstdpp128/lstdpp.h>
#include <controllers/common/acquisition/mode/DPPAcquisitionCommon.h>
#include "controllers/common/acquisition/mode/ListModeTypes.h"
using
namespace
std
;
using
namespace
boost
;
...
...
@@ -84,7 +84,7 @@ void CAENCfdController::postConfiguration() {
updateBoardProperties
();
updateCfdProperties
(
displayChannel
()
+
channelOffset
());
cardType
=
CFD_BOARD_TYPE
;
cardType
=
lstdpp128
::
CFD
;
}
void
CAENCfdController
::
refreshDelayProperty
(
int32
aValue
)
throw
(
CannotSetValue
)
{
...
...
src/controllers/npp/CAENPhaController.cpp
View file @
7aaf3691
...
...
@@ -19,8 +19,8 @@
#include "CAENPhaController.h"
#include "drivers/global/DriversCommands.h"
#include "controllers/common/family/Families.h"
#include "controllers/common/acquisition/mode/ListModeTypes.h"
#include <boost/thread/thread.hpp>
#include <lstdpp128/lstdpp.h>
using
namespace
std
;
using
namespace
boost
;
...
...
@@ -362,10 +362,10 @@ void CAENPhaController::refreshUseFirstDerivativeProperty(int32 aValue) throw (C
void
CAENPhaController
::
updateBoardProperties
()
{
modelName
.
update
(
m_dgtzDriver
->
modelName
());
if
(
modelName
()
==
"V1724"
)
{
cardType
=
V1724_BOARD_TYPE
;
cardType
=
lstdpp128
::
C1724_PHA_RT
;
}
else
if
(
modelName
()
==
"V1730"
)
{
cardType
=
V1730_BOARD_TYPE
;
cardType
=
lstdpp128
::
C1730_PHA_RT
;
}
channels
.
update
(
m_dgtzDriver
->
channels
());
nbChannels
.
update
(
m_dgtzDriver
->
nbChannels
());
...
...
src/controllers/npp/CAENPksController.cpp
View file @
7aaf3691
...
...
@@ -19,7 +19,6 @@
#include "CAENPksController.h"
#include "drivers/global/DriversCommands.h"
#include "controllers/common/family/Families.h"
#include "controllers/common/acquisition/mode/ListModeTypes.h"
#include <boost/thread/thread.hpp>
using
namespace
std
;
...
...
src/controllers/npp/CAENPsdController.cpp
View file @
7aaf3691
...
...
@@ -19,8 +19,8 @@
#include "CAENPsdController.h"
#include "drivers/global/DriversCommands.h"
#include "controllers/common/family/Families.h"
#include "controllers/common/acquisition/mode/ListModeTypes.h"
#include <boost/thread/thread.hpp>
#include <lstdpp128/lstdpp.h>
using
namespace
std
;
using
namespace
boost
;
...
...
@@ -82,7 +82,7 @@ void CAENPsdController::postConfiguration() {
registerRefresher
(
pulsePolarity
,
&
CAENPsdController
::
refreshPulsePolarityProperty
,
this
);
updateBoardProperties
();
cardType
=
V1751_BOARD_TYPE
;
cardType
=
lstdpp128
::
C1751_PSD
;
}
void
CAENPsdController
::
refreshRecordLengthProperty
(
int32
aValue
)
throw
(
CannotSetValue
)
{
...
...
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