mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-05-05 20:30:03 +02:00
merge to master
This commit is contained in:
commit
a65ebbea99
@ -36,7 +36,7 @@ public:
|
||||
}
|
||||
|
||||
//Map
|
||||
int totalNumberOfBytes = numberOfPackets * bufferSize;
|
||||
int totalNumberOfBytes = numberOfPackets * bufferSize;
|
||||
int iPacket1 = 8;
|
||||
int iPacket2 = (totalNumberOfBytes/2) + 8;
|
||||
int iData1 = 0, iData2 = 0;
|
||||
@ -237,10 +237,12 @@ public:
|
||||
uint32_t m=0, n = 0;
|
||||
int linesperpacket,newix, newiy,origX;
|
||||
|
||||
|
||||
//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];
|
||||
|
||||
|
||||
//pixelpos1d = (nx * iy + ix);
|
||||
|
||||
switch(dr){
|
||||
@ -273,6 +275,7 @@ public:
|
||||
}
|
||||
|
||||
|
||||
|
||||
}else{
|
||||
cprintf(RED,"outside limits\n");
|
||||
return -99;
|
||||
|
Loading…
x
Reference in New Issue
Block a user