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

Jungfrau10ModuleData modified

Browse Source
This commit is contained in:
bergamaschi 2015-03-31 14:41:06 +02:00
parent 985b4d71b4
commit 5e59c86d72
3 changed files with 50 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
slsDetectorCalibration/jungfrau10ModuleData.h
View File

@ -25,7 +25,7 @@ class jungfrau10ModuleData : public slsDetectorData<uint16_t> {
*/ */
jungfrau10ModuleData(int ns=16384): slsDetectorData<uint16_t>(256*4, 256*2, ns*2*32, NULL, NULL) , nadc(32), sc_width(64), sc_height(256) { jungfrau10ModuleData(int ns=16384): slsDetectorData<uint16_t>(256*4, 256*2, 256*256*8*2, NULL, NULL, NULL) , iframe(0), nadc(32), sc_width(64), sc_height(256) {
@ -35,48 +35,49 @@ class jungfrau10ModuleData : public slsDetectorData<uint16_t> {
int iadc; int iadc;
int ix, iy; int ix, iy;
int ichip;
// cout << sizeof(uint16_t) << endl;
cout << nx << " " << ny << " " << dataSize << endl;
for (iadc=0; iadc<nadc; iadc++) { for (iadc=0; iadc<nadc; iadc++) {
ichip=iadc/4;
for (int i=0; i<sc_width*sc_height; i++) { for (int i=0; i<sc_width*sc_height; i++) {
if (iadc<nadc/2) {
if (ichip%2==0) {
row=sc_height+i/sc_width; row=sc_height+i/sc_width;
col=iadc*sc_width+(i%sc_width); col=(ichip/2)*256+iadc%4*sc_width+(i%sc_width);
} else { } else {
row=sc_height-1-i/sc_width; row=sc_height-1-i/sc_width;
col=(ny-1)-(iadc-16)*sc_width-(i%sc_width); col=((ichip/2)*256+iadc%4*sc_width)+sc_width-(i%sc_width)-1;
} }
/* if (iadc<nadc/2) { */
/* row=sc_height+i/sc_width; */
/* col=iadc*sc_width+(i%sc_width); */
/* } else { */
/* row=sc_height-1-i/sc_width; */
/* col=(nx-1)-((iadc-16)*sc_width)-(i%sc_width); */
/* } */
if (row<0 || row>=ny || col<0 || col>=nx) {
cout << "Wrong row, column " << row << " " << col << " " << iadc << " " << i << endl;
} else
dataMap[row][col]=(nadc*i+iadc)*2; dataMap[row][col]=(nadc*i+iadc)*2;
if (dataMap[row][col]<0 || dataMap[row][col]>=dataSize) if (dataMap[row][col]<0 || dataMap[row][col]>=dataSize)
cout << "Error: pointer " << dataMap[row][col] << " out of range "<< endl; cout << "Error: pointer " << dataMap[row][col] << " out of range " << row << " " << col <<" " << iadc << " " << i << endl;
else {
xmap[nadc*i+iadc]=col;
ymap[nadc*i+iadc]=row;
} }
}
} }
for (int i=0; i<nx*ny; i++) {
isample=i/nadc;
iadc=i%nadc;
ix=isample%sc_width;
iy=isample/sc_width;
if (iadc<(nadc/2)) {
xmap[i]=iadc*sc_width+ix;//adc_nr[iadc]+ix;
ymap[i]=ny/2+iy;
} else {
xmap[i]=(ny-1)-(iadc-16)*sc_width-ix;//adc_nr[iadc]+ix;
ymap[i]=ny/2-1-iy;
}
}
iframe=0;
// cout << "data struct created" << endl;
}; };

22
slsDetectorCalibration/moench02CtbData.h
View File

@ -36,9 +36,6 @@ class moench02CtbData : public slsDetectorData<uint16_t> {
int iadc; int iadc;
int ix, iy; int ix, iy;
xmap=new int[nx*ny];
ymap=new int[nx*ny];
@ -54,25 +51,6 @@ class moench02CtbData : public slsDetectorData<uint16_t> {
} }
} }
for (int i=0; i<nx*ny; i++) {
isample=i/32;
iadc=i%nadc;
ix=isample%sc_width;
iy=isample/sc_width;
if (iadc<(nadc/2)) {
xmap[i]=adc_nr[iadc]+ix;
ymap[i]=ny/2-1-iy;
} else {
xmap[i]=adc_nr[iadc]+ix;
ymap[i]=ny/2+iy;
}
}
iframe=0; iframe=0;
// cout << "data struct created" << endl; // cout << "data struct created" << endl;

18
slsDetectorCalibration/slsDetectorData.h
View File

@ -41,6 +41,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) {
cout << "data size is " << dataSize << endl;
cout << "detector size is " << nx << " " << ny << endl;
dataMask=new dataType*[ny]; dataMask=new dataType*[ny];
for(int i = 0; i < ny; i++) { for(int i = 0; i < ny; i++) {
@ -58,7 +60,7 @@ class slsDetectorData {
dataROIMask[i][j]=1; dataROIMask[i][j]=1;
} }
cout << "map size is " << dataSize/sizeof(dataType) << endl;
xmap=new int[dataSize/sizeof(dataType)]; xmap=new int[dataSize/sizeof(dataType)];
ymap=new int[dataSize/sizeof(dataType)]; ymap=new int[dataSize/sizeof(dataType)];
@ -75,16 +77,24 @@ class slsDetectorData {
}; };
virtual ~slsDetectorData() { virtual ~slsDetectorData() {
// cout <<"delete xmap, ymap" << endl;
delete[] xmap;
delete[] ymap;
// cout <<"delete first d" << endl;
for(int i = 0; i < ny; i++) { for(int i = 0; i < ny; i++) {
delete [] dataMap[i]; // cout <<"delete data mask "<< i << endl;
delete[] dataMask[i]; delete[] dataMask[i];
// cout <<"delete data roi "<< i << endl;
delete[] dataROIMask[i]; delete[] dataROIMask[i];
// cout <<"delete data map "<< i << endl;
delete[] dataMap[i];
} }
// cout <<"delete second d" << endl;
delete[] dataMap; delete[] dataMap;
delete[] dataMask; delete[] dataMask;
delete[] dataROIMask; delete[] dataROIMask;
delete [] xmap;
delete [] ymap;
} }