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

now it should work also with jungfrau

Browse Source 
git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorCalibration@33 113b152e-814d-439b-b186-022a431db7b5
This commit is contained in:
jungmann_j 2014-02-05 10:43:14 +00:00
parent 71c66775cc
commit 02c85d4638
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorCalibration/chiptestBoardData.h
View File

@ -3,7 +3,7 @@
#include "slsDetectorData.h" #include "slsDetectorData.h"
class chiptestBoardData : public slsDetectorData<uint16_t> { class chiptestBoardData : public virtual slsDetectorData<uint16_t> {
public: public:

10
slsDetectorCalibration/slsDetectorData.h
View File

@ -154,6 +154,11 @@ class slsDetectorData {
*/ */
int getDetectorSize(int &npx, int &npy){npx=nx; npy=ny; return nx*ny;}; int getDetectorSize(int &npx, int &npy){npx=nx; npy=ny; return nx*ny;};
/** Returns the size of the data frame */
int getDataSize() {return dataSize;};
/** changes the size of the data frame */
int setDataSize(int d) {dataSize=d; return dataSize;};
/** /**
@ -229,11 +234,6 @@ class slsDetectorData {
*/ */
virtual char *readNextFrame(ifstream &filebin)=0; virtual char *readNextFrame(ifstream &filebin)=0;
/** Returns the size of the data frame */
int getDataSize() {return dataSize;};
/** changes the size of the data frame */
int setDataSize(int d) {};//dataSize=d; return dataSize;};
protected: protected:
const int nx; /**< Number of pixels in the x direction */ const int nx; /**< Number of pixels in the x direction */
const int ny; /**< Number of pixels in the y direction */ const int ny; /**< Number of pixels in the y direction */