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

gotthard compression works..without shortframe

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@43 113b152e-814d-439b-b186-022a431db7b5
This commit is contained in:
l_maliakal_d
2014-02-18 16:36:46 +00:00
parent 26003dc867
commit 44fb8230cf
4 changed files with 32 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
slsDetectorCalibration/gotthardModuleData.h
View File

@ -13,9 +13,6 @@
#define FRAMEMASK 0xFFFFFFFE
#define PACKETMASK 1
#define FRAMEOFFSET 0x1
#define SHORT_FRAMEMASK 0xFFFFFFFF
#define SHORT_PACKETMASK 0
#define SHORT_FRAMEOFFSET 0
class gotthardModuleData : public slsReceiverData<uint16_t> {
@ -32,8 +29,7 @@ public:
*/
gotthardModuleData(double c=0, bool s=-1): slsReceiverData<uint16_t>(X_PIXELS, Y_PIXELS, NPACKETS, BUFFERSIZE), xtalk(c),shortFrame(s) {
gotthardModuleData(double c=0, int s=-1): slsReceiverData<uint16_t>(X_PIXELS, Y_PIXELS, NPACKETS, BUFFERSIZE), xtalk(c),shortFrame(s) {
if(shortFrame == -1)
shortFrame = 0;
@ -84,19 +80,31 @@ public:
setDataMap(dMap);
setDataMask(dMask);
if(shortFrame){
setFrameIndexMask(FRAMEMASK);
setPacketIndexMask(PACKETMASK);
setFrameIndexOffset(FRAMEOFFSET);
}else{
setFrameIndexMask(SHORT_FRAMEMASK);
setPacketIndexMask(SHORT_PACKETMASK);
setFrameIndexOffset(SHORT_FRAMEOFFSET);
}
};
/**
Returns the frame number for the given dataset.
\param buff pointer to the dataset
\returns frame number
*/
int getFrameNumber(char *buff){
int np=(*(int*)buff);
if(shortFrame)
return np;
//gotthards frame header must be incremented
++np;
//packet index should be 1 or 2
return ((np&FRAMEMASK)>>FRAMEOFFSET);
};
/**
gets the packets number (last packet is labelled with 0 and is replaced with 40)
@ -109,9 +117,11 @@ public:
if(shortFrame)
return 1;
int np=(*(int*)buff)&0x1;
int np=(*(int*)buff);
//gotthards frame header must be incremented
++np;
return np;
//packet index should be 1 or 2
return ((np&PACKETMASK)+1);
};