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

nothing much

Browse Source
This commit is contained in:
Dhanya Maliakal
2015-08-10 14:57:24 +02:00
parent ceba5b8331
commit 1e817c138f
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorCalibration/slsDetectorData.h
View File

@ -225,7 +225,7 @@ class slsDetectorData {
*/ */
virtual dataType getChannel(char *data, int ix, int iy, int dr) { virtual int getChannel(char *data, int ix, int iy, int dr) {
return 0; return 0;
}; };

14
slsDetectorCalibration/slsReceiverData.h
View File

@ -76,10 +76,10 @@ public:
while (dd<=(dsize-packetSize)) { while (dd<=(dsize-packetSize)) {
pnum=getPacketNumber(p); pnum=getPacketNumber(p);
fn=getFrameNumber(p); fn=getFrameNumber(p);
//cout <<"pnum:"<<pnum<<" fn:"<<fn<<"\t "<< np << endl;; //cout <<"fnum:"<<fn<<" pnum:"<<pnum<<" np:"<< np << "\t";
if (pnum<1 || pnum>nPackets) { if (pnum<1 || pnum>nPackets) {
cout << "Bad packet number " << pnum << " frame "<< fn << endl; //cout << "Bad packet number " << pnum << " frame "<< fn << endl;
retval=NULL; retval=NULL;
np=0; np=0;
} else if (pnum==1) { } else if (pnum==1) {
@ -98,20 +98,26 @@ public:
p+=packetSize; p+=packetSize;
dd+=packetSize; dd+=packetSize;
np++; np++;
//cout <<"fnum:"<<fn<<" pnum:"<<pnum<<" np:"<< np << "\t";
// cout << pnum << " " << fn << " " << np << " " << dd << " " << dsize << endl; // cout << pnum << " " << fn << " " << np << " " << dd << " " << dsize << endl;
if (np==nPackets){ if (np==nPackets){
if (pnum==nPackets) { if (pnum==nPackets) {
// cout << "Frame found!" << endl; //cprintf(BG_GREEN, "Frame Found\n");
cout << "Frame found!" << endl;
break; break;
} else { } else {
//cprintf(BG_RED, "Too many packets for this frame! fnum:%d, pnum:%d np:%d\n",fnum,pnum,np);
cout << "Too many packets for this frame! "<< fnum << " " << pnum << endl; cout << "Too many packets for this frame! "<< fnum << " " << pnum << endl;
retval=NULL; retval=NULL;
} }
} }
} }
if (np<nPackets) { if (np<nPackets) {
if (np>0) if (np>0){
//cprintf(BG_RED, "Too few packets for this frame! fnum:%d, pnum:%d np:%d\n",fnum,pnum,np);
cout << "Too few packets for this frame! "<< fnum << " " << pnum << endl; cout << "Too few packets for this frame! "<< fnum << " " << pnum << endl;
}
} }
ndata=np*packetSize; ndata=np*packetSize;