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

bug with 8 bit and 16 bt mode

Browse Source
This commit is contained in:
Dhanya Maliakal 2015-08-26 10:28:10 +02:00
parent e732dbbeab
commit b2c443af42
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorCalibration/eigerHalfModuleData.h
View File

@ -38,7 +38,7 @@ public:
//Map //Map
int totalNumberOfBytes = 1040 * dynamicRange * 16 *2; //for both 1g and 10g int totalNumberOfBytes = 1040 * dynamicRange * 16 *2; //for both 1g and 10g
int iPacket1 = 8; int iPacket1 = 8;
int iPacket2 = (totalNumberOfBytes/2) + 8; int iPacket2 = bufferSize + 8;
int iData1 = 0, iData2 = 0; int iData1 = 0, iData2 = 0;
int increment = (dynamicRange/8); int increment = (dynamicRange/8);
int ic_increment = 1; int ic_increment = 1;
@ -59,7 +59,7 @@ public:
iData1 += increment; iData1 += increment;
//increment header //increment header
if(iData1 >= actualDataSize){ if(iData1 >= actualDataSize){
iPacket1 += 16; iPacket1 += (bufferSize + 8);
iData1 = 0; iData1 = 0;
} }
}else{ }else{
@ -68,7 +68,7 @@ public:
iData2 += increment; iData2 += increment;
//increment header //increment header
if(iData2 >= actualDataSize){ if(iData2 >= actualDataSize){
iPacket2 += 16; iPacket2 += (bufferSize + 8);
iData2 = 0; iData2 = 0;
} }
} }
@ -269,6 +269,8 @@ public:
numBytes = (nx * iy + ix); numBytes = (nx * iy + ix);
divFactor=512; divFactor=512;
if (dr == 16) divFactor = 1024;
else if (dr == 8) divFactor = 2048;
/*if(dr == 4) divFactor = 16; /*if(dr == 4) divFactor = 16;
else if (dr == 8) divFactor = 8; else if (dr == 8) divFactor = 8;
else if (dr == 16) divFactor = 512;*/ else if (dr == 16) divFactor = 512;*/