Merge branch 'developer' of git.psi.ch:sls_detectors_software/sls_detector_calibration into developer

This commit is contained in:
2016-12-05 16:01:00 +01:00
2 changed files with 244 additions and 156 deletions

View File

@ -214,6 +214,7 @@ public:
} else {
// cout << "." << endl;;
np++;
//cout<<"np:"<<np<<endl;
}
}
}
@ -221,7 +222,10 @@ public:
return NULL;
};
virtual int* readNextFramewithMissingPackets(ifstream &filebin, int& fnum) {return NULL;}
virtual void getChannelArray(double* data, char* buffer){};
virtual int* readNextFrameOnlyData(ifstream &filebin, int& fnum) {return NULL;};
virtual int* decodeData(int* datain) {return NULL;};
private:
const int nPackets; /**<number of UDP packets constituting one frame */