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

merge to master

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-11-23 12:40:24 +01:00
commit a65ebbea99
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorCalibration/eigerHalfModuleData.h
View File

@ -36,7 +36,7 @@ public:
} }
//Map //Map
int totalNumberOfBytes = numberOfPackets * bufferSize; int totalNumberOfBytes = numberOfPackets * bufferSize;
int iPacket1 = 8; int iPacket1 = 8;
int iPacket2 = (totalNumberOfBytes/2) + 8; int iPacket2 = (totalNumberOfBytes/2) + 8;
int iData1 = 0, iData2 = 0; int iData1 = 0, iData2 = 0;
@ -237,10 +237,12 @@ public:
uint32_t m=0, n = 0; uint32_t m=0, n = 0;
int linesperpacket,newix, newiy,origX; int linesperpacket,newix, newiy,origX;
//cout <<"ix:"<<ix<<" nx:"<<nx<<" iy:"<<iy<<" ny:"<<ny<<" datamap[iy][ix]:"<< dataMap[iy][ix] <<" datasize:"<< dataSize <<endl; //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) { if (ix>=0 && ix<nx && iy>=0 && iy<ny && dataMap[iy][ix]>=0 && dataMap[iy][ix]<dataSize) {
m=dataMask[iy][ix]; m=dataMask[iy][ix];
//pixelpos1d = (nx * iy + ix); //pixelpos1d = (nx * iy + ix);
switch(dr){ switch(dr){
@ -273,6 +275,7 @@ public:
} }
}else{ }else{
cprintf(RED,"outside limits\n"); cprintf(RED,"outside limits\n");
return -99; return -99;