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

Remove explicit class member analogDetector<uint16_t>* dd[MAXTHREADS]

Browse Source
This commit is contained in:
hinger_v 2025-02-07 16:32:09 +01:00
parent 7b1e74f4a4
commit 243c555798
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorCalibration/multiThreadedAnalogDetector.h
View File

@ -344,6 +344,9 @@ class multiThreadedAnalogDetector {
multiThreadedAnalogDetector(analogDetector<uint16_t> *d, int num_threads, multiThreadedAnalogDetector(analogDetector<uint16_t> *d, int num_threads,
int fs = 1000, int num_sc = 1) int fs = 1000, int num_sc = 1)
: stop(0), nThreads(num_threads), nSC(num_sc) { : stop(0), nThreads(num_threads), nSC(num_sc) {
std::vector< analogDetector<uint16_t>* > dd(nThreads, nullptr); // instead of making it a class member
dd[0] = d; dd[0] = d;
if (nThreads == 1) if (nThreads == 1)
dd[0]->setId(100); dd[0]->setId(100);
@ -374,7 +377,7 @@ class multiThreadedAnalogDetector {
image = nullptr; image = nullptr;
ff = NULL; ff = NULL;
ped = NULL; ped = NULL;
std::cout << "Ithread is " << ithread << std::endl; //std::cout << "Ithread is " << ithread << std::endl;
} }
virtual ~multiThreadedAnalogDetector() { virtual ~multiThreadedAnalogDetector() {
@ -659,7 +662,7 @@ class multiThreadedAnalogDetector {
if (sc_pedestals_rms.count(sc) && sc_pedestals_rms[sc]) { if (sc_pedestals_rms.count(sc) && sc_pedestals_rms[sc]) {
delete[] sc_pedestals_rms[sc]; delete[] sc_pedestals_rms[sc];
sc_pedestals_rms = nullptr; sc_pedestals_rms[sc] = nullptr;
} }
// allocate memory and initialize all values to zero // allocate memory and initialize all values to zero
@ -836,7 +839,7 @@ class multiThreadedAnalogDetector {
bool stop; bool stop;
const int nThreads; const int nThreads;
threadedAnalogDetector *dets[MAXTHREADS]; threadedAnalogDetector *dets[MAXTHREADS];
analogDetector<uint16_t> *dd[MAXTHREADS]; //analogDetector<uint16_t> *dd[MAXTHREADS]; // VH: as I understand it this is a helper object used only in the constructor
//int ithread{0}; // Thread index //int ithread{0}; // Thread index
std::vector<int> thread_counters_by_sc{}; // Round-robin counters for threads for each storage cell std::vector<int> thread_counters_by_sc{}; // Round-robin counters for threads for each storage cell
int* image; int* image;