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

should work for 10g now

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-09-04 17:40:13 +02:00
parent 35cd736c4c
commit 03c41a759f
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
slsDetectorCalibration/eigerHalfModuleData.h
View File

@ -36,7 +36,7 @@ public:
}
//Map
int totalNumberOfBytes = 1040 * dynamicRange * 16 *2; //for both 1g and 10g
int totalNumberOfBytes = numberOfPackets * bufferSize;
int iPacket1 = 8;
int iPacket2 = (totalNumberOfBytes/2) + 8;
int iData1 = 0, iData2 = 0;
@ -49,6 +49,7 @@ public:
int iPort;
if(top){
for (int ir=0; ir<ypixels; ir++) {
for (int ic=0; ic<xpixels; ic = ic + ic_increment) {
@ -257,34 +258,14 @@ public:
virtual int getChannel(char *data, int ix, int iy, int dr) {
uint32_t m=0, n = 0;
uint64_t t;
int numBytes,divFactor,pixelval;
//cout <<"ix:"<<ix<<" nx:"<<nx<<" iy:"<<iy<<" ny:"<<ny<<" datamap[iy][ix]:"<< dataMap[iy][ix] <<" datasize:"<< dataSize <<endl;
if (ix>=0 && ix<nx && iy>=0 && iy<ny && dataMap[iy][ix]>=0 && dataMap[iy][ix]<dataSize) {
m=dataMask[iy][ix];
numBytes = (nx * iy + ix);
divFactor=2;
if(dr == 4) divFactor = 16;
else if (dr == 8) divFactor = 8;
else if (dr == 16) divFactor = 4;
pixelval = numBytes % divFactor;
/*//big endian
newix = ix - pixelval;
*/
}else
cprintf(RED,"outside limits\n");
/*//big endian
t = ((uint64_t)(*((uint64_t*)(((char*)data)+(dataMap[iy][newix])))));
if(dr == 4) return ((t >> (pixelval*4)) & 0xf)^m;
else if(dr == 8) return ((t >> (pixelval*8)) & 0xff)^m;
else if(dr == 16) return ((t >> (pixelval*16)) & 0xffff)^m;
else return ((t >> (pixelval*32)) & 0xffffffff)^m;
*/
//little endian
n = ((uint32_t)(*((uint32_t*)(((char*)data)+(dataMap[iy][ix])))));