Commit e8270ef5 authored by fipps's avatar fipps
Browse files

remove to previuos in reopository

parent 69a043bb
......@@ -124,7 +124,6 @@ void CAENCfdController::postConfiguration() {
void CAENCfdController::refreshRecordLengthProperty(int32 aValue) throw (CannotSetValue) {
m_dgtzDriver->recordLength.update(aValue);
boost::thread td(boost::bind(&CAENCfdController::writeParam, this));
}
void CAENCfdController::refreshcfdTrapProperty(int32 aValue) throw (CannotSetValue) {
......@@ -448,12 +447,12 @@ void CAENCfdController::updateBoardProperties() {
void CAENCfdController::writeParam() {
m_dgtzDriver.execute(caen_cfd2::CAENCfd2Driver::WRITE_PARAMETERS_COMMAND, true);
m_dgtzDriver.execute(caen_cfd::CAENCfdDriver::WRITE_PARAMETERS_COMMAND, true);
}
void CAENCfdController::initBoard() {
m_dgtzDriver.execute(caen_cfd2::CAENCfd2Driver::SET_MODE_COMMAND, true);
m_dgtzDriver.execute(caen_cfd::CAENCfdDriver::SET_MODE_COMMAND, true);
}
void CAENCfdController::initChannel(int32 aChannel) {
......@@ -496,7 +495,7 @@ void CAENCfdController::initChannel(int32 aChannel) {
void CAENCfdController::clearData() {
commandProgression = 0;
m_dgtzDriver.execute(caen_cfd2::CAENCfd2Driver::CLEAR_COMMAND, true);
m_dgtzDriver.execute(caen_cfd::CAENCfdDriver::CLEAR_COMMAND, true);
commandProgression = 100;
}
......
......@@ -19,7 +19,7 @@
#ifndef CAENCFDCONTROLLER_H
#define CAENCFDCONTROLLER_H
#include "drivers/caen/caen_cfd2/CAENCfd2Driver.h"
#include "drivers/caen/caen_cfd/CAENCfdDriver.h"
#include "CAENAdcController.h"
//#include "drivers/ioxos/cfd/CfdDriver.h"
......@@ -89,7 +89,7 @@ public:
protected:
DriverPtr<caen_cfd2::CAENCfd2Driver> m_dgtzDriver;
DriverPtr<caen_cfd::CAENCfdDriver> m_dgtzDriver;
private:
......
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