mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-22 03:40:04 +02:00
Compiles
This commit is contained in:
parent
69fb5876cb
commit
4ae2edf686
@ -249,9 +249,12 @@ class jungfrauLGADStrixelsDataQuadH5 : public slsDetectorData<uint16_t> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//The following functions are pure virtual in the base class. But I don't want them to be accessible here!
|
//The following functions are pure virtual in the base class. But I don't want them to be accessible here!
|
||||||
char* readNextFrame( std::ifstream &filebin );
|
//Implement the functions as private (to satisfy the linker)
|
||||||
int getFrameNumber(char *buff); //Provided via public method readNextFrame
|
int getFrameNumber(char* buff){return 0;} //Provided via public method readNextFrame
|
||||||
int getPacketNumber(char *buff); //Not provided
|
int getPacketNumber(char* buff){return 0;} //Not provided
|
||||||
|
|
||||||
|
//Mark overwritten functions as override final
|
||||||
|
char* readNextFrame( std::ifstream &filebin ) override final {return nullptr;}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -316,7 +319,7 @@ class jungfrauLGADStrixelsDataQuadH5 : public slsDetectorData<uint16_t> {
|
|||||||
required as double
|
required as double
|
||||||
|
|
||||||
*/
|
*/
|
||||||
virtual double getValue(char *data, int ix, int iy = 0) {
|
virtual double getValue(char* data, int ix, int iy = 0) {
|
||||||
|
|
||||||
uint16_t val = getChannel(data, ix, iy) & 0x3fff;
|
uint16_t val = getChannel(data, ix, iy) & 0x3fff;
|
||||||
return val;
|
return val;
|
||||||
@ -394,7 +397,7 @@ class jungfrauLGADStrixelsDataQuadH5 : public slsDetectorData<uint16_t> {
|
|||||||
/* found */
|
/* found */
|
||||||
|
|
||||||
/* *\/ */
|
/* *\/ */
|
||||||
virtual char *findNextFrame(char *data, int &ndata, int dsize) {
|
virtual char* findNextFrame(char* data, int& ndata, int dsize) {
|
||||||
if (dsize < dataSize)
|
if (dsize < dataSize)
|
||||||
ndata = dsize;
|
ndata = dsize;
|
||||||
else
|
else
|
||||||
|
Loading…
x
Reference in New Issue
Block a user