diff --git a/slsDetectorCalibration/dataStructures/Mythen3_01_jctbData.h b/slsDetectorCalibration/dataStructures/Mythen3_01_jctbData.h index 101074dea..5adf10882 100644 --- a/slsDetectorCalibration/dataStructures/Mythen3_01_jctbData.h +++ b/slsDetectorCalibration/dataStructures/Mythen3_01_jctbData.h @@ -43,7 +43,7 @@ class mythen3_01_jctbData : public slsDetectorData { } - static short unsigned int* mythen03_frame(char *ptr, int dr=24, int nch=64*3, int off=5) { + virtual short unsigned int* mythen03_frame(char *ptr, int dr=24, int nch=64*3, int off=5) { // off=0; int iarg; int64_t word, *wp; diff --git a/slsDetectorCalibration/dataStructures/Mythen3_02_jctbData.h b/slsDetectorCalibration/dataStructures/Mythen3_02_jctbData.h new file mode 100644 index 000000000..0dd991f56 --- /dev/null +++ b/slsDetectorCalibration/dataStructures/Mythen3_02_jctbData.h @@ -0,0 +1,127 @@ +#ifndef MYTHEN302JCTBDATA_H +#define MYTHEN302JCTBDATA_H + + +#include "Mythen3_01_jctbData.h" +//class mythen3_02_jctbData : public slsDetectorData { +class mythen3_02_jctbData : public mythen3_01_jctbData { + + + public: + mythen3_02_jctbData( int nch=64*3,int dr=24, int off=5): mythen3_01_jctbData( nch,dr, off) + //slsDetectorData(64*3,1,dr*8*nch,NULL,NULL,NULL), dynamicRange(dr), serialOffset(off), frameNumber(0), numberOfCounters(nch) + {}; + + /* virtual void getPixel(int ip, int &x, int &y) {x=-1; y=-1;}; */ + + /* virtual short unsigned int getChannel(char *data, int ix, int iy=0) { */ + /* int ret=-1; */ + /* short unsigned int *val=mythen03_frame(data,dynamicRange,numberOfCounters,serialOffset); */ + /* if (ix>=0 && ix=0) frameNumber=f; return frameNumber; }; */ + /* virtual int setDynamicRange(int d=-1) {if (d>0 && d<=24) dynamicRange=d; return dynamicRange;}; */ + /* virtual int setSerialOffset(int d=-1) {if (d>=0) serialOffset=d; return serialOffset;}; */ + /* virtual int setNumberOfCounters(int d=-1) {if (d>=0) numberOfCounters=d; return numberOfCounters;}; */ + + + /* private: */ + + /* int dynamicRange; */ + /* int serialOffset; */ + /* int frameNumber; */ + /* int numberOfCounters; */ + + + + +}; + +#endif