Commit f2186330 authored by d2b's avatar d2b

Filtering on hidden family for the sample controllers in SampleSettings

parent 5e70c80e
......@@ -147,59 +147,61 @@ void SampleSettings::postConfiguration() {
InstrumentManager::getInstance()->getAllInstalledExperimentControllersMap();
map<string, ExperimentController*>::iterator it;
for (it = experimentControllersMap.begin(); it != experimentControllersMap.end(); it++) {
if (dynamic_cast<SampleTemperatureController*>(it->second) != 0) {
SampleTemperatureController* temp = dynamic_cast<SampleTemperatureController*>(it->second);
if (temp->controllerType() == CRYOSTAT_TYPE) {
m_Cryostat = dynamic_cast<CryostatOrangeController*>(it->second);
m_types.push_back(CRYOSTAT_TYPE);
} else if (temp->controllerType() == CRYOFURNACE_TYPE) {
m_Cryofurnace = dynamic_cast<CryostatOrangeController*>(it->second);
m_types.push_back(CRYOFURNACE_TYPE);
} else if (temp->controllerType() == CRYOFURNACE_DUAL_EXCHANGER_TYPE) {
m_CryofurnaceDual = dynamic_cast<CryostatOrangeController*>(it->second);
m_types.push_back(CRYOFURNACE_DUAL_EXCHANGER_TYPE);
// } else if (temp->controllerType() == CRYOLOOP_TYPE) {
// m_Cryoloop = dynamic_cast<CryoLoopController*>(it->second);
// m_types.push_back(CRYOLOOP_TYPE);
} else if (temp->controllerType() == DISPLEX_TYPE) {
m_Displex = temp;
m_types.push_back(DISPLEX_TYPE);
} else if (temp->controllerType() == FURNACE_TYPE) {
m_Furnace = dynamic_cast<FurnaceController*>(it->second);
m_types.push_back(FURNACE_TYPE);
} else if (temp->controllerType() == THREEHE_REFREGIRATOR_TYPE) {
m_3HeRefregirator = temp;
m_types.push_back(THREEHE_REFREGIRATOR_TYPE);
} else if (temp->controllerType() == DILUTION_REFREGIRATOR_TYPE) {
m_DilutionRefregirator = temp;
m_types.push_back(DILUTION_REFREGIRATOR_TYPE);
} else if (temp->controllerType() == HIGH_MAGNETIC_FIELD_TYPE) {
m_HighMagneticFieldTemp = temp;
m_types.push_back(HIGH_MAGNETIC_FIELD_TYPE);
} else if (temp->controllerType() == TEDS17T_HIGH_MAGNETIC_FIELD_TYPE) {
m_Teds17THighMagneticFieldTemp = temp;
m_types.push_back(TEDS17T_HIGH_MAGNETIC_FIELD_TYPE);
} else if (temp->controllerType() == EASY_MAG_TYPE) {
m_EasyMagTemp = temp;
m_types.push_back(EASY_MAG_TYPE);
} else if (temp->controllerType() == CRYOSTREAM_TYPE) {
m_CryoStreamTemp = temp;
m_types.push_back(CRYOSTREAM_TYPE);
} else if (temp->controllerType() == THREEHE_REFREGIRATOR_INSERT_TYPE) {
m_3HeRefregiratorInsert = temp;
m_inserttypes.push_back(THREEHE_REFREGIRATOR_INSERT_TYPE);
} else if (temp->controllerType() == DILUTION_REFREGIRATOR_INSERT_TYPE) {
m_DilutionRefregiratorInsert = temp;
m_inserttypes.push_back(DILUTION_REFREGIRATOR_INSERT_TYPE);
} else if (temp->controllerType() == SPECIAL_STICK) {
m_inserttypes.push_back(SPECIAL_STICK);
}
} else if (dynamic_cast<MagneticFieldController*>(it->second) != 0) {
MagneticFieldController* mag = dynamic_cast<MagneticFieldController*>(it->second);
if (mag->controllerType() == OXFORD_HIGH_MAGNETIC_FIELD_TYPE) {
m_OxfordHighMagneticField = mag;
} else if (mag->controllerType() == TEDS17T_HIGH_MAGNETIC_FIELD_TYPE) {
m_Teds17THighMagneticField = mag;
if ((it->second)->getFamily().find(family::HIDDEN) == string::npos) {
if (dynamic_cast<SampleTemperatureController*>(it->second) != 0) {
SampleTemperatureController* temp = dynamic_cast<SampleTemperatureController*>(it->second);
if (temp->controllerType() == CRYOSTAT_TYPE) {
m_Cryostat = dynamic_cast<CryostatOrangeController*>(it->second);
m_types.push_back(CRYOSTAT_TYPE);
} else if (temp->controllerType() == CRYOFURNACE_TYPE) {
m_Cryofurnace = dynamic_cast<CryostatOrangeController*>(it->second);
m_types.push_back(CRYOFURNACE_TYPE);
} else if (temp->controllerType() == CRYOFURNACE_DUAL_EXCHANGER_TYPE) {
m_CryofurnaceDual = dynamic_cast<CryostatOrangeController*>(it->second);
m_types.push_back(CRYOFURNACE_DUAL_EXCHANGER_TYPE);
// } else if (temp->controllerType() == CRYOLOOP_TYPE) {
// m_Cryoloop = dynamic_cast<CryoLoopController*>(it->second);
// m_types.push_back(CRYOLOOP_TYPE);
} else if (temp->controllerType() == DISPLEX_TYPE) {
m_Displex = temp;
m_types.push_back(DISPLEX_TYPE);
} else if (temp->controllerType() == FURNACE_TYPE) {
m_Furnace = dynamic_cast<FurnaceController*>(it->second);
m_types.push_back(FURNACE_TYPE);
} else if (temp->controllerType() == THREEHE_REFREGIRATOR_TYPE) {
m_3HeRefregirator = temp;
m_types.push_back(THREEHE_REFREGIRATOR_TYPE);
} else if (temp->controllerType() == DILUTION_REFREGIRATOR_TYPE) {
m_DilutionRefregirator = temp;
m_types.push_back(DILUTION_REFREGIRATOR_TYPE);
} else if (temp->controllerType() == HIGH_MAGNETIC_FIELD_TYPE) {
m_HighMagneticFieldTemp = temp;
m_types.push_back(HIGH_MAGNETIC_FIELD_TYPE);
} else if (temp->controllerType() == TEDS17T_HIGH_MAGNETIC_FIELD_TYPE) {
m_Teds17THighMagneticFieldTemp = temp;
m_types.push_back(TEDS17T_HIGH_MAGNETIC_FIELD_TYPE);
} else if (temp->controllerType() == EASY_MAG_TYPE) {
m_EasyMagTemp = temp;
m_types.push_back(EASY_MAG_TYPE);
} else if (temp->controllerType() == CRYOSTREAM_TYPE) {
m_CryoStreamTemp = temp;
m_types.push_back(CRYOSTREAM_TYPE);
} else if (temp->controllerType() == THREEHE_REFREGIRATOR_INSERT_TYPE) {
m_3HeRefregiratorInsert = temp;
m_inserttypes.push_back(THREEHE_REFREGIRATOR_INSERT_TYPE);
} else if (temp->controllerType() == DILUTION_REFREGIRATOR_INSERT_TYPE) {
m_DilutionRefregiratorInsert = temp;
m_inserttypes.push_back(DILUTION_REFREGIRATOR_INSERT_TYPE);
} else if (temp->controllerType() == SPECIAL_STICK) {
m_inserttypes.push_back(SPECIAL_STICK);
}
} else if (dynamic_cast<MagneticFieldController*>(it->second) != 0) {
MagneticFieldController* mag = dynamic_cast<MagneticFieldController*>(it->second);
if (mag->controllerType() == OXFORD_HIGH_MAGNETIC_FIELD_TYPE) {
m_OxfordHighMagneticField = mag;
} else if (mag->controllerType() == TEDS17T_HIGH_MAGNETIC_FIELD_TYPE) {
m_Teds17THighMagneticField = mag;
}
}
}
}
......
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