detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 04:17:15 +02:00
Code Issues Actions Packages Releases Activity

New Zmq header staructur implemented and works, still different number of pixels in the GUI should be fixed (but it does not crash)

Browse Source
This commit is contained in:
bergamaschi
2018-09-25 09:36:47 +02:00
parent 19e7ced332
commit ae8678cdc2
16 changed files with 1505 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
slsDetectorCalibration/multiThreadedInterpolatingDetector.h
View File

@ -10,67 +10,72 @@
using namespace std;
class threadedInterpolatingDetector : public threadedCountingDetector
{
public:
threadedInterpolatingDetector(interpolatingDetector *d, int fs=10000) : threadedCountingDetector(d,fs) {};
/* class threadedInterpolatingDetector : public threadedCountingDetector */
/* { */
/* public: */
/* threadedInterpolatingDetector(interpolatingDetector *d, int fs=10000) : threadedCountingDetector(d,fs) {}; */
virtual void prepareInterpolation(int &ok){
slsInterpolation *interp=(slsInterpolation*)((interpolatingDetector*)det)->getInterpolation();
if (interp)
interp->prepareInterpolation(ok);
}
/* virtual void prepareInterpolation(int &ok){ */
/* slsInterpolation *interp=((interpolatingDetector*)det)->getInterpolation(); */
/* if (interp) */
/* interp->prepareInterpolation(ok); */
/* } */
virtual int *getFlatField(){
slsInterpolation *interp=(slsInterpolation*)((interpolatingDetector*)det)->getInterpolation();
if (interp)
return interp->getFlatField();
else
return NULL;
}
/* virtual int *getFlatField(){ */
/* slsInterpolation *interp=((interpolatingDetector*)det)->getInterpolation(); */
/* if (interp) */
/* return interp->getFlatField(); */
/* else */
/* return NULL; */
/* } */
virtual int *setFlatField(int *ff, int nb, double emin, double emax){
slsInterpolation *interp=(slsInterpolation*)((interpolatingDetector*)det)->getInterpolation();
if (interp)
return interp->setFlatField(ff, nb, emin, emax);
else
return NULL;
}
/* virtual int *setFlatField(int *ff, int nb, double emin, double emax){ */
/* slsInterpolation *interp=((interpolatingDetector*)det)->getInterpolation(); */
/* if (interp) */
/* return interp->setFlatField(ff, nb, emin, emax); */
/* else */
/* return NULL; */
/* } */
void *writeFlatField(const char * imgname) {
/* void *writeFlatField(const char * imgname) { */
slsInterpolation *interp=(slsInterpolation*)((interpolatingDetector*)det)->getInterpolation();
if (interp)
interp->writeFlatField(imgname);
/* slsInterpolation *interp=((interpolatingDetector*)det)->getInterpolation(); */
/* if (interp) */
/* interp->writeFlatField(imgname); */
}
void *readFlatField(const char * imgname, int nb=-1, double emin=1, double emax=0){
slsInterpolation *interp=(slsInterpolation*)((interpolatingDetector*)det)->getInterpolation();
if (interp)
interp->readFlatField(imgname, nb, emin, emax);
}
/* } */
/* void *readFlatField(const char * imgname, int nb=-1, double emin=1, double emax=0){ */
/* slsInterpolation *interp=((interpolatingDetector*)det)->getInterpolation(); */
/* if (interp) */
/* interp->readFlatField(imgname, nb, emin, emax); */
/* } */
virtual int *getFlatField(int &nb, double emi, double ema){
slsInterpolation *interp=(slsInterpolation*)((interpolatingDetector*)det)->getInterpolation();
int *ff=NULL;
if (interp) {
ff=interp->getFlatField(nb,emi,ema);
}
return ff;
}
/* virtual int *getFlatField(int &nb, double emi, double ema){ */
/* slsInterpolation *interp=((interpolatingDetector*)det)->getInterpolation(); */
/* int *ff=NULL; */
/* if (interp) { */
/* ff=interp->getFlatField(nb,emi,ema); */
/* } */
/* return ff; */
/* } */
virtual char *getInterpolation() {
return ((interpolatingDetector*)det)->getInterpolation();
}
/* virtual slsInterpolation *getInterpolation() { */
/* return ((interpolatingDetector*)det)->getInterpolation(); */
/* } */
virtual void resetFlatField() { ((interpolatingDetector*)det)->resetFlatField();};
/* virtual void resetFlatField() { ((interpolatingDetector*)det)->resetFlatField();}; */
virtual int setNSubPixels(int ns) { return ((interpolatingDetector*)det)->setNSubPixels(ns);};
/* virtual int setNSubPixels(int ns) { return ((interpolatingDetector*)det)->setNSubPixels(ns);}; */
};
/* virtual slsInterpolation *setInterpolation(slsInterpolation *f){ */
/* cout << "thr" << endl; */
/* return ((interpolatingDetector*)det)->setInterpolation(f); */
/* }; */
/* protected: */
/* interpolatingDetector *det; */
/* }; */
@ -83,34 +88,58 @@ public:
/* getFlatField(); //sum up all etas */
/* setFlatField(); //set etas to all detectors */
/* for (int i=0; i<nThreads; i++) { */
((threadedInterpolatingDetector*)dets[0])->prepareInterpolation(ok);
(dets[0])->prepareInterpolation(ok);
// }
}
virtual int *getFlatField(){
return ((threadedInterpolatingDetector*)dets[0])->getFlatField();
return (dets[0])->getFlatField();
}
virtual int *getFlatField(int &nb, double emi, double ema){
return ((threadedInterpolatingDetector*)dets[0])->getFlatField(nb,emi,ema);
return (dets[0])->getFlatField(nb,emi,ema);
}
virtual int *setFlatField(int *h=NULL, int nb=-1, double emin=1, double emax=0){
return ((threadedInterpolatingDetector*)dets[0])->setFlatField(h,nb,emin,emax);
return (dets[0])->setFlatField(h,nb,emin,emax);
};
void *writeFlatField(const char * imgname){
((threadedInterpolatingDetector*)dets[0])->writeFlatField(imgname);
dets[0]->writeFlatField(imgname);
};
void *readFlatField(const char * imgname, int nb=-1, double emin=1, double emax=0){
((threadedInterpolatingDetector*)dets[0])->readFlatField(imgname, nb, emin, emax);
(dets[0])->readFlatField(imgname, nb, emin, emax);
};
virtual int setNSubPixels(int ns) { return ((threadedInterpolatingDetector*)dets[0])->setNSubPixels(ns);};
virtual void resetFlatField() {((threadedInterpolatingDetector*)dets[0])->resetFlatField();};
virtual int setNSubPixels(int ns) { return (dets[0])->setNSubPixels(ns);};
virtual void resetFlatField() {(dets[0])->resetFlatField();};
/** sets file pointer where to write the clusters to
\param f file pointer
\returns current file pointer
*/
virtual slsInterpolation *setInterpolation(slsInterpolation *f){
int ok;
// for (int i=0; i<nThreads; i++) {
cout << "mt" << endl;
return (dets[0])->setInterpolation(f);
//dets[i]->setMutex(&fmutex);
// }
//dets[0]->prepareInterpolation(ok);
//return (slsInterpolation*)((interpolatingDetector*)dets[0])->getInterpolation();
};
virtual slsInterpolation *getInterpolation(){
return (dets[0])->getInterpolation();
};
};