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

fixed 10g bug for 32 bit image reconstruction

Browse Source
This commit is contained in:
Dhanya Maliakal
2016-07-15 18:50:01 +02:00
parent a7a3422ed2
commit cb3f8b05a6
1 changed files with 54 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
slsDetectorCalibration/eigerHalfModuleData.h
View File

@ -93,8 +93,13 @@ public:
iPacket1 = (totalNumberOfBytes/2) - numbytesperlineperport - 8; iPacket1 = (totalNumberOfBytes/2) - numbytesperlineperport - 8;
iPacket2 = totalNumberOfBytes - numbytesperlineperport - 8; iPacket2 = totalNumberOfBytes - numbytesperlineperport - 8;
if (dynamicRange == 32){ if (dynamicRange == 32){
iPacket1 -= 16; if(numbytesperlineperport>actualDataSize){ //1Giga
iPacket2 -= 16; iPacket1 -= 16;
iPacket2 -= 16;
}else{ //10Giga
;//iPacket1 -= numbytesperlineperport;
//iPacket2 -= numbytesperlineperport;
}
} }
for (int ir=0; ir<ypixels; ir++) { for (int ir=0; ir<ypixels; ir++) {
@ -104,43 +109,75 @@ public:
dMap[ir][ic] = iPacket1; dMap[ir][ic] = iPacket1;
iPacket1 += increment; iPacket1 += increment;
iData1 += increment; iData1 += increment;
//--------------------32 bit -------------------------
if(dynamicRange == 32){ if(dynamicRange == 32){
if(iData1 == numbytesperlineperport){ if(numbytesperlineperport>actualDataSize){ //1Giga
iPacket1 -= (numbytesperlineperport*2 + 16*3); if(iData1 == numbytesperlineperport){
iData1 = 0; iPacket1 -= (numbytesperlineperport*2 + 16*3);//1giga
iData1 = 0;
}
if(iData1 == actualDataSize){
iPacket1 += 16;
}
}else{ //10Giga
if((iData1 % numbytesperlineperport)==0){
iPacket1 -= (numbytesperlineperport*2);
}
if(iData1 == actualDataSize){
iPacket1 -= 16;
iData1 = 0;
}
} }
if(iData1 == actualDataSize){ }//------------end of 32 bit -------------------------
iPacket1 += 16;
} else if((iData1 % numbytesperlineperport) == 0){
}else if((iData1 % numbytesperlineperport) == 0){
iPacket1 -= (numbytesperlineperport*2); iPacket1 -= (numbytesperlineperport*2);
if(iData1 == actualDataSize){ if(iData1 == actualDataSize){
iPacket1 -= 16; iPacket1 -= 16;
iData1 = 0; iData1 = 0;
} }
} }
//------------end of other bits -------------------------
} }
//other port //other port
else{ else{
dMap[ir][ic] = iPacket2; dMap[ir][ic] = iPacket2;
iPacket2 += increment; iPacket2 += increment;
iData2 += increment; iData2 += increment;
//--------------------32 bit -------------------------
if(dynamicRange == 32){ if(dynamicRange == 32){
if(iData2 == numbytesperlineperport){ if(numbytesperlineperport>actualDataSize){ //1Giga
iPacket2 -= (numbytesperlineperport*2 + 16*3); if(iData2 == numbytesperlineperport){
iData2 = 0; iPacket2 -= (numbytesperlineperport*2 + 16*3);
iData2 = 0;
}
if(iData2 == actualDataSize){
iPacket2 += 16;
}
}else{//10Giga
if((iData2 % numbytesperlineperport)==0){
iPacket2 -= (numbytesperlineperport*2);
}
if(iData2 == actualDataSize){
iPacket2 -= 16;
iData2 = 0;
}
} }
if(iData2 == actualDataSize){ }//------------end of 32 bit -------------------------
iPacket2 += 16;
} else if((iData2 % numbytesperlineperport) == 0){
}else if((iData2 % numbytesperlineperport) == 0){
iPacket2 -= (numbytesperlineperport*2); iPacket2 -= (numbytesperlineperport*2);
if(iData2 == actualDataSize){ if(iData2 == actualDataSize){
iPacket2 -= 16; iPacket2 -= 16;
iData2 = 0; iData2 = 0;
} }
} }
//------------end of other bits -------------------------
} }
} }
} }