Commit 75fcbc7f authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by Laurent Claustre
Browse files

Add Model::isFrelon16 method

parent 1f65cd5a
...@@ -166,7 +166,7 @@ inline bool Geometry::isChanActive(InputChan curr, InputChan chan) ...@@ -166,7 +166,7 @@ inline bool Geometry::isChanActive(InputChan curr, InputChan chan)
inline bool Geometry::isFrelon16() inline bool Geometry::isFrelon16()
{ {
return (m_model.getChipType() == Andanta_CcdFT2k); return m_model.isFrelon16();
} }
......
...@@ -140,6 +140,7 @@ class Model ...@@ -140,6 +140,7 @@ class Model
ChipType getChipType(); ChipType getChipType();
SPBConType getSPBConType(); SPBConType getSPBConType();
GeomType getGeomType(); GeomType getGeomType();
bool isFrelon16();
bool isFrelon16Dual(); bool isFrelon16Dual();
bool has(Feature feature); bool has(Feature feature);
double getPixelSize(); double getPixelSize();
......
...@@ -90,6 +90,7 @@ class Model ...@@ -90,6 +90,7 @@ class Model
Frelon::ChipType getChipType(); Frelon::ChipType getChipType();
Frelon::SPBConType getSPBConType(); Frelon::SPBConType getSPBConType();
Frelon::GeomType getGeomType(); Frelon::GeomType getGeomType();
bool isFrelon16();
bool isFrelon16Dual(); bool isFrelon16Dual();
bool has(Model::Feature feature); bool has(Model::Feature feature);
double getPixelSize(); double getPixelSize();
......
...@@ -905,7 +905,7 @@ void Interface::resetDefaults() ...@@ -905,7 +905,7 @@ void Interface::resetDefaults()
stopAcq(); stopAcq();
bool f16 = (m_cam.getModel().getChipType() == Andanta_CcdFT2k); bool f16 = m_cam.getModel().isFrelon16();
FrameTransferMode ftm_seq[2] = {!f16 ? FFM : FTM, !f16 ? FTM : FFM}; FrameTransferMode ftm_seq[2] = {!f16 ? FFM : FTM, !f16 ? FTM : FFM};
FrameTransferMode ftm; FrameTransferMode ftm;
InputChan input_chan; InputChan input_chan;
......
...@@ -407,6 +407,14 @@ GeomType Model::getGeomType() ...@@ -407,6 +407,14 @@ GeomType Model::getGeomType()
return geom_type; return geom_type;
} }
bool Model::isFrelon16()
{
DEB_MEMBER_FUNCT();
bool f16 = (getChipType() == Andanta_CcdFT2k);
DEB_RETURN() << DEB_VAR1(f16);
return f16;
}
bool Model::isFrelon16Dual() bool Model::isFrelon16Dual()
{ {
DEB_MEMBER_FUNCT(); DEB_MEMBER_FUNCT();
......
Supports Markdown
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