Merge branch 'master' of gitorious.psi.ch:sls_det_software/sls_detector_calibration

This commit is contained in:
Dhanya Maliakal
2015-06-26 11:53:01 +02:00
9 changed files with 2006 additions and 134 deletions

View File

@ -76,10 +76,10 @@ public:
while (dd<=(dsize-packetSize)) {
pnum=getPacketNumber(p);
fn=getFrameNumber(p);
//cout <<"pnum:"<<pnum<<" fn:"<<fn<<"\t";
cout <<"pnum:"<<pnum<<" fn:"<<fn<<"\t "<< np << endl;;
if (pnum<1 || 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) {