Commit 711fd03b authored by Cristina Cocho's avatar Cristina Cocho

Overload set-disable for d22 stuff

parent fb8e4587
<module name="remote">
<controller class="remote::RemotePropertyController"/>
<controller class="remote::RemoteCountSynchro"/>
</module>
......@@ -16,12 +16,12 @@
* limitations under the Licence.
*/
#include <controllers/common/utilities/RemoteCountSynchro.h>
#include "RemoteCountSynchro.h"
#include "controllers/common/family/Families.h"
using namespace std;
namespace utilities {
namespace remote {
const string RemoteCountSynchro::TYPE = "remote_count_synchro";
......
......@@ -23,7 +23,7 @@
#include "controllers/common/remote/RemotePropertyController.h"
#include "controllers/common/acquisition/Count.h"
namespace utilities {
namespace remote {
/*!
* \class RemoteCountSynchro
......
......@@ -16,7 +16,6 @@
<controller class="utilities::MaintenanceController"/>
<controller class="utilities::NotificationController"/>
<controller class="utilities::ReactorPowerController"/>
<controller class="utilities::RemoteCountSynchro"/>
<controller class="utilities::StatisticEstimator"/>
<controller class="utilities::WaitController"/>
......
......@@ -64,11 +64,7 @@ SampleSequencer::SampleSequencer(const std::string& name) :
sampleChanger.init(this, "sample_changer");
count.init(this, "count");
//dataParams not migrated
registerConfiguration("DataParameters", DATA_PARAMS_EXPERIMENT_CONTROLLER, (AbstractController**) &dataParams);
dataParams.init(this, "DataParameters");
maxPos = MAX_POSITIONS;
minPos = MIN_POSITIONS;
......@@ -134,7 +130,7 @@ SampleSequencer::SampleSequencer(const SampleSequencer& controller) :
count.copy(controller.count);
dataParams = controller.dataParams;
dataParams.copy(controller.dataParams);
m_CountStarted = false;
m_ChangerStarted = false;
......@@ -401,5 +397,23 @@ void SampleSequencer::setChangerNumber(int32 changerNumber) {
// }
}
/*
* setEnabled
*/
void SampleSequencer::setEnabledForLoading(bool all, bool postconf) {
addExcludeSetEnableController(dataParams.getRole());
addExcludeSetEnableController(count.getRole());
ExperimentController::setEnabledForLoading(all, postconf);
}
/*
* setDisabled
*/
void SampleSequencer::setDisabled(bool all) {
addExcludeSetEnableController(dataParams.getRole());
addExcludeSetEnableController(count.getRole());
ExperimentController::setDisabled(all);
}
}
......@@ -21,6 +21,7 @@
#include "SampleChangerController.h"
#include "controllers/common/acquisition/TimeCount.h"
#include "controllers/common/utilities/DataParams.h"
namespace lss {
......@@ -67,11 +68,13 @@ public:
ControllerPtr<SampleChangerController> sampleChanger;
ControllerPtr<acquisition::TimeCount> count;
AbstractController* dataParams;
ControllerPtr<utilities::DataParams> dataParams;
static const char DATAPARAM_TRANSMISSION_PROPERTY[];
static const char DATAPARAM_THICKNESS_PROPERTY[];
virtual void setEnabledForLoading(bool all, bool postconf = true);
virtual void setDisabled(bool all = false);
protected:
......
......@@ -550,6 +550,16 @@ void HplcController::saveData() {
cout << "HPLC Data Collection Phase, saving data in nexus file " << numor << endl;
NexusDataFile::appendTo(numor, "NxD22SpecialServerFile.xml", "NxD22SpecialClientFile.xml");
}
/*
* setEnabled
*/
void HplcController::setEnabledForLoading(bool all, bool postconf) {
addExcludeSetEnableController(m_count.getRole());
ExperimentController::setEnabledForLoading(all, postconf);
}
/*
* setDisabled
*/
......
......@@ -102,6 +102,7 @@ public:
ControllerPtr<UVDetectorController> m_detector;
ControllerPtr<acquisition::TimeCount> m_count;
virtual void setEnabledForLoading(bool all, bool postconf = true);
virtual void setDisabled(bool all = false);
private:
......
......@@ -447,6 +447,15 @@ void HplcControllerTwoColumnMode::startDetector() {
m_detector->doAcqWithDataSaving();
}
/*
* setEnabled
*/
void HplcControllerTwoColumnMode::setEnabledForLoading(bool all, bool postconf) {
addExcludeSetEnableController(m_count.getRole());
ExperimentController::setEnabledForLoading(all, postconf);
}
/*
* setDisabled
*/
......@@ -455,6 +464,7 @@ void HplcControllerTwoColumnMode::setDisabled(bool all) {
ExperimentController::setDisabled(all);
}
}
......@@ -43,6 +43,7 @@ public:
void start();
void stop();
virtual void setEnabledForLoading(bool all, bool postconf = true);
virtual void setDisabled(bool all = false);
Property<std::string> columnMeasured;
......
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