Commit 64cd04e6 authored by Jacob Lamblin's avatar Jacob Lamblin
Browse files

Add Title, Subtitle and logstring updater

parent b31d3d31
......@@ -85,6 +85,8 @@ acquisition::TimeAcquisitionController(name), Select(this),Set(this) {
m_HVDriver.init(this, "hvdriver");
experimentData.init(this, "experimentinfo");
m_StartActivated = false;
registerFunction(TYPE);
......@@ -170,6 +172,7 @@ DAQParamController::DAQParamController(const DAQParamController& controller) :
trigthresall.copy(this, controller.trigthresall);
m_HVDriver.copy(controller.m_HVDriver);
experimentData.copy(controller.experimentData);
m_StartActivated = false;
......@@ -203,6 +206,11 @@ void DAQParamController::postConfiguration() {
registerUpdater(m_ELECDriver->namechannel6, &DAQParamController::updateNameChannel6, this);
registerUpdater(m_ELECDriver->namechannel7, &DAQParamController::updateNameChannel7, this);
registerUpdater(m_ELECDriver->startActivated, &DAQParamController::updateStartActivated, this);
registerUpdater(m_ELECDriver->logstring, &DAQParamController::updateLogString, this);
registerUpdater(experimentData->title, &DAQParamController::updateTitle, this);
registerUpdater(experimentData->subtitle, &DAQParamController::updateSubtitle, this);
nfeboardmax=stereo_elec::NBFEMAX;
nfeboard = m_ELECDriver->nfeboard();
......@@ -703,6 +711,23 @@ void DAQParamController::updateStartActivated() {
m_HVDriver->locked=m_ELECDriver->startActivated();
}
void DAQParamController::updateLogString() {
log(Level::s_Info) << m_ELECDriver->logstring() << endlog;
}
void DAQParamController::updateTitle() {
cout << "Title " << experimentData->title() << endl;
m_ELECDriver->DAQParams.title=experimentData->title();
}
void DAQParamController::updateSubtitle() {
cout << "subtitle " << experimentData->subtitle() << endl;
m_ELECDriver->DAQParams.subtitle=experimentData->subtitle();
}
/*
* select channels
......
......@@ -23,6 +23,7 @@
#include "drivers/stereo_elec/StereoElecDriver.h"
#include "drivers/caen_syx527/CAENSYx527Driver.h"
#include "controllers/common/acquisition/mode/TimeAcquisitionController.h"
#include "controllers/common/acquisition/ExperimentData.h"
namespace stereo_daq {
......@@ -154,6 +155,8 @@ protected:
DriverPtr<stereo_elec::StereoElecDriver> m_ELECDriver; //! The driver linked to the controller
DriverPtr<caen_syx527::CAENSYx527Driver> m_HVDriver; //! The HV Caen driver
ControllerPtr<acquisition::ExperimentData> experimentData;
/*!
* \brief select command
*/
......@@ -269,6 +272,9 @@ private:
void updateNameChannel6(int32 index);
void updateNameChannel7(int32 index);
void updateStartActivated();
void updateLogString();
void updateTitle();
void updateSubtitle();
};
}
#endif // DAQPARAMCONTROLLER_H
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