Commit feba82fc authored by Jerome Locatelli's avatar Jerome Locatelli
Browse files

dataparams is now a module

parent 99adbbac
......@@ -32,11 +32,11 @@ const char D22SpectroSampleSequencer::DATAPARAM_THICKNESS_PROPERTY[] = "datapara
const char D22SpectroSampleSequencer::DATAPARAM_TRANSMISSION_PROPERTY[] = "dataparam_transmission";
D22SpectroSampleSequencer::D22SpectroSampleSequencer(const std::string & name) :
ExperimentController(name), controller::Stoppable(this), m_dataParams(0) {
ExperimentController(name), controller::Stoppable(this) {
setFamily(family::SAMPLE_ENVIRONMENT);
registerConfiguration("DataParams", DATA_PARAMS_EXPERIMENT_CONTROLLER, (AbstractController**) &m_dataParams);
m_dataParams.init(this, "DataParams");
m_sampleChanger.init(this, "SampleChanger");
countWithSpectro.init(this, "count_spectro");
......@@ -135,9 +135,8 @@ D22SpectroSampleSequencer::D22SpectroSampleSequencer(const D22SpectroSampleSeque
m_CountStarted = false;
countWithSpectro.copy(controller.countWithSpectro);
m_sampleChanger = controller.m_sampleChanger;
m_dataParams = controller.m_dataParams;
m_sampleChanger.copy(controller.m_sampleChanger);
m_dataParams.copy(controller.m_dataParams);
}
......
......@@ -21,6 +21,7 @@
#include <Controller.h>
#include "controllers/lss/common/SampleChangerController.h"
#include "controllers/common/utilities/DataParams.h"
#include "CountWithSpectro.h"
namespace d22special {
......@@ -49,7 +50,7 @@ private:
void refreshAcquisitionTime(int32 index, float64 value) throw (CannotSetValue);
void refreshNumSlotSetpoint(int32 number);
AbstractController* m_dataParams;
ControllerPtr<utilities::DataParams> m_dataParams;
ControllerPtr<lss::SampleChangerController> m_sampleChanger;
ControllerPtr<CountWithSpectro> countWithSpectro;
......
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