mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-11 04:17:15 +02:00
New Zmq header staructur implemented and works, still different number of pixels in the GUI should be fixed (but it does not crash)
This commit is contained in:
@ -10,17 +10,13 @@
|
||||
using namespace std;
|
||||
|
||||
|
||||
class threadedCountingDetector : public threadedAnalogDetector
|
||||
{
|
||||
public:
|
||||
threadedCountingDetector(singlePhotonDetector *d, int fs=10000) : threadedAnalogDetector(d,fs) {};
|
||||
/* class threadedCountingDetector : public threadedAnalogDetector */
|
||||
/* { */
|
||||
/* public: */
|
||||
/* threadedCountingDetector(singlePhotonDetector *d, int fs=10000) : threadedAnalogDetector(d,fs) {}; */
|
||||
|
||||
|
||||
virtual double setNSigma(double n) {return ((singlePhotonDetector*)det)->setNSigma(n);};
|
||||
virtual void setEnergyRange(double emi, double ema) {return ((singlePhotonDetector*)det)->setEnergyRange(emi,ema);};
|
||||
|
||||
|
||||
};
|
||||
/* }; */
|
||||
|
||||
|
||||
|
||||
@ -29,8 +25,8 @@ class multiThreadedCountingDetector : public multiThreadedAnalogDetector
|
||||
public:
|
||||
multiThreadedCountingDetector(singlePhotonDetector *d, int n, int fs=1000) : multiThreadedAnalogDetector(d,n,fs) { };
|
||||
|
||||
virtual double setNSigma(double n) {double ret; for (int i=0; i<nThreads; i++) ret=((threadedCountingDetector*)dets[i])->setNSigma(n); return ret;};
|
||||
virtual void setEnergyRange(double emi, double ema) {for (int i=0; i<nThreads; i++) ((threadedCountingDetector*)dets[i])->setEnergyRange(emi,ema);};
|
||||
virtual double setNSigma(double n) {double ret; for (int i=0; i<nThreads; i++) ret=(dets[i])->setNSigma(n); return ret;};
|
||||
virtual void setEnergyRange(double emi, double ema) {for (int i=0; i<nThreads; i++) (dets[i])->setEnergyRange(emi,ema);};
|
||||
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user