merge conflict resolved from 3.0.1

This commit is contained in:
Dhanya Maliakal
2017-11-17 09:40:42 +01:00
13 changed files with 263 additions and 87 deletions

View File

@ -430,7 +430,7 @@ unsigned int nPixelsX;
/** Number of angle Pixels in X Axis */
int nAnglePixelsX;
/** Number of pixel bins in Y Axis */
int nPixelsY;
unsigned int nPixelsY;
/** Min Pixel number for Y Axis*/
double minPixelsY;
/** Max Pixel number for Y Axis*/