detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-09 03:20:42 +02:00
Code Issues Actions Packages Releases Activity

xmap, ymap added again to slsDetectorData

Browse Source
This commit is contained in:
bergamaschi 2015-04-01 13:04:27 +02:00
parent 48d672b918
commit 904462b582
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorCalibration/slsDetectorData.h
View File

@ -40,6 +40,8 @@ class slsDetectorData {
slsDetectorData(int npx, int npy, int dsize, int **dMap=NULL, dataType **dMask=NULL, int **dROI=NULL): nx(npx), ny(npy), dataSize(dsize) { slsDetectorData(int npx, int npy, int dsize, int **dMap=NULL, dataType **dMask=NULL, int **dROI=NULL): nx(npx), ny(npy), dataSize(dsize) {
xmap=new int[nx*ny];
ymap=new int[nx*ny];
dataMask=new dataType*[ny]; dataMask=new dataType*[ny];
for(int i = 0; i < ny; i++) { for(int i = 0; i < ny; i++) {
@ -56,8 +58,8 @@ class slsDetectorData {
for (int j=0; j<nx; j++) for (int j=0; j<nx; j++)
dataROIMask[i][j]=1; dataROIMask[i][j]=1;
} }
xmap=new int[dsize];
ymap=new int[dsize];
setDataMap(dMap); setDataMap(dMap);
setDataMask(dMask); setDataMask(dMask);
@ -78,7 +80,7 @@ class slsDetectorData {
delete [] ymap; delete [] ymap;
} }
virtual void getPixel(int ip, int &x, int &y) {x=ip; y=0;}; virtual void getPixel(int ip, int &x, int &y) {x=xmap[ip]; y=ymap[ip];};
@ -90,7 +92,7 @@ class slsDetectorData {
void setDataMap(int **dMap=NULL) { void setDataMap(int **dMap=NULL) {
int ip;
if (dMap==NULL) { if (dMap==NULL) {
for (int iy=0; iy<ny; iy++) for (int iy=0; iy<ny; iy++)
@ -103,6 +105,9 @@ class slsDetectorData {
for (int ix=0; ix<nx; ix++) { for (int ix=0; ix<nx; ix++) {
dataMap[iy][ix]=dMap[iy][ix]; dataMap[iy][ix]=dMap[iy][ix];
// cout << ix << " " << iy << endl; // cout << ix << " " << iy << endl;
ip=dataMap[ix][iy]/sizeof(dataType);
xmap[ip]=ix;
ymap[ip]=iy;
} }
} }
} }