Commit 39f46f84 authored by Locatelli's avatar Locatelli
Browse files

correct check if secondary sample temp is assigned

parent d2b79a76
......@@ -129,12 +129,17 @@ void CyclopsDataHeader::createHeader() {
create_f(header, "reqt", m_SampleSettings->getMainSampleTempController()->wantedTemperature(), 8 ,2);
create_f(header, "samp", m_SampleSettings->getMainSampleTempController()->sampleTemperature(), 8 ,2);
create_f(header, "heat", m_SampleSettings->getMainSampleTempController()->power(), 8 ,2);
if (m_SampleSettings->getSecSampleTempController()->isEnabled() == true) {
create_f(header, "temp2", m_SampleSettings->getSecSampleTempController()->regulationTemperature(), 8 ,2);
create_f(header, "stpt2", m_SampleSettings->getSecSampleTempController()->setpointTemperature(), 8 ,2);
create_f(header, "reqt2", m_SampleSettings->getSecSampleTempController()->wantedTemperature(), 8 ,2);
create_f(header, "samp2", m_SampleSettings->getSecSampleTempController()->sampleTemperature(), 8 ,2);
create_f(header, "heat2", m_SampleSettings->getSecSampleTempController()->power(), 8 ,2);
if (m_SampleSettings->getSecSampleTempController() != NULL) {
if (m_SampleSettings->getSecSampleTempController()->isEnabled() == true) {
create_f(header, "temp2", m_SampleSettings->getSecSampleTempController()->regulationTemperature(), 8 ,2);
create_f(header, "stpt2", m_SampleSettings->getSecSampleTempController()->setpointTemperature(), 8 ,2);
create_f(header, "reqt2", m_SampleSettings->getSecSampleTempController()->wantedTemperature(), 8 ,2);
create_f(header, "samp2", m_SampleSettings->getSecSampleTempController()->sampleTemperature(), 8 ,2);
create_f(header, "heat2", m_SampleSettings->getSecSampleTempController()->power(), 8 ,2);
}
else {
create_f(header, "temp2", -1., 8 ,2);
}
}
else {
create_f(header, "temp2", -1., 8 ,2);
......
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