change getPixelSize for non square pixel detector

parent c8c3d341
......@@ -116,7 +116,7 @@ namespace lima
void getShutterMode(ShutterMode& mode);
void getPixelSize(double&);
void getPixelSize(double& x_size,double &y_size);
void getStatus(Camera::Status& status);
......
......@@ -50,7 +50,7 @@ namespace lima
virtual void getCurrImageType(ImageType& curr_image_type);
virtual void setCurrImageType(ImageType curr_image_type);
virtual void getPixelSize(double& pixel_size);
virtual void getPixelSize(double& x_size,double &y_size);
virtual void getDetectorType(std::string& det_type);
virtual void getDetectorModel(std::string& det_model);
......
......@@ -947,7 +947,7 @@ bool Camera::isBinningAvailable()
//-----------------------------------------------------
// @brief return the detector pixel size in meter
//-----------------------------------------------------
void Camera::getPixelSize(double& size)
void Camera::getPixelSize(double& x_size,double& y_size)
{
DEB_MEMBER_FUNCT();
float xsize, ysize;
......@@ -961,8 +961,9 @@ void Camera::getPixelSize(double& size)
//Lima will be modified, with a new SizeUtils class for pixel size
// today just return x size supposing it the the same for y.
// remember standard is metric units so size is in meter
size = xsize * 1e-6;
DEB_RETURN() << DEB_VAR1(size);
x_size = xsize * 1e-6;
y_size = ysize * 1e-6;
DEB_RETURN() << DEB_VAR1(x_size,y_size);
}
......
......@@ -91,10 +91,10 @@ void DetInfoCtrlObj::setCurrImageType(ImageType image_type)
//-----------------------------------------------------
// @brief
//-----------------------------------------------------
void DetInfoCtrlObj::getPixelSize(double& size)
void DetInfoCtrlObj::getPixelSize(double& x_size,double& y_size)
{
DEB_MEMBER_FUNCT();
m_cam.getPixelSize(size);
m_cam.getPixelSize(x_size,y_size);
}
//-----------------------------------------------------
......
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