Remove support for obsolete Frelon16/SPB2

include/Frelon.h

@@ -164,7 +164,6 @@ enum SPBConType {
 enum GeomType {
 	SPB12_4_Quad,
 	Hamamatsu,
-	SPB2_F16,
 	SPB8_F16_Single,
 	SPB8_F16_Dual,
 };

sip/Frelon.sip

@@ -171,7 +171,6 @@ enum SPBConType {
 enum GeomType {
 	SPB12_4_Quad,
 	Hamamatsu,
-	SPB2_F16,
 	SPB8_F16_Single,
 	SPB8_F16_Dual,
 };

src/FrelonCamera.cpp

@@ -110,7 +110,6 @@ void Camera::syncRegs()
 		switch (geom_type) {
 		case SPB12_4_Quad:
 		case Hamamatsu:
-		case SPB2_F16:
 		case SPB8_F16_Single:
 		case SPB8_F16_Dual:
 			m_geom = new Geometry(*this);

src/FrelonGeometry.cpp

@@ -323,9 +323,7 @@ void Geometry::getMaxFrameDim(FrameDim& max_frame_dim)
 	max_frame_dim = ChipMaxFrameDimMap[chip_type];
 
 	GeomType geom_type = m_model.getGeomType();
-	if (geom_type == SPB2_F16)
-		max_frame_dim /= Point(2, 2);
-	else if (geom_type == SPB8_F16_Single)
+	if (geom_type == SPB8_F16_Single)
 		max_frame_dim /= Point(1, 2);
 
 	DEB_RETURN() << DEB_VAR1(max_frame_dim);

src/FrelonModel.cpp

@@ -383,10 +383,12 @@ GeomType Model::getGeomType()
 		if (chip_type == Hama)
 			geom_type = Hamamatsu;
 		else if (chip_type == Andanta_CcdFT2k)
-			geom_type = SPB2_F16;
+			THROW_HW_ERROR(NotSupported) << "Obsolete Frelon16 "
+						     << "with SPB2";
 	} else if (has(SPB8)) {
 		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();
 		bool dual_spb = (spb_con_type == SPBConXY);
 		geom_type = dual_spb ? SPB8_F16_Dual : SPB8_F16_Single;