diff --git a/slsDetectorCalibration/slsDetectorData.h b/slsDetectorCalibration/slsDetectorData.h index c17d30ec1..8181c276f 100644 --- a/slsDetectorCalibration/slsDetectorData.h +++ b/slsDetectorCalibration/slsDetectorData.h @@ -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; }; diff --git a/slsDetectorCalibration/slsReceiverData.h b/slsDetectorCalibration/slsReceiverData.h index fac829c5b..fab0d8dfa 100644 --- a/slsDetectorCalibration/slsReceiverData.h +++ b/slsDetectorCalibration/slsReceiverData.h @@ -76,10 +76,10 @@ public: while (dd<=(dsize-packetSize)) { pnum=getPacketNumber(p); fn=getFrameNumber(p); - //cout <<"pnum:"<nPackets) { - cout << "Bad packet number " << pnum << " frame "<< fn << endl; + //cout << "Bad packet number " << pnum << " frame "<< fn << endl; retval=NULL; np=0; } else if (pnum==1) { @@ -98,20 +98,26 @@ public: p+=packetSize; dd+=packetSize; np++; + //cout <<"fnum:"<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; + + } } ndata=np*packetSize;