Commit 7aaf3691 authored by yannick legoc's avatar yannick legoc
Browse files

Corrected cardType with library values.

parent 053c92f8
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "drivers/global/DriversCommands.h" #include "drivers/global/DriversCommands.h"
#include "controllers/common/family/Families.h" #include "controllers/common/family/Families.h"
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hpp>
#include <lstdpp128/lstdpp.h>
#include <controllers/common/acquisition/mode/DPPAcquisitionCommon.h> #include <controllers/common/acquisition/mode/DPPAcquisitionCommon.h>
#include "controllers/common/acquisition/mode/ListModeTypes.h"
using namespace std; using namespace std;
using namespace boost; using namespace boost;
...@@ -84,7 +84,7 @@ void CAENCfdController::postConfiguration() { ...@@ -84,7 +84,7 @@ void CAENCfdController::postConfiguration() {
updateBoardProperties(); updateBoardProperties();
updateCfdProperties(displayChannel() + channelOffset()); updateCfdProperties(displayChannel() + channelOffset());
cardType = CFD_BOARD_TYPE; cardType = lstdpp128::CFD;
} }
void CAENCfdController::refreshDelayProperty(int32 aValue) throw (CannotSetValue) { void CAENCfdController::refreshDelayProperty(int32 aValue) throw (CannotSetValue) {
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include "CAENPhaController.h" #include "CAENPhaController.h"
#include "drivers/global/DriversCommands.h" #include "drivers/global/DriversCommands.h"
#include "controllers/common/family/Families.h" #include "controllers/common/family/Families.h"
#include "controllers/common/acquisition/mode/ListModeTypes.h"
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hpp>
#include <lstdpp128/lstdpp.h>
using namespace std; using namespace std;
using namespace boost; using namespace boost;
...@@ -362,10 +362,10 @@ void CAENPhaController::refreshUseFirstDerivativeProperty(int32 aValue) throw (C ...@@ -362,10 +362,10 @@ void CAENPhaController::refreshUseFirstDerivativeProperty(int32 aValue) throw (C
void CAENPhaController::updateBoardProperties() { void CAENPhaController::updateBoardProperties() {
modelName.update(m_dgtzDriver->modelName()); modelName.update(m_dgtzDriver->modelName());
if (modelName() == "V1724") { if (modelName() == "V1724") {
cardType = V1724_BOARD_TYPE; cardType = lstdpp128::C1724_PHA_RT;
} }
else if (modelName() == "V1730") { else if (modelName() == "V1730") {
cardType = V1730_BOARD_TYPE; cardType = lstdpp128::C1730_PHA_RT;
} }
channels.update(m_dgtzDriver->channels()); channels.update(m_dgtzDriver->channels());
nbChannels.update(m_dgtzDriver->nbChannels()); nbChannels.update(m_dgtzDriver->nbChannels());
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include "CAENPksController.h" #include "CAENPksController.h"
#include "drivers/global/DriversCommands.h" #include "drivers/global/DriversCommands.h"
#include "controllers/common/family/Families.h" #include "controllers/common/family/Families.h"
#include "controllers/common/acquisition/mode/ListModeTypes.h"
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hpp>
using namespace std; using namespace std;
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
#include "CAENPsdController.h" #include "CAENPsdController.h"
#include "drivers/global/DriversCommands.h" #include "drivers/global/DriversCommands.h"
#include "controllers/common/family/Families.h" #include "controllers/common/family/Families.h"
#include "controllers/common/acquisition/mode/ListModeTypes.h"
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hpp>
#include <lstdpp128/lstdpp.h>
using namespace std; using namespace std;
using namespace boost; using namespace boost;
...@@ -82,7 +82,7 @@ void CAENPsdController::postConfiguration() { ...@@ -82,7 +82,7 @@ void CAENPsdController::postConfiguration() {
registerRefresher(pulsePolarity, &CAENPsdController::refreshPulsePolarityProperty, this); registerRefresher(pulsePolarity, &CAENPsdController::refreshPulsePolarityProperty, this);
updateBoardProperties(); updateBoardProperties();
cardType = V1751_BOARD_TYPE; cardType = lstdpp128::C1751_PSD;
} }
void CAENPsdController::refreshRecordLengthProperty(int32 aValue) throw (CannotSetValue) { void CAENPsdController::refreshRecordLengthProperty(int32 aValue) throw (CannotSetValue) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment