Commit 695ef3b5 authored by cyclops's avatar cyclops

some adds

parent 423eb2f0
......@@ -34,7 +34,7 @@ const string CyclopsDataHeader::END = "*";
* Constructor
*/
CyclopsDataHeader::CyclopsDataHeader(const string& name) :
ExperimentController(name) {
ExperimentController(name) {
setFamily(family::HIDDEN);
......@@ -93,20 +93,29 @@ void CyclopsDataHeader::createHeader() {
create_a(header, "user", m_Title->userName());
create_a(header, "l.c.", m_Title->localContactName());
create_a(header, "commentary", m_Title->title());
if (m_ScanInfo->running()) {
create_a(header, "scan_angle", m_ScanInfo->firstControllerName());
}
else {
create_a(header, "scan_angle", "none");
}
create_i(header, "kctrl", 4, 0);
if (m_ScanInfo->running()) {
create_a(header, "scan_angle", m_ScanInfo->firstControllerName());
}
else {
create_a(header, "scan_angle", "none");
}
if (m_ScanInfo->running()) {
create_i(header, "kctrl", 4, 0);
}else {
create_i(header, "kctrl", 5, 0);
}
create_i(header, "manip", m_ScanInfo->firstIndex(), 0);
create_i(header, "nbang", m_ScanInfo->nbController(), 0);
create_i(header, "nkmes", m_ScanInfo->nbStep(), 0);
create_i(header, "npmes", m_ScanInfo->actualStep(), 0);
if (m_ScanInfo->running()) {
create_i(header, "nkmes", m_ScanInfo->nbStep(), 0);
create_i(header, "npmes", m_ScanInfo->actualStep(), 0);
}else {
create_i(header, "nkmes", 1, 0);
create_i(header, "npmes", 1, 0);
}
create_i(header, "jcode", m_CountSpy->modeint(), 0);
create_i(header, "count", 0, 0);
create_f(header, "count", m_CountSpy->preset()/1000,8 ,2);
create_i(header, "gain", m_CyclopsSetting->gain(), 0);
create_i(header, "mode", m_CyclopsSetting->mode(), 0);
create_i(header, "nacq", m_CyclopsSetting->nbKine(), 0);
......@@ -118,9 +127,16 @@ void CyclopsDataHeader::createHeader() {
create_f(header, name.str(), (*iter)->position(), 8 ,2);
++iter;
}
create_f(header, "scan_start", m_ScanInfo->firstStartValue(), 8 ,2);
create_f(header, "scan_width", m_ScanInfo->firstWidthValue(), 8 ,2);
create_f(header, "scan_step", m_ScanInfo->firstStepValue(), 8 ,2);
if (m_ScanInfo->running()) {
create_f(header, "scan_start", m_ScanInfo->firstStartValue(), 8 ,2);
create_f(header, "scan_width", m_ScanInfo->firstWidthValue(), 8 ,2);
create_f(header, "scan_step", m_ScanInfo->firstStepValue(), 8 ,2);
}
else {
create_f(header, "scan_start", m_ScanInfo->firstStartValue(), 8 ,2);
create_f(header, "scan_width", 0,8 ,2);
create_f(header, "scan_step", 0,8 ,2);
}
if (m_SampleSettings->useMag() == true) {
create_f(header, "magf", m_SampleSettings->getMagController()->field(), 8 ,2);
......
......@@ -30,7 +30,7 @@ const std::string CyclopsSetting::TYPE = "Cyclopssetting";
CyclopsSetting::CyclopsSetting(const string& name) :
ExperimentController(name), controller::Start(this) {
ExperimentController(name), controller::Start(this) {
setFamily(family::ACQUISITION, family::SETTING);
......@@ -41,7 +41,6 @@ CyclopsSetting::CyclopsSetting(const string& name) :
modeBP.init(this, SAVE, "modeBP");
fileDirectory.init(this, SAVE, "fileDirectory");
fileName.init(this, SAVE, "fileName");
m_CamDriver.init(this, "cammeraDriver");
registerFunction(TYPE);
......@@ -56,11 +55,11 @@ CyclopsSetting::~CyclopsSetting() {
void CyclopsSetting::postConfiguration() {
// mode=m_CamDriver->acqmode();
// mode=m_CamDriver->acqmode();
//stringmode=MODE[mode()];
registerRefresher(mode, &CyclopsSetting::refreshMode, this);
// registerUpdater(m_CamDriver->acqmode, &CyclopsSetting::updateMode, this);
// registerUpdater(m_CamDriver->acqmode, &CyclopsSetting::updateMode, this);
}
......@@ -71,7 +70,7 @@ void CyclopsSetting::start() {
m_CamDriver->acqmode = mode.setpoint();
m_CamDriver->nbSlicesAcq = nbKine();
m_CamDriver->nbSlicesAcq = nbKine();
m_CamDriver->bpixel = modeBP();
m_CamDriver->gain = gain();
......@@ -81,13 +80,15 @@ void CyclopsSetting::start() {
void CyclopsSetting::refreshMode(int32 value) {
if (mode.setpoint()==0){
nbKine=1;
m_CamDriver->nbSlicesAcq = 1;
}
}
void CyclopsSetting::updateMode() {
// mode=m_CamDriver->acqmode();
// mode=m_CamDriver->acqmode();
}
......
<module name="cyclops">
<module name="cyclops_special">
<controller class="cyclops::CyclopsDataHeader"/>
<controller class="cyclops::CyclopsDataPath"/>
<controller class="cyclops::CyclopsSetting"/>
......
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