Commit 997bc916 authored by Alejandro Homs Puron's avatar Alejandro Homs Puron Committed by Laurent Claustre
Browse files

Remove support for obsolete Frelon16/SPB2

parent 564ed30e
...@@ -164,7 +164,6 @@ enum SPBConType { ...@@ -164,7 +164,6 @@ enum SPBConType {
enum GeomType { enum GeomType {
SPB12_4_Quad, SPB12_4_Quad,
Hamamatsu, Hamamatsu,
SPB2_F16,
SPB8_F16_Single, SPB8_F16_Single,
SPB8_F16_Dual, SPB8_F16_Dual,
}; };
......
...@@ -171,7 +171,6 @@ enum SPBConType { ...@@ -171,7 +171,6 @@ enum SPBConType {
enum GeomType { enum GeomType {
SPB12_4_Quad, SPB12_4_Quad,
Hamamatsu, Hamamatsu,
SPB2_F16,
SPB8_F16_Single, SPB8_F16_Single,
SPB8_F16_Dual, SPB8_F16_Dual,
}; };
......
...@@ -110,7 +110,6 @@ void Camera::syncRegs() ...@@ -110,7 +110,6 @@ void Camera::syncRegs()
switch (geom_type) { switch (geom_type) {
case SPB12_4_Quad: case SPB12_4_Quad:
case Hamamatsu: case Hamamatsu:
case SPB2_F16:
case SPB8_F16_Single: case SPB8_F16_Single:
case SPB8_F16_Dual: case SPB8_F16_Dual:
m_geom = new Geometry(*this); m_geom = new Geometry(*this);
......
...@@ -323,9 +323,7 @@ void Geometry::getMaxFrameDim(FrameDim& max_frame_dim) ...@@ -323,9 +323,7 @@ void Geometry::getMaxFrameDim(FrameDim& max_frame_dim)
max_frame_dim = ChipMaxFrameDimMap[chip_type]; max_frame_dim = ChipMaxFrameDimMap[chip_type];
GeomType geom_type = m_model.getGeomType(); GeomType geom_type = m_model.getGeomType();
if (geom_type == SPB2_F16) if (geom_type == SPB8_F16_Single)
max_frame_dim /= Point(2, 2);
else if (geom_type == SPB8_F16_Single)
max_frame_dim /= Point(1, 2); max_frame_dim /= Point(1, 2);
DEB_RETURN() << DEB_VAR1(max_frame_dim); DEB_RETURN() << DEB_VAR1(max_frame_dim);
......
...@@ -383,10 +383,12 @@ GeomType Model::getGeomType() ...@@ -383,10 +383,12 @@ GeomType Model::getGeomType()
if (chip_type == Hama) if (chip_type == Hama)
geom_type = Hamamatsu; geom_type = Hamamatsu;
else if (chip_type == Andanta_CcdFT2k) else if (chip_type == Andanta_CcdFT2k)
geom_type = SPB2_F16; THROW_HW_ERROR(NotSupported) << "Obsolete Frelon16 "
<< "with SPB2";
} else if (has(SPB8)) { } else if (has(SPB8)) {
if (chip_type != Andanta_CcdFT2k) if (chip_type != Andanta_CcdFT2k)
THROW_HW_ERROR(Error) << "SPB8 only supports Frelon16"; THROW_HW_ERROR(NotSupported) << "SPB8 only supports "
<< "Frelon16";
SPBConType spb_con_type = getSPBConType(); SPBConType spb_con_type = getSPBConType();
bool dual_spb = (spb_con_type == SPBConXY); bool dual_spb = (spb_con_type == SPBConXY);
geom_type = dual_spb ? SPB8_F16_Dual : SPB8_F16_Single; geom_type = dual_spb ? SPB8_F16_Dual : SPB8_F16_Single;
......
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